diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3c8e7d04fd65b..9d11a11473320 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,7 +11,7 @@
 
 ## Changelog
 
-<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->
+<!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. -->
 
 :cl:
 add: Added new mechanics or gameplay changes
diff --git a/.github/guides/AUTODOC.md b/.github/guides/AUTODOC.md
index bcc92e10e59f3..fef5d62c668e2 100644
--- a/.github/guides/AUTODOC.md
+++ b/.github/guides/AUTODOC.md
@@ -40,7 +40,7 @@ public functions rely on to implement logic
 When documenting a proc, we give a short one line description (as this is shown
 next to the proc definition in the list of all procs for a type or global
 namespace), then a longer paragraph which will be shown when the user clicks on
-the proc to jump to it's definition
+the proc to jump to its definition
 ```
 /**
  * Short description of the proc
@@ -59,7 +59,7 @@ just going to be the typepath of the class, as dmdoc uses that by default
 
 Then we give a short oneline description of the class
 
-Finally we give a longer multi paragraph description of the class and it's details
+Finally we give a longer multi paragraph description of the class and its details
 ```
 /**
  * # Classname (Can be omitted if it's just going to be the typepath)
diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md
index 4716fa1b655c4..9c6496e0c4dc9 100644
--- a/.github/guides/STANDARDS.md
+++ b/.github/guides/STANDARDS.md
@@ -100,11 +100,11 @@ While we normally encourage (and in some cases, even require) bringing out of da
 ### RegisterSignal()
 
 #### PROC_REF Macros
-When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros. 
+When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros.
 They ensure compilation fails if the reffered to procs change names or get removed.
 The macro to be used depends on how the proc you're in relates to the proc you want to use:
 
-PROC_REF if the proc you want to use is defined on the current proc type or any of it's ancestor types.
+PROC_REF if the proc you want to use is defined on the current proc type or any of its ancestor types.
 Example:
 ```
 /mob/proc/funny()
@@ -129,7 +129,7 @@ Example:
 /mob/subtype/proc/do_something()
 	var/obj/thing/x = new()
 	// we're referring to /obj/thing proc inside /mob/subtype proc
-	RegisterSignal(x, COMSIG_FAKE, TYPE_PROC_REF(/obj/thing, funny)) 
+	RegisterSignal(x, COMSIG_FAKE, TYPE_PROC_REF(/obj/thing, funny))
 ```
 
 GLOBAL_PROC_REF if the proc you want to use is a global proc.
@@ -154,7 +154,7 @@ All procs that are registered to listen for signals using `RegisterSignal()` mus
 ```
 This is to ensure that it is clear the proc handles signals and turns on a lint to ensure it does not sleep.
 
-Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously. 
+Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc must be called asynchronously (e.g. with `INVOKE_ASYNC()`) or be redone to work asynchronously.
 
 #### `override`
 
@@ -280,7 +280,7 @@ Good:
 		off_overlay = iconstate2appearance(icon, "off")
 		broken_overlay = icon2appearance(broken_icon)
 	if (stat & broken)
-		add_overlay(broken_overlay) 
+		add_overlay(broken_overlay)
 		return
 	if (is_on)
 		add_overlay(on_overlay)
@@ -304,7 +304,7 @@ Bad:
 	if (isnull(our_overlays))
 		our_overlays = list("on" = iconstate2appearance(overlay_icon, "on"), "off" = iconstate2appearance(overlay_icon, "off"), "broken" = iconstate2appearance(overlay_icon, "broken"))
 	if (stat & broken)
-		add_overlay(our_overlays["broken"]) 
+		add_overlay(our_overlays["broken"])
 		return
 	...
 ```
@@ -391,7 +391,7 @@ At its best, it can make some very common patterns easy to use, and harder to me
 		some_code()
 		if (do_something_else())
 			. = TRUE // Uh oh, what's going on!
-	
+
 	// even
 	// more
 	// code
@@ -468,7 +468,7 @@ Meaning:
 	to_chat(world, uh_oh())
 ```
 
-...will print `woah!`. 
+...will print `woah!`.
 
 For this reason, it is acceptable for `.` to be used in places where consumers can reasonably continue in the event of a runtime.
 
@@ -494,7 +494,7 @@ If you are using `.` in this case (or for another case that might be acceptable,
 	. = ..()
 	if (. == BIGGER_SUPER_ATTACK)
 		return BIGGER_SUPER_ATTACK // More readable than `.`
-	
+
 	// Due to how common it is, most uses of `. = ..()` do not need a trailing `return .`
 ```
 
diff --git a/.github/labeler.yml b/.github/labeler.yml
index fe140d58e1e74..473bd2c6dcb82 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,40 +1,65 @@
 'TGUI':
   - changed-files:
-    - any-glob-to-any-file: 'tgui/**'
+      - any-glob-to-any-file: 'tgui/**'
 
-'Звук':
+':sound: Звук':
   - changed-files:
-    - any-glob-to-any-file: '**/*.ogg'
+      - any-glob-to-any-file: '**/*.ogg'
 
-'Спрайты':
+':world_map: Изменение Карты':
+  - all:
+      - changed-files:
+          - any-glob-to-any-file: '**/*.dmm'
+
+':paintbrush: Спрайты':
   - changed-files:
-    - any-glob-to-any-file: ['**/*.dmi', '**/*.png']
+      - any-glob-to-any-file: '**/*.dmi'
 
-'Изменение Карты':
+':guitar: Инструменты':
   - changed-files:
-    - any-glob-to-any-file: '**/*.dmm'
+      - any-glob-to-any-file: ['.gihub/**', 'tools/**', '.vscode/**', '.bin/**']
 
-'НЕ МОДУЛЬНО':
+':floppy_disk: Изменение конфига':
+  - changed-files:
+      - any-glob-to-any-file: 'config/**'
+
+':neckbeard: Документация':
+  - changed-files:
+      - any-glob-to-any-file: '**/*.md'
+
+':cd: SQL':
+  - changed-files:
+      - any-glob-to-any-file: 'SQL/**'
+
+':feelsgood: Частичная модульность':
+  - all:
+      - changed-files:
+          - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**', 'tgui/**']
+          - any-glob-to-any-file: 'modular_bandastation/**'
+      - base-branch: 'master'
+      - head-branch: '!merge-upstream'
+
+':finnadie: НЕ МОДУЛЬНО':
+  - all:
+      - changed-files:
+          - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**']
+          - all-globs-to-all-files: '!modular_bandastation/**'
+      - base-branch: 'master'
+      - head-branch: '!merge-upstream'
+
+':pray: Слияние с восходящим потоком':
   - all:
-    - changed-files:
-      - any-glob-to-any-file: 'code/**'
     - base-branch: 'master'
+    - head-branch: 'merge-upstream'
 
-'Перевод':
+':pencil: Перевод':
   - base-branch: 'translate'
 
-'Инструменты':
-  - changed-files:
-    - any-glob-to-any-file: ['.gihub/workflows/**', 'tools/**']
-
-'Изменение конфига':
-  - changed-files:
-    - any-glob-to-any-file: 'config/**'
+':wrench: Фикс':
+  - head-branch: ['^fix', 'fix']
 
-'Документация':
-  - changed-files:
-    - any-glob-to-any-file: '**/*.md'
+':trollface: Фича':
+  - head-branch: ['^feat', 'feat']
 
-'SQL':
-  - changed-files:
-    - any-glob-to-any-file: 'SQL/**'
+':shipit: Улучшение':
+  - head-branch: ['^tweak', 'tweak']
diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
index 7b544fef2a66c..3485b90d47489 100644
--- a/.github/workflows/run_integration_tests.yml
+++ b/.github/workflows/run_integration_tests.yml
@@ -46,9 +46,9 @@ jobs:
       - name: Install rust-g
         run: |
           bash tools/ci/install_rust_g.sh
-      - name: Install auxlua
+      - name: Install dreamluau
         run: |
-          bash tools/ci/install_auxlua.sh
+          bash tools/ci/install_dreamluau.sh
       - name: Configure version
         run: |
           echo "BYOND_MAJOR=${{ inputs.major }}" >> $GITHUB_ENV
diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml
index 15d45b7935f05..8dfdee90e36a0 100644
--- a/.github/workflows/update_tgs_dmapi.yml
+++ b/.github/workflows/update_tgs_dmapi.yml
@@ -28,8 +28,8 @@ jobs:
     - name: Commit and Push
       continue-on-error: true
       run: |
-        git config user.name tgstation-server
-        git config user.email tgstation-server@users.noreply.github.com
+        git config user.name "tgstation-server-ci[bot]"
+        git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com"
         git add .
         git commit -m 'Update TGS DMAPI'
         git push -f -u origin tgs-dmapi-update
diff --git a/.gitignore b/.gitignore
index c70ebf608b965..8ef9946abc935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,7 +214,7 @@ Temporary Items
 # Built auxtools libraries and intermediate files
 aux*.dll
 libaux*.so
-aux*.pdb
+*.pdb
 
 # byond-tracy, we intentionally do not ship this and do not want to maintain it
 # https://github.com/mafemergency/byond-tracy/
diff --git a/SQL/bandastation/bandastation_update.sql b/SQL/bandastation/bandastation_update.sql
index d3883dc403d45..20cccf09541a5 100644
--- a/SQL/bandastation/bandastation_update.sql
+++ b/SQL/bandastation/bandastation_update.sql
@@ -38,3 +38,20 @@ CREATE TABLE `admin_wl` (
 	PRIMARY KEY (`id`),
 	KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+--
+-- Table structure for table `budget`
+--
+DROP TABLE IF EXISTS `budget`;
+CREATE TABLE `budget` (
+    `id` INT(11) NOT NULL AUTO_INCREMENT,
+    `date` DATETIME NOT NULL DEFAULT current_timestamp(),
+    `ckey` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+    `amount` INT(10) UNSIGNED NOT NULL,
+    `source` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
+    `date_start` DATETIME NOT NULL DEFAULT current_timestamp(),
+    `date_end` DATETIME NULL DEFAULT (current_timestamp() + interval 1 month),
+    `is_valid` TINYINT(1) NOT NULL DEFAULT '1',
+    `discord_id` bigint(20) DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
diff --git a/SQL/bandastation/database_changelog.md b/SQL/bandastation/database_changelog.md
index 74e7053c6a622..b4e6f76b2b51d 100644
--- a/SQL/bandastation/database_changelog.md
+++ b/SQL/bandastation/database_changelog.md
@@ -2,17 +2,35 @@ Any time you make a change to the schema files, remember to increment the databa
 
 Make sure to also update `DB_MAJOR_VERSION_220` and `DB_MINOR_VERSION_220`, which can be found in `code/modular_bandastation/_defines220/code/defines/subsystems.dm`.
 
-The latest database version is 1.1; The query to update the schema revision table is:
+The latest database version is 1.2; The query to update the schema revision table is:
 
 ```sql
-INSERT INTO `schema_revision_220` (`major`, `minor`) VALUES (1, 1);
+INSERT INTO `schema_revision_220` (`major`, `minor`) VALUES (1, 2);
 ```
 or
 
 ```sql
-INSERT INTO `SS13_schema_revision_220` (`major`, `minor`) VALUES (1, 1);
+INSERT INTO `SS13_schema_revision_220` (`major`, `minor`) VALUES (1, 2);
 ```
 
+-----------------------------------------------------
+Version 1.2, 22 July 2024, by larentoun
+Created the table: budget
+
+```sql
+CREATE TABLE `budget` (
+    `id` INT(11) NOT NULL AUTO_INCREMENT,
+    `date` DATETIME NOT NULL DEFAULT current_timestamp(),
+    `ckey` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+    `amount` INT(10) UNSIGNED NOT NULL,
+    `source` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
+    `date_start` DATETIME NOT NULL DEFAULT current_timestamp(),
+    `date_end` DATETIME NULL DEFAULT (current_timestamp() + interval 1 month),
+    `is_valid` TINYINT(1) NOT NULL DEFAULT '1',
+    `discord_id` bigint(20) DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+```
 -----------------------------------------------------
 Version 1.1, 17 April 2024, by larentoun
 Created the tables: schema_revision220, ckey_whitelist, admin_wl
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
index 96dec4af7207d..0bfcc133f0c98 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -25,8 +25,8 @@
 /obj/item/clothing/shoes/galoshes{
 	pixel_y = -5
 	},
-/obj/item/flashlight/eyelight{
-	pixel_y = 11
+/obj/item/flashlight{
+	pixel_y = 8
 	},
 /turf/open/floor/plating/icemoon,
 /area/ruin/plasma_facility/operations)
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 13a82feee1d21..6df974f9ea279 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -4426,6 +4426,9 @@
 /obj/item/stack/sheet/plastitaniumglass{
 	amount = 15
 	},
+/obj/item/holosign_creator/atmos,
+/obj/item/circuitboard/machine/thermomachine,
+/obj/item/circuitboard/machine/thermomachine,
 /turf/open/floor/iron,
 /area/ruin/syndicate_lava_base/engineering)
 "YP" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
index 1c4f402f49d1f..7e885840c40e5 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1/mistake_inevitable.dmm
@@ -211,7 +211,9 @@
 /obj/item/storage/toolbox/syndicate,
 /obj/item/pipe_dispenser,
 /obj/item/rpd_upgrade/unwrench,
+/obj/item/circuitboard/machine/emitter,
 /obj/structure/rack,
+/obj/item/circuitboard/machine/emitter,
 /turf/open/floor/iron/dark,
 /area/ruin/syndicate_lava_base/testlab)
 "uT" = (
diff --git a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
index f8ec15738e1dc..512888b5e24ab 100644
--- a/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
+++ b/_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -72,7 +72,7 @@
 /turf/open/floor/iron/smooth_edge,
 /area/ruin/space/has_grav/derelictsulaco)
 "dk" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/item/stack/sheet/mineral/sandbags{
 	amount = 2
 	},
@@ -1110,7 +1110,7 @@
 /area/template_noop)
 "KS" = (
 /obj/machinery/door/window/brigdoor/left/directional/east,
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /obj/structure/barricade/sandbags,
 /turf/open/floor/iron/stairs{
 	dir = 8
diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
new file mode 100644
index 0000000000000..50e0bffd56727
--- /dev/null
+++ b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
@@ -0,0 +1,7592 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ad" = (
+/obj/structure/table/wood,
+/obj/item/c_tube{
+	pixel_y = 8
+	},
+/obj/item/gun/ballistic/shotgun/toy/crossbow,
+/obj/machinery/light/warm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"ah" = (
+/obj/structure/cable/layer1,
+/obj/machinery/camera/xray/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_vault_lasertrap";
+	suicide_pact = 1;
+	suicide_pact_id = "donk_vault_lasertrap"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"am" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"ap" = (
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"au" = (
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"aw" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/effect/spawner/random/structure/grille,
+/obj/effect/mapping_helpers/damaged_window,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"aD" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/obj/item/assembly/igniter{
+	pixel_x = -7;
+	pixel_y = -11
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"aH" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"aM" = (
+/obj/structure/rack,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"aO" = (
+/obj/structure/grille/broken,
+/obj/effect/mapping_helpers/damaged_window,
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"aP" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"ba" = (
+/obj/structure/grille,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"bd" = (
+/obj/structure/table/wood,
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"be" = (
+/obj/structure/rack,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bf" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/toner/large{
+	pixel_y = 8;
+	pixel_x = 4
+	},
+/obj/item/toner/large{
+	pixel_y = -4;
+	pixel_x = 4
+	},
+/obj/item/toner/large{
+	pixel_y = 2;
+	pixel_x = 4
+	},
+/obj/item/food/grown/onion/red{
+	pixel_y = 5;
+	pixel_x = -12
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"bn" = (
+/obj/structure/table/wood,
+/obj/effect/overloader_trap{
+	uses_remaining = 2;
+	shock_damage = 45;
+	trigger_cooldown_duration = 30
+	},
+/obj/machinery/coffeemaker,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"bo" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	space_dir = 4;
+	name = "Dock 4 External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_4"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bq" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/sovietsoda{
+	onstation_override = 1
+	},
+/obj/structure/sign/poster/contraband/clown/directional/east,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/broken_machine,
+/obj/machinery/camera/autoname/directional/east{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"br" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/machinery/recharger{
+	pixel_y = 8;
+	pixel_x = -4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"bt" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/oil/streak{
+	pixel_y = -7
+	},
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"bu" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"bx" = (
+/obj/item/rack_parts,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_smooth/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bz" = (
+/obj/structure/chair/sofa/right/brown{
+	dir = 1
+	},
+/obj/structure/sign/poster/ripped/directional/south,
+/obj/machinery/light/warm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"bA" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/spawner/random/trash/cigbutt,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bC" = (
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bI" = (
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bQ" = (
+/obj/structure/cable/layer1,
+/obj/effect/spawner/random/trash/bin,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/duct,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bU" = (
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen/yellow,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"bV" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"bY" = (
+/obj/machinery/door/airlock/highsecurity{
+	desc = "It's labelled AI CORE - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_aicore_door_bolts";
+	name = "Secure Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"bZ" = (
+/obj/structure/table/wood,
+/obj/structure/desk_bell,
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/wrapping,
+/obj/structure/curtain/cloth/fancy,
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"ca" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/camera/xray/directional/west,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"cb" = (
+/obj/item/clothing/neck/stethoscope,
+/obj/item/reagent_containers/syringe/contraband/methamphetamine,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"ch" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE B"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"cm" = (
+/obj/structure/rack,
+/obj/item/toy/nuke{
+	pixel_y = 8;
+	pixel_x = 7
+	},
+/obj/item/toy/figure/syndie{
+	pixel_x = 8
+	},
+/obj/item/toy/figure/syndie,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"co" = (
+/obj/structure/cable/layer1,
+/obj/structure/chair/office{
+	dir = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"cq" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"ct" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/obj/effect/decal/cleanable/oil/streak,
+/obj/structure/cable/layer1,
+/obj/effect/overloader_trap{
+	trigger_delay = 10
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"cv" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"cB" = (
+/obj/item/throwing_star/toy{
+	pixel_y = -6;
+	pixel_x = -7
+	},
+/obj/item/barcodescanner,
+/obj/item/ammo_casing/foam_dart{
+	dir = 8;
+	pixel_x = 7;
+	pixel_y = 12
+	},
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/mob/living/basic/mouse/rat,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"cC" = (
+/obj/structure/cable/layer1,
+/obj/effect/spawner/random/trash/bin,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"cF" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/layer1,
+/obj/machinery/camera/xray/directional/east,
+/obj/machinery/button/door/invisible_tripwire{
+	donk_ai_slave = 1;
+	suicide_pact = 1;
+	suicide_pact_id = "donk_office_trap_shutters";
+	id = "donk_office_trap_shutters";
+	sync_doors = 0
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"cL" = (
+/obj/structure/cable/layer1,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"cN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"cO" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE D - EMPLOYEES ONLY.";
+	id_tag = "donk_door_bolts"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"cQ" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"cT" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/storage/belt/utility{
+	desc = "The tool storage solution that hangs around your waist. This one has 'VLAD' embroidered on it."
+	},
+/obj/structure/sign/poster/contraband/interdyne_gene_clinics/directional/north,
+/obj/machinery/light/warm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"cV" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"cY" = (
+/obj/effect/spawner/random/entertainment/arcade,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"db" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"dc" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/fuel_pool,
+/obj/structure/sign/poster/contraband/energy_swords/directional/north,
+/obj/machinery/duct,
+/obj/structure/chair/sofa/left/maroon,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"dj" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Glass Airlock"
+	},
+/obj/structure/cable/layer1,
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"dt" = (
+/obj/structure/chair/sofa/left/brown{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"du" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/red/dim/directional/east,
+/obj/item/circuitboard/machine/microwave,
+/obj/item/multitool/circuit{
+	pixel_y = 2;
+	pixel_x = -8
+	},
+/obj/item/clothing/neck/stethoscope,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"dv" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/item/radio{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"dw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"dx" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/item/stamp/syndicate{
+	pixel_y = 11;
+	pixel_x = 4
+	},
+/obj/item/stamp/denied{
+	pixel_y = 11;
+	pixel_x = -7
+	},
+/obj/effect/spawner/random/entertainment/cigar,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"dC" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice/catwalk,
+/obj/structure/cable/layer1,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"dD" = (
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"dE" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/storage/bag/trash/filled,
+/mob/living/basic/mouse/rat,
+/obj/item/screwdriver/red,
+/obj/item/crowbar,
+/obj/item/multitool,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"dH" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/ash/large{
+	pixel_y = -9;
+	pixel_x = -9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/chair/wood{
+	pixel_y = 2;
+	pixel_x = 2
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	donk_ai_slave = 1;
+	suicide_pact = 1;
+	suicide_pact_id = "donk_office_trap_shutters";
+	id = "donk_office_trap_shutters";
+	sync_doors = 0
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"dN" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"dU" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/cigarette/syndicate{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/broken_machine,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"ef" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"ej" = (
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"ek" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/vending/clothing{
+	onstation_override = 1
+	},
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"en" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/light/red/dim/directional/west,
+/obj/item/mod/construction/broken_core,
+/obj/item/mod/module/storage/large_capacity,
+/obj/item/mod/module/visor/night,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"eB" = (
+/obj/structure/cable/layer1,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/duct,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"eE" = (
+/obj/structure/secure_safe/directional/north{
+	pixel_y = 44
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sink/directional/south,
+/obj/machinery/button/door{
+	pixel_y = 22;
+	pixel_x = -12;
+	id = "donk_market";
+	name = "shutter button"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"eN" = (
+/obj/structure/cable/layer1,
+/obj/item/dualsaber/toy,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"fg" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/engineering/tool_advanced,
+/obj/structure/sign/clock/directional/north,
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"fk" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"fu" = (
+/obj/structure/table/wood,
+/obj/item/dice/d10{
+	pixel_y = 2;
+	pixel_x = 6
+	},
+/obj/item/dice/d10{
+	pixel_y = 1;
+	pixel_x = -8
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"fA" = (
+/obj/item/vending_refill/donksoft{
+	pixel_y = -6;
+	pixel_x = -6
+	},
+/obj/item/vending_refill/donksnackvendor{
+	pixel_x = 10;
+	pixel_y = -6
+	},
+/obj/item/vending_refill/sustenance{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/vending_refill/youtool{
+	pixel_y = 8;
+	pixel_x = 10
+	},
+/obj/effect/turf_decal/bot_red,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/large{
+	desc = "A hefty wooden crate labelled 'VENDOR REFILLS'. You'll need a crowbar to get it open."
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"fE" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"fK" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"fT" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice/catwalk,
+/obj/structure/cable/layer1,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"fW" = (
+/obj/structure/rack,
+/obj/item/melee/skateboard,
+/obj/machinery/light/small/dim/directional/east,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"fZ" = (
+/obj/effect/decal/cleanable/oil/streak,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"ga" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 1 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_1"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gb" = (
+/obj/machinery/light/red/dim/directional/east,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"gh" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/mob/living/basic/mouse/rat,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"gn" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/coin/titanium{
+	pixel_x = 12;
+	pixel_y = 11
+	},
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gv" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gz" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"gH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/light/broken/directional/south,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gK" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	space_dir = 8;
+	name = "Dock 1 External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_1"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gS" = (
+/obj/machinery/door/poddoor,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"gT" = (
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 8
+	},
+/obj/effect/spawner/random/trash/garbage,
+/turf/open/floor/wood/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"gV" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/obj/machinery/door/airlock/wood{
+	desc = "It's labelled MANAGERS OFFICE - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_office_entrance";
+	name = "Executive Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"gW" = (
+/obj/machinery/light/warm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"hd" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/candy{
+	pixel_y = 9;
+	pixel_x = -6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/item/book/random,
+/obj/structure/sign/poster/contraband/cybersun_six_hundred/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"hf" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/contraband/syndicate_pistol/directional/west,
+/mob/living/simple_animal/bot/secbot{
+	faction = list("Syndicate");
+	bot_cover_flags = 4;
+	baton_type = /obj/item/melee/baton/security/cattleprod;
+	name = "\improper Syndicate Securitron";
+	desc = "A little security robot, reprogrammed by the syndicate. He looks downright surly."
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"hi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/basic/viscerator,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"hl" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"hr" = (
+/obj/structure/table/wood,
+/obj/item/pen/fountain,
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"hw" = (
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"hx" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/east{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"hF" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE E - EMPLOYEES ONLY."
+	},
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"hH" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"hK" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/safe,
+/obj/item/mail/junkmail,
+/obj/item/market_uplink/blackmarket,
+/obj/item/clothing/suit/armor/bulletproof{
+	desc = "A Type II heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
+	},
+/obj/item/coin/gold,
+/obj/item/vending_refill/donksnackvendor,
+/obj/item/circuitboard/machine/vending/donksnackvendor,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"hL" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/official/moth_epi/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"hO" = (
+/obj/item/stack/sheet/iron/twenty,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"hT" = (
+/obj/effect/mapping_helpers/damaged_window,
+/obj/structure/window/reinforced/fulltile,
+/obj/effect/spawner/random/structure/grille,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"hV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"hW" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"hX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"ia" = (
+/obj/structure/safe/floor,
+/obj/item/fishing_hook/shiny{
+	desc = "A fancy fishing hook made out of gold.";
+	name = "fancy gold fishing hook"
+	},
+/obj/item/food/bait/natural,
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/spacecash/c1000,
+/obj/item/stack/spacecash/c1000,
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_vault_lasertrap";
+	suicide_pact = 1;
+	suicide_pact_id = "donk_vault_lasertrap"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"ic" = (
+/obj/effect/spawner/random/trash/mess,
+/obj/item/stack/sheet/glass{
+	pixel_y = 7;
+	pixel_x = 7;
+	amount = 15
+	},
+/obj/item/stack/sheet/iron/ten,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"ij" = (
+/obj/machinery/light/warm/directional/east,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"ik" = (
+/obj/structure/closet/crate/preopen,
+/obj/item/rack_parts,
+/obj/item/stack/wrapping_paper/xmas,
+/obj/item/radio/off,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"in" = (
+/obj/machinery/light/broken/directional/south,
+/obj/item/storage/wallet/random,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"ip" = (
+/obj/structure/cable/layer1,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/machinery/duct,
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/light/broken/directional/east,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"iu" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"iv" = (
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"ix" = (
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"iz" = (
+/obj/machinery/porta_turret/syndicate/donk,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"iC" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"iD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"iE" = (
+/obj/item/chair/wood{
+	pixel_y = -7;
+	pixel_x = 2
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_entrance_trap_gamma"
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_office_entrance_trap_gamma";
+	donk_ai_slave = 1;
+	multiuse = 1;
+	resets_self = 1
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"iH" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 4 Internal Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/welded,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_4"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/door/firedoor/closed{
+	ignore_alarms = 1;
+	welded = 1;
+	alarm_type = null
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"iS" = (
+/obj/effect/decal/cleanable/plastic,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"iU" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_trap_shutters"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"iW" = (
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled WORKSTATION - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"iX" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"iY" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/plastic,
+/obj/item/stack/sheet/plastic/five{
+	pixel_y = 8;
+	pixel_x = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - MISC' and has the Donk Co. logo stamped on it."
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/item/stack/sheet/iron/twenty,
+/obj/item/electronics/apc{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"jd" = (
+/obj/structure/cable/layer1,
+/obj/item/restraints/handcuffs/cable/zipties/used,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"je" = (
+/obj/effect/mine/shrapnel/sting,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"jk" = (
+/obj/structure/cable/layer1,
+/obj/structure/rack,
+/obj/item/flashlight/seclite{
+	name = "syndicate flashlight";
+	desc = "A robust flashlight used by syndicate security."
+	},
+/obj/item/megaphone{
+	inhand_icon_state = "megaphone-cargo";
+	icon_state = "megaphone-cargo";
+	desc = "A device used to project your voice. Loudly. It has 'PROPERTY OF DONK CO' written on the side.";
+	name = "donk co megaphone"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"jq" = (
+/obj/structure/closet/crate/trashcart,
+/obj/item/ammo_casing/foam_dart{
+	dir = 4;
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/mod/maint,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"jF" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/east,
+/obj/machinery/button/door/invisible_tripwire{
+	donk_ai_slave = 1;
+	suicide_pact = 1;
+	suicide_pact_id = "donk_office_trap_shutters";
+	id = "donk_office_trap_shutters";
+	sync_doors = 0
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"jK" = (
+/obj/structure/cable/layer1,
+/obj/machinery/porta_turret/syndicate/energy/cybersun,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"jL" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/reagent_containers/condiment/donksauce{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/instrument/banjo,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"jY" = (
+/obj/structure/cable/layer1,
+/obj/structure/noticeboard/directional/north,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/warning,
+/obj/machinery/duct,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/oldnote,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/officememo,
+/obj/structure/chair/sofa/right/maroon,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"ka" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/obj/machinery/navbeacon{
+	location = "breakroom1";
+	codes_txt = "patrol;next_patrol=hall1"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"kl" = (
+/mob/living/basic/viscerator,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"km" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/sign/departments/custodian/directional/west,
+/obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"kp" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"kq" = (
+/obj/structure/filingcabinet/chestdrawer/wheeled,
+/obj/item/folder,
+/obj/item/folder,
+/obj/item/paper/pamphlet/violent_video_games,
+/obj/item/folder,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka,
+/obj/item/storage/box/gum/nicotine,
+/obj/item/folder/yellow,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka3,
+/obj/item/folder/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/xray/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"kr" = (
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/open/space/basic,
+/area/space)
+"kx" = (
+/mob/living/basic/bot/dedbot{
+	bot_mode_flags = 29
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"kz" = (
+/obj/item/food/badrecipe/moldy/bacteria{
+	pixel_x = 8;
+	pixel_y = 14
+	},
+/obj/effect/decal/cleanable/ash,
+/obj/machinery/light/warm/dim/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"kD" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/official/moth_hardhat/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"kE" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/robot_debris/limb,
+/obj/structure/sign/departments/cargo/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"kG" = (
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/obj/structure/cable/layer1,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"kI" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"kR" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood/fancy/orange,
+/obj/machinery/microwave,
+/obj/structure/sign/poster/contraband/donk_co/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"kV" = (
+/obj/structure/table/wood,
+/obj/item/c_tube,
+/obj/structure/curtain/cloth/fancy,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"kX" = (
+/obj/structure/table/wood,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/officememo{
+	pixel_y = 12;
+	pixel_x = -2
+	},
+/obj/item/storage/box/donkpockets/donkpocketpizza,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"la" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"lc" = (
+/obj/structure/chair/comfy/brown,
+/obj/structure/sign/poster/contraband/donk_co/directional/north,
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"lx" = (
+/obj/structure/chair/comfy/black,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"lA" = (
+/mob/living/basic/viscerator,
+/obj/effect/turf_decal/bot_red,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"lD" = (
+/obj/structure/bookcase/random/reference,
+/obj/item/book/random{
+	pixel_x = 2;
+	pixel_y = 9
+	},
+/obj/item/book/random{
+	pixel_y = -7;
+	pixel_x = 6
+	},
+/obj/item/book/bible{
+	pixel_y = 8;
+	pixel_x = -6
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"lG" = (
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"lI" = (
+/obj/machinery/photocopier/gratis,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/overloader_trap{
+	shock_damage = 40;
+	uses_remaining = 3;
+	trigger_delay = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"lQ" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"lR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"lT" = (
+/obj/machinery/vending/cola/black{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/broken_machine,
+/obj/effect/decal/cleanable/glass,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"lW" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"me" = (
+/obj/item/bodypart/leg/left/skeleton{
+	pixel_y = 8;
+	pixel_x = -12
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_waste"
+	},
+/obj/structure/plasticflaps/opaque,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"mf" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 2 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_2"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"mh" = (
+/obj/item/circuitboard/machine/vendatray{
+	pixel_y = 15
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"mn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"mp" = (
+/obj/structure/sign/departments/restroom/directional/south,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_toilet"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"mt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"mz" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"mB" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 4 Internal Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/welded,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_4"
+	},
+/obj/machinery/door/firedoor/closed{
+	ignore_alarms = 1;
+	welded = 1;
+	alarm_type = null
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"mL" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"mR" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/food/fortunecookie{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/food/fortunecookie{
+	pixel_x = -6
+	},
+/obj/item/food/mozzarella_sticks{
+	pixel_x = 8;
+	pixel_y = 8
+	},
+/obj/machinery/camera/xray/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"mT" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"mV" = (
+/obj/effect/mapping_helpers/damaged_window,
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"nb" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STAFFROOM - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"nf" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 1 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_1"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"nh" = (
+/obj/structure/cable/layer1,
+/obj/machinery/space_heater,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"nk" = (
+/obj/effect/decal/cleanable/robot_debris,
+/obj/machinery/duct,
+/obj/machinery/firealarm/directional/south,
+/obj/item/food/deadmouse,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"nu" = (
+/obj/structure/reagent_dispensers/plumbed{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"nC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"nD" = (
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"nE" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"nF" = (
+/obj/structure/cable/layer1,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"nG" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"nJ" = (
+/obj/structure/cable/layer1,
+/obj/structure/rack,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/item/language_manual/roundstart_species/unlimited,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/west{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"nZ" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"od" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"og" = (
+/obj/structure/chair/office{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/wrapping,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"ok" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"ot" = (
+/obj/machinery/porta_turret/syndicate/energy/cybersun,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"ox" = (
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - MISC' and has the Donk Co. logo stamped on it."
+	},
+/obj/item/card/id/away/donk{
+	pixel_x = 3;
+	pixel_y = 8
+	},
+/obj/item/card/id/away/donk{
+	pixel_y = 1;
+	pixel_x = -1
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"oy" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/maintenance/no_decals,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"oz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"oB" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/item/pen/red{
+	pixel_x = 10;
+	pixel_y = 8
+	},
+/obj/item/cigbutt/cigarbutt{
+	pixel_y = 8;
+	pixel_x = -4
+	},
+/obj/effect/spawner/random/bureaucracy/paper,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"oC" = (
+/obj/machinery/light/warm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"oF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"oJ" = (
+/obj/structure/table/wood,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/item/storage/wallet/money{
+	pixel_y = -5;
+	desc = "It can hold a few small and personal things. This one is monogrammed 'S.C.'."
+	},
+/obj/machinery/camera/autoname/directional/west{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"oN" = (
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"oO" = (
+/obj/structure/cable/layer1,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"oT" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"oW" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"pb" = (
+/obj/structure/cable/multilayer,
+/obj/structure/cable/layer1,
+/obj/structure/safe/floor,
+/obj/item/sticker/syndicate/apc,
+/obj/item/grenade/empgrenade,
+/obj/item/book/granter/crafting_recipe/donk_secret_recipe,
+/obj/item/ai_module/core/full/cybersun,
+/obj/item/reagent_containers/condiment/donksauce,
+/mob/living/basic/cybersun_ai_core{
+	donk_ai_master = 1
+	},
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"pc" = (
+/obj/structure/table/wood,
+/obj/item/cardpack/series_one{
+	pixel_y = -8;
+	pixel_x = -11;
+	card_count = 4;
+	guaranteed_count = 0;
+	desc = "Contains six cards of varying rarity from the 2560 Core Set. Collect them all! This pack seems to have been resealed..."
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"pg" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/item/trash/ready_donk{
+	pixel_x = 6;
+	pixel_y = -16
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"pj" = (
+/obj/effect/spawner/random/entertainment/coin,
+/mob/living/basic/mad_piano{
+	faction = list("Syndicate")
+	},
+/obj/item/card/id/away/donk/boss{
+	pixel_y = 11
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"pm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/structure/furniture_parts,
+/obj/structure/noticeboard/directional/north,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/nomodsuits,
+/obj/item/universal_scanner,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"pn" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters{
+	id_tag = "donk_office_trap_shutters";
+	id = "donk_office_trap_shutters"
+	},
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"pw" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"py" = (
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/obj/structure/cable/layer1,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"pz" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"pB" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_trap_shutters"
+	},
+/obj/structure/cable/layer1,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"pG" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/structure/electrified_grille{
+	spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1)
+	},
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"pN" = (
+/obj/structure/cable/layer1,
+/obj/structure/window/reinforced/fulltile,
+/obj/effect/mapping_helpers/damaged_window,
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"pO" = (
+/mob/living/basic/mouse/brown,
+/obj/structure/cable/layer1,
+/obj/structure/sink/directional/east,
+/obj/structure/mirror/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/sign/poster/official/cleanliness/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"pS" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/screwdriver/power{
+	pixel_y = 8
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"pT" = (
+/obj/item/restraints/handcuffs/cable/zipties/used,
+/obj/item/restraints/handcuffs/cable/zipties/used,
+/obj/machinery/light/warm/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"pX" = (
+/obj/structure/cable/layer1,
+/obj/structure/rack,
+/obj/item/storage/medkit/fire{
+	pixel_x = -2;
+	pixel_y = -3
+	},
+/obj/item/storage/medkit/brute{
+	pixel_x = 3;
+	pixel_y = 6
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"qb" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/vending/assist{
+	onstation_override = 1
+	},
+/obj/machinery/camera/xray/directional/west,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"qi" = (
+/obj/effect/decal/cleanable/fuel_pool,
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/item/toy/plush/donkpocket{
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"qp" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/mine/shrapnel/sting,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"qB" = (
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - TOY STOCK' and has the Donk Co. logo stamped on it."
+	},
+/obj/item/instrument/musicalmoth,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"qF" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/robot_debris/down,
+/obj/item/ammo_casing/foam_dart{
+	pixel_x = 2
+	},
+/obj/effect/decal/cleanable/glass/plastitanium/screws{
+	desc = "These screws are pretty loose."
+	},
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"qK" = (
+/obj/structure/cable/layer1,
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield{
+	desc = "A fragile holographic energy field projected by an AI core. It blocks movement. Excels at blocking lethal projectiles."
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"qL" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/warning/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/xray/directional/south,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"qM" = (
+/obj/structure/rack,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/item/tank/internals/oxygen/yellow,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"qP" = (
+/obj/structure/bed/maint,
+/obj/machinery/light/broken/directional/west,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"qQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"qR" = (
+/turf/open/space/basic,
+/area/space)
+"qY" = (
+/obj/item/tank/jetpack/oxygen/security{
+	name = "red jetpack (oxygen)"
+	},
+/obj/item/tank/internals/oxygen/red,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"ra" = (
+/obj/machinery/light/warm/directional/south,
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"rd" = (
+/obj/machinery/door/airlock/highsecurity{
+	desc = "It's labelled AI CORE - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_aicore_door_bolts";
+	name = "Secure Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/locked{
+	id_tag = "donk_aicore_door_bolts"
+	},
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"rg" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/restraints/legcuffs/beartrap/prearmed,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"rk" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/structure/cable/layer1,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"rr" = (
+/obj/structure/table/wood,
+/obj/item/toy/figure/ninja{
+	pixel_y = 8;
+	pixel_x = 8;
+	name = "\improper Evil Underlord action figure";
+	toysay = "For my dark master!"
+	},
+/obj/item/toy/figure/ninja{
+	toysay = "Slaughter them all! For the Dark God!";
+	name = "\improper Shadow Knight action figure"
+	},
+/obj/item/toy/figure/ninja{
+	toysay = "Slaughter them all! For the Dark God!";
+	name = "\improper Shadow Knight action figure";
+	pixel_x = -10;
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"rs" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"ru" = (
+/obj/structure/cable/layer1,
+/obj/machinery/recharger{
+	pixel_x = -9;
+	pixel_y = 10
+	},
+/obj/structure/table/wood,
+/obj/item/food/cubannachos{
+	pixel_x = 5;
+	pixel_y = 8
+	},
+/obj/item/food/donkpocket/warm/pizza{
+	pixel_y = 12;
+	pixel_x = 5
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/cell_charger{
+	pixel_y = -7
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"rv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"rx" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_toilet_window"
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"rI" = (
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"rN" = (
+/obj/structure/chair/sofa/corner/brown{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"rV" = (
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"se" = (
+/obj/structure/sink/directional/south,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"sh" = (
+/obj/structure/frame/machine,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"sk" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Glass Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"sr" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/storage/toolbox/syndicate{
+	pixel_x = 2;
+	pixel_y = 6
+	},
+/obj/machinery/light/red/dim/directional/west,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"ss" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/spawner/random/exotic/technology,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/item/gun/energy/laser/carbine/cybersun,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/south{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"su" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/south{
+	frequency = 1463
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/machinery/camera/xray/directional/south,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"sv" = (
+/obj/structure/table/wood,
+/obj/structure/sign/poster/contraband/donk_co/directional/north,
+/obj/item/trash/ready_donk,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"sx" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/machinery/porta_turret/syndicate/donk,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"sy" = (
+/obj/structure/sign/poster/contraband/blasto_detergent/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"sB" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/cell_charger,
+/obj/machinery/button/door{
+	pixel_y = 23;
+	pixel_x = 10;
+	id = "donk_office_peek";
+	name = "shutter button"
+	},
+/obj/item/stock_parts/power_store/cell/bluespace{
+	pixel_y = 2
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"sD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"sH" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"sM" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/south{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"sN" = (
+/obj/structure/sign/poster/contraband/energy_swords/directional/east,
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 19;
+	pixel_x = -2
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"sQ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/door/airlock/wood{
+	desc = "It's labelled WAITING ROOM - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_office_entrance";
+	name = "Executive Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"sR" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood/fancy/orange,
+/obj/item/kirbyplants/organic{
+	pixel_y = 14
+	},
+/obj/item/stack/spacecash/c10,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"sT" = (
+/obj/effect/mine/shrapnel/sting,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"sU" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/curatorsnote{
+	pixel_y = -2;
+	pixel_x = -6
+	},
+/obj/structure/desk_bell{
+	pixel_x = 4
+	},
+/obj/item/radio{
+	pixel_y = 14;
+	pixel_x = 6
+	},
+/obj/item/gps/spaceruin{
+	pixel_y = 10;
+	pixel_x = -7
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"sW" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"sY" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"ta" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"tb" = (
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"tj" = (
+/obj/structure/cable/layer1,
+/obj/item/universal_scanner,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"tl" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"tm" = (
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"tw" = (
+/obj/machinery/light/warm/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"tG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"tJ" = (
+/obj/structure/sign/poster/contraband/eat/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/book/random,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"tK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"tL" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"tP" = (
+/obj/structure/closet/crate/secure/trashcart/filled,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/caution/white{
+	dir = 4
+	},
+/obj/machinery/light/small/dim/directional/north,
+/obj/item/mop,
+/obj/item/food/badrecipe/moldy/bacteria,
+/obj/effect/spawner/random/maintenance/no_decals,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"tQ" = (
+/obj/structure/rack,
+/obj/item/analyzer,
+/obj/item/radio,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"tW" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"tZ" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/cable/layer1,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"uj" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"uq" = (
+/obj/structure/rack,
+/obj/item/food/peanuts/random,
+/obj/item/circuitboard/machine/microwave,
+/obj/item/hand_labeler,
+/obj/effect/spawner/random/entertainment/coin,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"ur" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"uA" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_vault_lasertrap"
+	},
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"uE" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Glass Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"uF" = (
+/mob/living/basic/mouse/rat,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"uH" = (
+/turf/open/floor/carpet/orange/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"uT" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"uZ" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"va" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice/catwalk,
+/obj/structure/cable/layer1,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"ve" = (
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"vf" = (
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"vg" = (
+/obj/structure/rack,
+/obj/item/analyzer,
+/obj/item/radio,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"vm" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/ammo_casing/foam_dart{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/obj/item/ammo_casing/foam_dart{
+	dir = 4;
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/machinery/light/broken/directional/east,
+/obj/item/toy/snappop{
+	pixel_y = 21;
+	pixel_x = -5
+	},
+/obj/item/toy/snappop{
+	pixel_y = 12;
+	pixel_x = -8
+	},
+/obj/item/ammo_box/magazine/toy/pistol{
+	pixel_x = -2;
+	pixel_y = 7
+	},
+/obj/machinery/duct,
+/obj/machinery/camera/xray/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"vr" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"vv" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/vending/cola/shamblers{
+	onstation_override = 1
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"vw" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"vx" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"vA" = (
+/obj/structure/door_assembly/door_assembly_ext{
+	anchored = 1
+	},
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/carpet/orange/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"vD" = (
+/obj/structure/cable/layer1,
+/obj/item/wrench/caravan{
+	pixel_x = -8
+	},
+/obj/structure/table/wood,
+/obj/item/crowbar/hammer{
+	pixel_x = -4
+	},
+/obj/item/screwdriver/nuke{
+	pixel_y = -4
+	},
+/obj/structure/sign/poster/contraband/pwr_game/directional/south,
+/obj/machinery/light/warm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"vH" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/restraints/legcuffs/beartrap/prearmed{
+	trap_damage = 30
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"vM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"vY" = (
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/light/warm/directional/east,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"vZ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/south,
+/obj/effect/overloader_trap{
+	uses_remaining = 1;
+	shock_damage = 60;
+	trigger_cooldown_duration = 30;
+	shock_range = 0;
+	trigger_range = 0;
+	machine_overload_damage = 200
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"wg" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STAFF MEETING ROOM - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"wk" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"wn" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"ws" = (
+/obj/machinery/light/warm/directional/west,
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 9;
+	pixel_x = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"wy" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"wz" = (
+/obj/item/storage/box/donkpockets{
+	pixel_y = 8;
+	pixel_x = -8
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/item/storage/box/donkpockets/donkpockethonk{
+	pixel_x = -8
+	},
+/obj/item/storage/box/donkpockets/donkpockethonk{
+	pixel_y = -4;
+	pixel_x = -8
+	},
+/obj/item/storage/box/donkpockets/donkpocketpizza{
+	pixel_y = 8;
+	pixel_x = 8
+	},
+/obj/item/storage/box/donkpockets/donkpocketpizza{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/storage/box/donkpockets/donkpocketspicy{
+	pixel_x = 8
+	},
+/obj/item/storage/box/donkpockets/donkpocketspicy{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/structure/closet/crate/large{
+	desc = "A hefty wooden crate labelled 'DONK POCKETS BOX BULK' You'll need a crowbar to get it open."
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"wA" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/storage/cans/sixsoda,
+/obj/machinery/light/warm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"wD" = (
+/obj/machinery/porta_turret/syndicate/donk,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"wE" = (
+/obj/structure/table/wood,
+/obj/item/storage/dice{
+	pixel_y = 10;
+	pixel_x = 6
+	},
+/obj/item/dice/d100{
+	pixel_y = 12;
+	pixel_x = -9
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/rpgrules{
+	pixel_y = -2;
+	pixel_x = -8
+	},
+/obj/item/toy/figure/dsquad{
+	toysay = "Kneel before me!";
+	name = "\improper Evil Overlord action figure";
+	pixel_x = 3;
+	pixel_y = -5
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"wH" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"wK" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled... something. Whatever it said has been scratched out and painted over.";
+	id_tag = "donk_door_bolts"
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/structure/cable/layer1,
+/obj/structure/barricade/wooden/crude,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"wQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"wX" = (
+/obj/structure/table/wood,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"xg" = (
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"xn" = (
+/obj/structure/cable/layer1,
+/obj/structure/frame/machine/secured,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"xr" = (
+/obj/structure/closet/crate/large{
+	desc = "A hefty wooden crate labelled 'REJECT - DEFECTIVE'. You'll need a crowbar to get it open."
+	},
+/obj/item/ammo_casing/shotgun/ion{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/obj/item/ammo_casing/shotgun/ion,
+/obj/item/ammo_casing/shotgun/ion{
+	pixel_y = 4;
+	pixel_x = 4
+	},
+/obj/machinery/duct,
+/obj/item/gun/ballistic/shotgun/musket{
+	pixel_y = -7
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"xs" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/machinery/light/warm/directional/south,
+/obj/item/toy/plush/donkpocket{
+	pixel_x = 5;
+	pixel_y = 3
+	},
+/obj/item/kitchen/tongs{
+	pixel_y = 4;
+	pixel_x = -7
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"xu" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_trap_shutters"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"xE" = (
+/obj/machinery/light/broken/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"xG" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/corner{
+	dir = 8
+	},
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"xN" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"xO" = (
+/obj/machinery/duct,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"xT" = (
+/obj/effect/spawner/random/trash/cigbutt,
+/obj/effect/spawner/random/trash/mess,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/spawner/random/entertainment/lighter,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"xU" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"xV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"xW" = (
+/obj/machinery/light/small/dim/directional/west,
+/obj/structure/cable/layer1,
+/obj/machinery/light_switch/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"xY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"yb" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"yi" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"ys" = (
+/obj/structure/cable/layer1,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"yz" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/obj/machinery/porta_turret/syndicate/donk,
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"yE" = (
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it."
+	},
+/obj/item/poster/random_contraband{
+	pixel_x = 8;
+	pixel_y = 1
+	},
+/obj/item/poster/random_contraband{
+	pixel_x = 2;
+	pixel_y = -1
+	},
+/obj/item/poster/random_contraband{
+	pixel_x = -5;
+	pixel_y = -2
+	},
+/obj/item/poster/random_contraband{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/poster/traitor{
+	pixel_y = 4;
+	pixel_x = -1
+	},
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"yF" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"yI" = (
+/obj/structure/cable/layer1,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"yK" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"yS" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"yU" = (
+/obj/item/rack_parts{
+	pixel_y = 8;
+	pixel_x = 2
+	},
+/obj/effect/turf_decal/bot_red,
+/obj/item/storage/toolbox/syndicate{
+	pixel_y = -4;
+	pixel_x = -2
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"zb" = (
+/obj/effect/mapping_helpers/airlock/abandoned,
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE D - EMPLOYEES ONLY."
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"zd" = (
+/obj/effect/spawner/random/trash/cigbutt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"zg" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"zi" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STAFF MEETING ROOM - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"zm" = (
+/obj/structure/closet/cardboard/metal{
+	desc = "An iron alternative to the ubiquitous cardboard box. This one is labelled '<b>Do Not Open - Live Snakes Inside</b>'."
+	},
+/obj/item/toy/plush/snakeplushie,
+/mob/living/basic/snake/banded,
+/mob/living/basic/snake/banded,
+/mob/living/basic/snake/banded,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"zq" = (
+/obj/item/cardboard_cutout,
+/obj/item/ammo_casing/foam_dart{
+	pixel_x = 10;
+	pixel_y = 7;
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"zt" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"zz" = (
+/obj/structure/table/wood,
+/obj/item/laser_pointer/red,
+/obj/item/pen/red{
+	pixel_y = 9;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"zO" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/south{
+	cable_layer = 1
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"zQ" = (
+/mob/living/basic/viscerator,
+/obj/effect/turf_decal/bot_red,
+/obj/machinery/button/door{
+	pixel_y = 23;
+	pixel_x = 8;
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	id = "donk_aicore_door_bolts";
+	name = "Door Bolt Button";
+	skin = "-warning";
+	silicon_access_disabled = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ab" = (
+/obj/effect/spawner/random/trash/cigbutt,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"Af" = (
+/obj/structure/safe/floor,
+/obj/structure/mannequin/wood,
+/obj/item/circuitboard/computer/slot_machine,
+/obj/item/circuitboard/computer/slot_machine,
+/obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade,
+/obj/item/roulette_wheel_beacon,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/silver,
+/obj/item/card/id/away/donk/boss,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Aj" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Aq" = (
+/obj/structure/table/wood,
+/obj/item/food/ready_donk/mac_n_cheese{
+	pixel_y = -2;
+	pixel_x = -6
+	},
+/obj/item/food/ready_donk/mac_n_cheese{
+	pixel_y = 2;
+	pixel_x = -6
+	},
+/obj/item/kitchen/fork/plastic{
+	pixel_x = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"At" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/structure/electrified_grille{
+	spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1)
+	},
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Au" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/door/firedoor,
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/machinery/door/airlock/wood{
+	name = "Executive Airlock";
+	desc = "It's labelled MANAGEMENT - SENIOR EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"AB" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/machinery/light/red/dim/directional/south,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"AG" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/highsecurity{
+	desc = "It's labelled SYSTEM CONTROL - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_door_bolts";
+	name = "Secure Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"AQ" = (
+/obj/structure/frame/machine/secured,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/circuitboard/machine/vendor,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/camera/autoname/directional/south{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"AU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/obj/machinery/navbeacon{
+	location = "workhall";
+	codes_txt = "patrol;next_patrol=securehall"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Bb" = (
+/obj/machinery/navbeacon{
+	location = "cybersun_ai_core"
+	},
+/obj/structure/cable/layer1,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Bc" = (
+/obj/machinery/light/warm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Bg" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/stack/sheet/plastitaniumglass/fifty,
+/obj/item/stack/sheet/mineral/plastitanium{
+	pixel_y = 8;
+	amount = 50
+	},
+/obj/machinery/light_switch/directional/south,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Bi" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/structure/grille,
+/turf/open/space/basic,
+/area/space)
+"Bj" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/medical/minor_healing,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Bo" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Br" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/effect/spawner/random/decoration/glowstick,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Bx" = (
+/obj/machinery/navbeacon{
+	location = "hall2";
+	codes_txt = "patrol;next_patrol=hall3"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"BE" = (
+/obj/structure/cable/layer1,
+/obj/machinery/power/terminal{
+	dir = 1;
+	cable_layer = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"BH" = (
+/obj/structure/cable/layer1,
+/obj/machinery/navbeacon{
+	location = "managers";
+	codes_txt = "patrol;next_patrol=workhall"
+	},
+/mob/living/basic/bot/dedbot,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"BI" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled DISPOSALS - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"BJ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STALL 3 - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"BP" = (
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"BS" = (
+/mob/living/basic/cockroach,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/arrows/white{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Ct" = (
+/obj/structure/cable/layer1,
+/obj/item/cigbutt,
+/obj/machinery/light_switch/directional/east,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/south{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Cz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"CD" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice/catwalk,
+/obj/structure/cable/layer1,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"CF" = (
+/obj/structure/sink/directional/south,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"CJ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"CR" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"CS" = (
+/obj/structure/table/wood,
+/obj/structure/desk_bell,
+/obj/machinery/duct,
+/obj/structure/curtain/cloth/fancy,
+/obj/structure/cable/layer1,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"CU" = (
+/obj/structure/chair/wood,
+/obj/structure/sign/poster/contraband/syndicate_recruitment/directional/north,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_entrance_trap_alpha"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_office_entrance_trap_alpha";
+	resets_self = 1;
+	donk_ai_slave = 1;
+	multiuse = 1
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"CZ" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Db" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/machinery/door/airlock/highsecurity{
+	desc = "It's labelled SYSTEM CONTROL - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_door_bolts";
+	name = "Secure Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Dg" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/soda_cans/shamblers{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming{
+	pixel_x = -5
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Di" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/decoration/glowstick,
+/turf/open/floor/catwalk_floor/iron_smooth/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Dm" = (
+/obj/structure/filingcabinet,
+/obj/structure/sign/clock/directional/north,
+/obj/item/food/candy/bronx,
+/obj/item/lipstick,
+/obj/item/grenade/frag,
+/obj/item/sticker/heart,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Dn" = (
+/obj/effect/spawner/random/trash/food_packaging,
+/obj/item/stack/sheet/mineral/wood/fifty{
+	amount = 42
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"Dp" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Dt" = (
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen/yellow,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Dz" = (
+/obj/machinery/door/poddoor/shutters/preopen,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/obj/structure/cable/layer1,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"DI" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Glass Airlock"
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"DM" = (
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"DP" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/radio/intercom/directional/south{
+	frequency = 1463
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"DR" = (
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"DT" = (
+/obj/machinery/door/firedoor,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"DX" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"DY" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/machinery/conveyor_switch/oneway{
+	id = "Donk_Trash_Chute"
+	},
+/obj/machinery/light/small/dim/directional/west,
+/obj/machinery/button/door{
+	pixel_y = 10;
+	pixel_x = -23;
+	id = "donk_waste"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"El" = (
+/obj/structure/cable/layer1,
+/obj/machinery/recharger{
+	pixel_x = -9;
+	pixel_y = -8
+	},
+/obj/structure/table/wood,
+/obj/item/stock_parts/matter_bin{
+	pixel_x = 6;
+	pixel_y = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/oldnote/aiclue,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Ep" = (
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Et" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Eu" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/south,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"EC" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/structure/electrified_grille{
+	spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1)
+	},
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"EK" = (
+/obj/item/coin/plastic{
+	pixel_y = -9;
+	pixel_x = -9
+	},
+/obj/item/ammo_casing/foam_dart{
+	dir = 4;
+	pixel_x = 7;
+	pixel_y = 6
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_waste"
+	},
+/obj/structure/plasticflaps/opaque,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"EQ" = (
+/obj/structure/cable/layer1,
+/obj/structure/sink/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"EX" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"EZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Fc" = (
+/obj/structure/easel{
+	anchored = 1;
+	name = "spreadsheet stand";
+	desc = "Only for the finest of spreadsheets!"
+	},
+/obj/machinery/holopad,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Fd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Fh" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"Fp" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Ft" = (
+/obj/structure/cable/layer1,
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it."
+	},
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/universal_scanner,
+/obj/item/laser_pointer/red,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Fx" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Fy" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/vending/custom,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"FB" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"FE" = (
+/obj/structure/grille/broken,
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/random/trash/crushed_can,
+/obj/structure/cable/layer1,
+/obj/effect/spawner/random/trash/food_packaging,
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"FI" = (
+/mob/living/basic/mouse/rat,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"FL" = (
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"FO" = (
+/obj/machinery/photocopier/gratis,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/obj/effect/overloader_trap{
+	shock_damage = 40;
+	uses_remaining = 3;
+	trigger_delay = 10
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"FT" = (
+/obj/machinery/duct,
+/obj/structure/noticeboard/directional/south,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/rpgclub,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/warning/turrets,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"FY" = (
+/obj/item/food/donut/meat{
+	pixel_x = -2;
+	pixel_y = 1;
+	name = "meaty ring";
+	desc = "A dog treat. It's in the shape of a bagel, and is made of processed meaty giblets."
+	},
+/obj/item/food/bowled/wish{
+	pixel_y = -14;
+	pixel_x = -10;
+	desc = "92% tap water, 7% canine backwash, 1% other.";
+	name = "water bowl"
+	},
+/obj/structure/bed/dogbed,
+/mob/living/basic/pet/dog/bullterrier/guarddog{
+	faction = list("Syndicate")
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Ga" = (
+/obj/effect/spawner/random/entertainment/arcade,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_refuel_window";
+	donk_ai_slave = 1
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Ge" = (
+/obj/item/food/badrecipe/moldy{
+	pixel_x = -5;
+	pixel_y = -6
+	},
+/mob/living/basic/mouse/white,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_waste"
+	},
+/obj/structure/plasticflaps/opaque,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Gg" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_office_peek"
+	},
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Gk" = (
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Gp" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/corner,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Gq" = (
+/obj/structure/rack,
+/obj/item/analyzer,
+/obj/item/radio,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Gs" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/contraband/revolver/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Gw" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	space_dir = 8;
+	name = "Dock 2 External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_2"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Gy" = (
+/obj/structure/table/wood,
+/obj/structure/desk_bell,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"GA" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"GC" = (
+/obj/structure/safe/floor,
+/obj/structure/cable/layer1,
+/obj/item/stack/sheet/mineral/uranium/five,
+/obj/item/storage/box/donkpockets/donkpocketgondola,
+/obj/item/toy/basketball{
+	name = "autographed basketball";
+	desc = "A basketball that has been signed by legendary basketball player Richard E. Durkis."
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/sheet/mineral/diamond{
+	amount = 10
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_vault_lasertrap";
+	suicide_pact = 1;
+	suicide_pact_id = "donk_vault_lasertrap"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"GG" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"GS" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Hb" = (
+/obj/effect/mapping_helpers/damaged_window,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"He" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/entertainment/money_medium,
+/obj/item/storage/bag/money{
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Hh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Hj" = (
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/weldingtool/hugetank,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Hp" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STALL 1 - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Hq" = (
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Ht" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/north{
+	cable_layer = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Hu" = (
+/obj/structure/table/wood,
+/obj/item/trash/boritos/red{
+	pixel_y = 12;
+	pixel_x = 6
+	},
+/obj/item/paper/crumpled{
+	pixel_x = 10;
+	desc = "Ew, it's been used as a napkin..."
+	},
+/obj/item/food/grown/grapes/green{
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Hw" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Hz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"HA" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/caution/white{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"HB" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"HD" = (
+/obj/structure/table/wood/fancy/orange,
+/obj/item/food/beef_wellington{
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"HF" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/west,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/airalarm/directional/west,
+/obj/structure/rack,
+/obj/item/hand_labeler_refill,
+/obj/item/hand_labeler,
+/obj/effect/spawner/random/bureaucracy/pen,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"HG" = (
+/obj/item/broken_bottle,
+/obj/item/cane/white,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"HK" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE A"
+	},
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"HL" = (
+/obj/item/toy/basketball{
+	pixel_y = 8;
+	pixel_x = 1
+	},
+/obj/item/toy/dodgeball{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/item/toy/dodgeball{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/toy/dodgeball,
+/obj/structure/rack,
+/obj/item/toy/basketball{
+	pixel_y = -4;
+	pixel_x = -6
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"HR" = (
+/obj/structure/chair/sofa/right/brown{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"HV" = (
+/obj/structure/shipping_container/donk_co,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"HX" = (
+/obj/structure/rack,
+/obj/item/shard,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Ic" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 3 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_3"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Ie" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Ii" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line,
+/obj/machinery/light/red/dim/directional/south,
+/obj/machinery/camera/xray/directional/south,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Im" = (
+/obj/effect/turf_decal/stripes/red/line,
+/obj/machinery/button/door{
+	pixel_y = -23;
+	pixel_x = -8;
+	normaldoorcontrol = 1;
+	specialfunctions = 4;
+	id = "donk_aicore_door_bolts";
+	name = "Door Bolt Button";
+	skin = "-warning";
+	silicon_access_disabled = 1
+	},
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ip" = (
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Iv" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"IA" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"IL" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/red/dim/directional/west,
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"IN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"IQ" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/robot_debris,
+/mob/living/basic/mouse/rat,
+/obj/effect/decal/cleanable/oil/streak{
+	pixel_y = -7
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"IR" = (
+/obj/structure/closet/cardboard{
+	desc = "A typical example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013' and has the Donk Co. logo stamped on it."
+	},
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/item/trash/popcorn/salty,
+/obj/item/ammo_casing/shotgun/fletchette{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/ammo_casing/shotgun/fletchette{
+	pixel_x = -2;
+	pixel_y = -7
+	},
+/obj/item/ammo_casing/shotgun/fletchette{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/machinery/camera/xray/directional/east,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"IT" = (
+/obj/structure/chair/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/ash{
+	pixel_y = -6;
+	pixel_x = 5
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/layer1,
+/obj/machinery/button/door/invisible_tripwire{
+	donk_ai_slave = 1;
+	suicide_pact = 1;
+	suicide_pact_id = "donk_office_trap_shutters";
+	id = "donk_office_trap_shutters";
+	sync_doors = 0
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"IX" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Jj" = (
+/obj/structure/showerframe{
+	pixel_y = -2;
+	pixel_x = -8
+	},
+/obj/structure/sinkframe{
+	pixel_x = 2
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Jw" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Jx" = (
+/obj/structure/cable/layer1,
+/obj/structure/frame/machine/secured,
+/obj/structure/sign/poster/ripped/directional/east,
+/obj/machinery/duct,
+/obj/item/shard,
+/obj/machinery/camera/autoname/directional/east{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"JE" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"JG" = (
+/obj/structure/sink/directional/west,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"JJ" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/red/dim/directional/west,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"JP" = (
+/obj/structure/sign/poster/contraband/c20r/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt/alternate,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"JX" = (
+/obj/structure/cable/layer1,
+/obj/structure/chair/office{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"JY" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/poddoor/shutters/preopen,
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"JZ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Kd" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Kl" = (
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Kr" = (
+/obj/structure/cable/layer1,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"KC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"KF" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"KG" = (
+/obj/structure/rack,
+/obj/item/toy/ammo/gun,
+/obj/item/toy/ammo/gun,
+/obj/item/toy/gun,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"KH" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/donksnack{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/obj/machinery/camera/autoname/directional/west{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"KI" = (
+/obj/structure/grille/broken,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"KO" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"KQ" = (
+/obj/item/plunger{
+	pixel_x = -9;
+	pixel_y = 18
+	},
+/obj/machinery/light/small/directional/north,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/button/door{
+	pixel_y = 25;
+	pixel_x = 12;
+	id = "donk_toilet"
+	},
+/obj/machinery/button/door{
+	pixel_y = 25;
+	pixel_x = -12;
+	id = "donk_toilet_window";
+	name = "window shutter button"
+	},
+/obj/machinery/airalarm/directional/south,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/toilet/secret{
+	secret_type = /obj/item/toy/plush/nukeplushie;
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"KZ" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 8
+	},
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ld" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=breakroom1";
+	location = "lounge"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Le" = (
+/obj/structure/rack,
+/obj/item/radio,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Lf" = (
+/obj/structure/rack,
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/contraband/donk_co/directional/north,
+/obj/item/storage/box/donkpockets,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Li" = (
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ls" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/item/restraints/legcuffs/beartrap/prearmed{
+	trap_damage = 30
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Lt" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/medical/minor_healing,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Lz" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/ai_module/supplied/protect_station{
+	pixel_x = 2;
+	pixel_y = 5
+	},
+/obj/machinery/light/red/dim/directional/east,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"LC" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/firedoor,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"LD" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"LF" = (
+/obj/structure/cable/layer1,
+/obj/structure/bookcase,
+/obj/item/book/granter/crafting_recipe/death_sandwich{
+	pixel_x = 6;
+	pixel_y = -7
+	},
+/obj/item/book/granter/crafting_recipe/cooking_sweets_101{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/book/manual/wiki/cooking_to_serve_man{
+	pixel_x = -5;
+	pixel_y = -3
+	},
+/obj/item/book/random{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"LG" = (
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"LI" = (
+/obj/item/circuitboard/machine/vending/donksofttoyvendor{
+	pixel_y = -2;
+	pixel_x = -6
+	},
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"LL" = (
+/obj/structure/chair/comfy/black,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"LM" = (
+/obj/effect/decal/cleanable/robot_debris/up,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"LO" = (
+/obj/structure/sign/poster/contraband/donut_corp/directional/west,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"LP" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"LQ" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/contraband/arc_slimes/directional/north,
+/obj/item/trash/syndi_cakes{
+	pixel_y = 4;
+	pixel_x = -8
+	},
+/obj/item/clothing/shoes/sneakers/orange,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"LS" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/stock_parts/micro_laser/ultra{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/stock_parts/micro_laser/ultra{
+	pixel_x = -8;
+	pixel_y = -12
+	},
+/obj/item/stock_parts/micro_laser/ultra{
+	pixel_x = -4;
+	pixel_y = -4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"LW" = (
+/obj/structure/filingcabinet/chestdrawer/wheeled,
+/obj/item/poster/random_contraband,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka2,
+/obj/item/healthanalyzer,
+/obj/item/skillchip/brainwashing,
+/obj/item/storage/fancy/cigarettes/cigpack_shadyjims,
+/obj/machinery/light/warm/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Mc" = (
+/obj/item/trash/boritos/red{
+	pixel_y = -12
+	},
+/obj/machinery/navbeacon{
+	location = "securehall";
+	codes_txt = "patrol;next_patrol=managers"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Md" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Mf" = (
+/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/effect/spawner/random/bureaucracy/paper,
+/obj/effect/spawner/random/bureaucracy/pen,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Mg" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_refuel_window"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"Mh" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/obj/item/card/id/away/donk,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Mr" = (
+/obj/machinery/camera/autoname/directional/west{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Mu" = (
+/obj/effect/mapping_helpers/bombable_wall,
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Mx" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/machinery/navbeacon{
+	location = "hall1";
+	codes_txt = "patrol;next_patrol=hall2"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"MJ" = (
+/obj/structure/cable/layer1,
+/obj/structure/chair/office/tactical{
+	dir = 4
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"MN" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/wirecutters{
+	pixel_y = -6
+	},
+/obj/item/circuitboard/machine/microwave{
+	pixel_x = 9;
+	pixel_y = 6
+	},
+/obj/effect/decal/cleanable/cobweb,
+/obj/item/multitool/circuit{
+	pixel_y = 2;
+	pixel_x = -8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/west{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"MO" = (
+/obj/machinery/duct,
+/obj/machinery/vending/snack{
+	onstation_override = 1
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"MR" = (
+/turf/closed/wall/r_wall/syndicate/nodiagonal{
+	desc = "An ominous looking wall.";
+	name = "reinforced wall"
+	},
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ne" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Ng" = (
+/obj/structure/cable/layer1,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/food_or_drink/donkpockets_single,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/spawner/random/maintenance/no_decals,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Ni" = (
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/obj/structure/cable/layer1,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Nk" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/bandages,
+/obj/machinery/camera/xray/directional/west,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Nr" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STAFFROOM - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Nt" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Nw" = (
+/obj/structure/cable/layer1,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"NB" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/stock_parts/capacitor/super{
+	pixel_y = 5
+	},
+/obj/machinery/button/door{
+	pixel_y = 23;
+	pixel_x = -10;
+	id = "donk_corridor_peek";
+	name = "shutter button"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"NH" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Glass Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/layer1,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"NM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"NS" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
+"NY" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/coffee{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"NZ" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 2 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_2"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Of" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/fuel_pool,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Oh" = (
+/obj/effect/turf_decal/stripes/red/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Oi" = (
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck/cas{
+	pixel_y = 1;
+	pixel_x = -6
+	},
+/obj/item/toy/cards/deck/cas/black{
+	pixel_y = 10;
+	pixel_x = -6
+	},
+/obj/machinery/duct,
+/obj/machinery/light_switch/directional/south,
+/obj/item/universal_scanner{
+	pixel_y = 12;
+	pixel_x = 5
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"OD" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"OE" = (
+/obj/structure/cable/layer1,
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE C - EMPLOYEES ONLY."
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"OL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"OP" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/item/screwdriver{
+	pixel_y = -12
+	},
+/obj/item/vending_refill/custom,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"OR" = (
+/obj/machinery/atmospherics/components/tank/air{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"OS" = (
+/obj/structure/cable/layer1,
+/obj/item/trash/ready_donk,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/closet/crate/bin,
+/obj/machinery/firealarm/directional/east,
+/obj/structure/sign/clock/directional/north,
+/obj/item/trash/syndi_cakes,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Pd" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/machinery/duct,
+/obj/item/toy/snappop{
+	pixel_y = 6;
+	pixel_x = 6
+	},
+/obj/item/weldingtool{
+	pixel_y = 3;
+	pixel_x = -5
+	},
+/obj/item/storage/toolbox/electrical,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Pe" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/obj/item/book/random,
+/obj/item/food/badrecipe/moldy{
+	pixel_y = -6
+	},
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Pg" = (
+/obj/structure/safe,
+/obj/item/pet_carrier,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/food/ready_donk/donkrange_chicken,
+/obj/item/gun/ballistic/rifle/boltaction/donkrifle,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Pk" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/tool{
+	onstation_override = 1
+	},
+/obj/structure/sign/poster/contraband/donk_co/directional/west,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Pq" = (
+/obj/item/mail/junkmail,
+/obj/item/folder/red,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/officememo,
+/obj/structure/filingcabinet/chestdrawer/wheeled,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/light_switch/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Pv" = (
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Px" = (
+/obj/structure/chair/wood,
+/obj/structure/sign/poster/contraband/gorlex_recruitment/directional/north,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_entrance_trap_beta"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_office_entrance_trap_beta";
+	resets_self = 1;
+	donk_ai_slave = 1;
+	multiuse = 1
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"PA" = (
+/obj/effect/decal/cleanable/fuel_pool,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"PD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"PE" = (
+/obj/structure/cable/layer1,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/structure/sign/poster/contraband/hacking_guide/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"PU" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/camera/xray/directional/north,
+/mob/living/basic/mouse/rat,
+/obj/item/food/badrecipe/moldy/bacteria,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"PX" = (
+/obj/structure/cable/layer1,
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Qc" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+	desc = "It's labelled STORAGE E - EMPLOYEES ONLY."
+	},
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"Qe" = (
+/obj/structure/sign/poster/contraband/donk_co/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Qr" = (
+/obj/structure/cable/layer1,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/machinery/light/warm/directional/west,
+/obj/machinery/duct,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Qw" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Qy" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/north{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"QA" = (
+/obj/structure/sign/warning,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"QF" = (
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"QM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/vending/sovietsoda{
+	onstation_override = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"QV" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/broken/directional/north,
+/obj/machinery/duct,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"QX" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Ra" = (
+/obj/structure/cable/layer1,
+/obj/item/chair/plastic,
+/obj/item/chair/plastic{
+	pixel_y = 4
+	},
+/obj/item/chair/plastic{
+	pixel_y = 8
+	},
+/obj/item/chair/plastic{
+	pixel_y = 16
+	},
+/obj/item/chair/plastic{
+	pixel_y = 12
+	},
+/obj/item/chair/plastic{
+	pixel_y = 16
+	},
+/obj/structure/rack,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Rb" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Re" = (
+/obj/structure/table/wood/fancy/orange,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Ri" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/east{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Rj" = (
+/obj/structure/sign/warning/pods/directional/west,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Ro" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Rq" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Rv" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 4
+	},
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Rx" = (
+/obj/structure/rack,
+/obj/structure/cable/layer1,
+/obj/item/storage/box/mothic_rations,
+/obj/structure/sign/poster/contraband/mothic_rations/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Ry" = (
+/obj/effect/decal/cleanable/glass/plastitanium/screws{
+	desc = "Someone's got a screw loose! Or 41 screws loose."
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"RA" = (
+/obj/item/shield/buckler,
+/obj/item/grenade/barrier,
+/obj/effect/decal/cleanable/plastic,
+/obj/machinery/light/warm/dim/directional/west,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"RC" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/east,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/north{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"RH" = (
+/obj/docking_port/stationary{
+	dir = 8;
+	dwidth = 11;
+	height = 24;
+	name = "Donk Co Trading Outpost: Dock 2";
+	shuttle_id = "whiteship_home";
+	width = 35
+	},
+/turf/open/space/basic,
+/area/space)
+"RI" = (
+/obj/structure/chair/sofa/left/brown{
+	dir = 1
+	},
+/obj/machinery/light/warm/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"RN" = (
+/obj/structure/closet/l3closet,
+/obj/item/soap/syndie,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"RR" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/door/airlock/grunge{
+	desc = "It's labelled STALL 2 - EMPLOYEES ONLY"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"RU" = (
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"RW" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate,
+/obj/machinery/door/airlock/wood{
+	desc = "It's labelled MANAGERS OFFICE - SENIOR EMPLOYEES ONLY";
+	name = "Ecevutive Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_vault"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"RX" = (
+/obj/item/stack/medical/suture{
+	amount = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Sh" = (
+/obj/item/trash/ready_donk,
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Sj" = (
+/obj/effect/spawner/random/trash/mopbucket,
+/obj/item/wrench,
+/obj/item/crowbar,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Sl" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/meter,
+/obj/effect/spawner/random/maintenance/no_decals,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"Sx" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/west{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"Sy" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"SA" = (
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"SF" = (
+/obj/item/target/clown{
+	pixel_y = 3
+	},
+/obj/item/bikehorn,
+/obj/item/soap/syndie{
+	pixel_y = -9
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"SK" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/red/dim/directional/east,
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"SO" = (
+/obj/item/ammo_box/foambox{
+	pixel_x = -10;
+	pixel_y = 7
+	},
+/obj/item/mod/module/recycler/donk/safe{
+	pixel_y = -3;
+	pixel_x = 7
+	},
+/obj/item/gun/ballistic/automatic/pistol/toy{
+	pixel_y = -6;
+	pixel_x = -5
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"SQ" = (
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"SX" = (
+/obj/machinery/button/door{
+	pixel_y = 24;
+	pixel_x = 9;
+	id = "donk_office_trap_shutters";
+	name = "shutter button";
+	sync_doors = 0
+	},
+/obj/machinery/button/door/selfdestructs{
+	normaldoorcontrol = 1;
+	id = "donk_door_bolts";
+	specialfunctions = 4;
+	pixel_x = -9;
+	pixel_y = 24;
+	desc = "A button for unbolting doors throughout the facility.";
+	name = "door bolt override"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"SY" = (
+/obj/structure/cable/layer1,
+/obj/effect/turf_decal/stripes/red/line,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Ti" = (
+/obj/structure/sign/poster/ripped/directional/north,
+/obj/structure/reagent_dispensers/fueltank/large,
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Tl" = (
+/obj/structure/cable/layer1,
+/obj/structure/frame/machine/secured,
+/obj/machinery/light/red/dim/directional/north,
+/obj/item/circuitboard/machine/smes,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"Tp" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_corridor_peek"
+	},
+/obj/structure/cable/layer1,
+/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"Tz" = (
+/obj/structure/table/wood,
+/obj/item/hourglass{
+	pixel_x = 10;
+	pixel_y = 7
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"TB" = (
+/obj/structure/rack,
+/turf/open/floor/catwalk_floor/iron_smooth/airless,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"TC" = (
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/trashcart/filled,
+/obj/item/food/badrecipe/moldy/bacteria,
+/obj/item/food/fishmeat/donkfish,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/obj/item/card/id/away/donk{
+	pixel_y = -4;
+	pixel_x = -8
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"TF" = (
+/obj/effect/mapping_helpers/bombable_wall,
+/turf/closed/wall/r_wall,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"TH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/light/warm/directional/south,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"TI" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"TK" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"TP" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/bot/cleanbot{
+	additional_access = /datum/id_trim/away/hauntedtradingpost;
+	bot_mode_flags = 0;
+	name = "\improper Henry";
+	unique_name = 1;
+	desc = "A dusty and dented old cleaning robot. Despite his scars and his aging body, he determinedly stands by to cleanse the galaxy. One stain at a time.";
+	req_one_access = list("syndicate")
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"TR" = (
+/obj/structure/sign/poster/ripped/directional/south,
+/obj/structure/cable/layer1,
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it."
+	},
+/obj/effect/spawner/random/maintenance/no_decals/two,
+/obj/item/toy/snappop{
+	pixel_x = 5
+	},
+/obj/item/assembly/prox_sensor{
+	pixel_y = -3;
+	pixel_x = -6
+	},
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"TT" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/components/unary/passive_vent{
+	dir = 4;
+	name = "external vent"
+	},
+/turf/open/space/basic,
+/area/space)
+"TU" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"TY" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin,
+/obj/item/pen/red,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Uf" = (
+/obj/machinery/door/firedoor,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Uk" = (
+/obj/structure/bed/maint,
+/obj/item/pen,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Uu" = (
+/obj/structure/table/wood,
+/obj/item/pen/red{
+	pixel_y = -3;
+	pixel_x = -6
+	},
+/obj/item/poster/random_contraband{
+	pixel_y = 8
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Ux" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/departments/custodian/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Uy" = (
+/obj/structure/cable/layer1,
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/obj/machinery/duct,
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"UD" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/machinery/door/airlock/wood{
+	desc = "It's labelled CONFERENCE ROOM - SENIOR EMPLOYEES ONLY";
+	name = "Executive Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"UO" = (
+/obj/structure/chair/sofa/corner/brown{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"UV" = (
+/obj/effect/decal/cleanable/fuel_pool,
+/obj/item/lighter{
+	pixel_y = 8;
+	pixel_x = 14
+	},
+/obj/effect/decal/cleanable/oil/slippery{
+	pixel_y = 6;
+	pixel_x = 6
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"UW" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/machinery/vending/medical{
+	onstation_override = 1;
+	name = "\improper CyberMed +"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"UZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/wood{
+	desc = "It's labelled CONFERENCE ROOM - SENIOR EMPLOYEES ONLY";
+	name = "Executive Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_vault"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Vf" = (
+/obj/effect/spawner/random/structure/furniture_parts,
+/obj/effect/spawner/random/entertainment/musical_instrument,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Vj" = (
+/obj/structure/table/wood,
+/obj/item/food/cornchips{
+	pixel_x = -6;
+	pixel_y = 10
+	},
+/obj/item/food/chocolatebar{
+	pixel_y = 6;
+	pixel_x = 5
+	},
+/obj/item/toy/figure/ian{
+	name = "\improper Dire-Corgi action figure";
+	pixel_x = 2;
+	pixel_y = -13;
+	toysay = "ARF!!!"
+	},
+/obj/item/reagent_containers/cup/glass/mug/tea{
+	pixel_y = -2;
+	pixel_x = -8
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Vl" = (
+/obj/structure/table/wood,
+/obj/item/toy/figure/wizard{
+	pixel_y = 9;
+	pixel_x = -4;
+	toysay = "CLANG!";
+	toysound = 'sound/effects/clang.ogg'
+	},
+/obj/item/toy/figure/warden{
+	name = "\improper Knight action figure";
+	toysay = "Upon my oath, Armoria will not fall!"
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Vm" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/obj/structure/sign/poster/contraband/microwave/directional/north,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Vq" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/circuitboard/machine/vendor,
+/obj/item/circuitboard/machine/vendor{
+	pixel_y = 12
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"Vw" = (
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - MISC' and has the Donk Co. logo stamped on it."
+	},
+/obj/item/stack/sheet/cardboard/fifty{
+	pixel_y = 4
+	},
+/obj/item/paper_bin/bundlenatural{
+	pixel_x = 6
+	},
+/obj/item/paper_bin/bundlenatural{
+	pixel_x = -5
+	},
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"VA" = (
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"VJ" = (
+/obj/structure/cable/layer1,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/west{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"VP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/navbeacon{
+	location = "hall3";
+	codes_txt = "patrol;next_patrol=hall4"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"VQ" = (
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"VW" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
+"VX" = (
+/obj/structure/cable/layer1,
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/pistol/toy,
+/obj/effect/decal/cleanable/fuel_pool,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Wa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip{
+	pixel_y = 6;
+	pixel_x = 8
+	},
+/obj/machinery/navbeacon{
+	location = "hall4";
+	codes_txt = "patrol;next_patrol=lounge"
+	},
+/mob/living/basic/bot/firebot{
+	additional_access = /datum/id_trim/away/hauntedtradingpost;
+	bot_mode_flags = 3;
+	req_one_access = list("syndicate");
+	faction = list("Syndicate")
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Wf" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/structure/electrified_grille{
+	spawn_list = list(/obj/structure/grille,/obj/structure/cable/layer1)
+	},
+/turf/open/space/basic,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Wg" = (
+/obj/structure/rack,
+/obj/item/card/emagfake{
+	pixel_x = 1;
+	pixel_y = 8
+	},
+/obj/item/card/emagfake{
+	pixel_y = 2
+	},
+/obj/item/card/emagfake{
+	pixel_y = -4;
+	pixel_x = -1
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"Wn" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/broken/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Wo" = (
+/obj/structure/closet/crate/cardboard/mothic{
+	name = "cardboard box";
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'ORDER #494316' and has the seal of the nomadic moth fleet stamped on it."
+	},
+/obj/item/food/grown/herbs{
+	pixel_x = 10;
+	pixel_y = 4
+	},
+/obj/item/food/grown/herbs{
+	pixel_x = -6;
+	pixel_y = 1
+	},
+/obj/item/food/grown/herbs,
+/obj/effect/spawner/random/trash/deluxe_garbage,
+/obj/effect/spawner/random/trash/food_packaging,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Wu" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/warm/directional/west,
+/obj/machinery/duct,
+/obj/structure/closet/crate/bin,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Wv" = (
+/obj/structure/fireaxecabinet/empty/directional/north,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Ww" = (
+/obj/machinery/vending/coffee{
+	onstation_override = 1
+	},
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/obj/effect/mapping_helpers/broken_machine,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"WA" = (
+/obj/machinery/door/airlock/highsecurity{
+	desc = "It's labelled AI CORE - SENIOR EMPLOYEES ONLY";
+	id_tag = "donk_aicore_door_bolts";
+	name = "Secure Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/away/command,
+/obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
+/turf/open/floor/circuit/red/off,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"WD" = (
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen/yellow,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"WF" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Dock 3 Internal Airlock"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_3"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"WN" = (
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"WO" = (
+/obj/structure/cable/layer1,
+/obj/machinery/power/smes/magical/cybersun{
+	cable_layer = 1;
+	donk_ai_slave = 1;
+	input_level = 180000;
+	output_level = 200000
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"WP" = (
+/obj/effect/spawner/structure/window/reinforced/indestructible,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"WV" = (
+/obj/structure/cable/layer1,
+/obj/structure/sign/poster/ripped/directional/north,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"WW" = (
+/obj/item/electronics/firelock{
+	pixel_x = 8
+	},
+/obj/item/trash/ready_donk{
+	pixel_y = 10;
+	pixel_x = -9
+	},
+/obj/effect/turf_decal/arrows/red{
+	dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "Donk_Trash_Chute"
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
+"Xe" = (
+/obj/structure/cable/layer1,
+/obj/machinery/vending/cola/shamblers{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/obj/effect/overloader_trap,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Xh" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Xj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/bureaucracy/briefcase,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"Xu" = (
+/obj/item/ammo_casing/foam_dart{
+	pixel_x = 10;
+	pixel_y = 14;
+	dir = 4
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"Xy" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood/fancy/orange,
+/obj/item/storage/box/donkpockets{
+	pixel_y = 12;
+	pixel_x = 8
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_y = 12;
+	pixel_x = -6
+	},
+/obj/item/food/dankpocket{
+	pixel_x = -10
+	},
+/obj/item/food/dankpocket,
+/obj/item/food/dankpocket{
+	pixel_x = 10
+	},
+/obj/machinery/light/warm/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"Xz" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/obj/machinery/door/poddoor/shutters{
+	id = "donk_market"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"XB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/spawner/random/structure/furniture_parts,
+/obj/item/stock_parts/capacitor/super,
+/obj/item/stock_parts/capacitor/super,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"XC" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	space_dir = 4;
+	name = "Dock 3 External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "donk_dock_3"
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"XJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/effect/decal/cleanable/wrapping,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"XK" = (
+/obj/machinery/vending/donksnack{
+	onstation_override = 1
+	},
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"XR" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"XT" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_smooth,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"XU" = (
+/obj/structure/table/wood,
+/obj/item/coffee_cartridge{
+	pixel_y = -2;
+	pixel_x = -12
+	},
+/obj/item/reagent_containers/cup/glass/mug/britcup{
+	pixel_x = -11;
+	pixel_y = 7
+	},
+/obj/item/pinata/donk,
+/obj/item/radio/intercom/directional/north{
+	frequency = 1463
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"XW" = (
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield,
+/turf/open/floor/circuit/red,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"XX" = (
+/obj/structure/cable/layer1,
+/obj/machinery/light/small/broken/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/button/door/invisible_tripwire{
+	id = "donk_vault_lasertrap";
+	suicide_pact = 1;
+	suicide_pact_id = "donk_vault_lasertrap"
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Ye" = (
+/obj/structure/cable/layer1,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/machinery/camera/xray/directional/south,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Yg" = (
+/obj/structure/cable/layer1,
+/obj/machinery/duct,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"Yq" = (
+/obj/structure/closet/crate/trashcart/laundry,
+/obj/item/bedsheet/syndie{
+	pixel_y = 5
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
+/obj/item/storage/pill_bottle/happy{
+	pixel_x = -8
+	},
+/obj/item/bedsheet/orange{
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/bot_red,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"Yw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"YB" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/porta_turret/syndicate/donk{
+	scan_range = 7
+	},
+/turf/open/floor/plating/reinforced,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"YF" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/wood,
+/obj/item/food/pizza/donkpocket{
+	pixel_y = 6;
+	pixel_x = 2
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"YG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sink/directional/south,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor)
+"YI" = (
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"YJ" = (
+/obj/machinery/light/small/broken/directional/west,
+/mob/living/basic/viscerator,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage)
+"YK" = (
+/obj/item/dice/d4{
+	pixel_y = -6;
+	pixel_x = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/duct,
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"YM" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"YN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/duct,
+/obj/structure/cable/layer1,
+/obj/machinery/light_switch/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor)
+"YR" = (
+/obj/structure/cable/layer1,
+/obj/structure/frame/machine/secured,
+/obj/machinery/duct,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/employees)
+"YT" = (
+/obj/structure/aquarium/donkfish,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"YX" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom)
+"YY" = (
+/obj/structure/sign/clock/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"YZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "donk_office_trap_shutters"
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
+"Zf" = (
+/obj/structure/filingcabinet,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/nomodsuits,
+/obj/item/paper/fluff/ruins/hauntedtradingpost/oldnote,
+/obj/item/paper/fluff/junkmail_generic{
+	name = "strange note"
+	},
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt/alternate_alt,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Zi" = (
+/obj/structure/cable/layer1,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint)
+"Zn" = (
+/obj/structure/closet/crate/mail,
+/obj/item/mail/junkmail,
+/obj/item/mail/junkmail,
+/obj/item/paper/fluff/operative,
+/obj/item/mail/junkmail,
+/obj/item/mail/junkmail,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"Zt" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	pipe_color = "#FF7B00";
+	color = "#FF7B00"
+	},
+/obj/structure/sign/poster/ripped/directional/north,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+"Zu" = (
+/obj/structure/lattice,
+/obj/structure/grille/broken,
+/turf/open/space/basic,
+/area/space)
+"ZI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom)
+"ZK" = (
+/obj/item/stack/tile/carpet/donk/thirty{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/effect/spawner/random/decoration/carpet,
+/obj/item/toy/plush/donkpocket{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/obj/item/pillow{
+	pixel_y = -2;
+	pixel_x = 10
+	},
+/obj/effect/turf_decal/bot_red,
+/obj/structure/closet/crate/cardboard{
+	desc = "A fine example of the ubiquitous cardboard box. Handy if you want to store things. This box is labelled 'OUTLET 6013 - DECO' and has the Donk Co. logo stamped on it."
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"ZU" = (
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"ZZ" = (
+/obj/machinery/camera/autoname/directional/east{
+	camera_construction_state = 1;
+	camera_enabled = 0
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hauntedtradingpost/public)
+
+(1,1,1) = {"
+qR
+qR
+wn
+wn
+wn
+wn
+wn
+wn
+wn
+wn
+wn
+CD
+EC
+EC
+CD
+EC
+gz
+me
+Ge
+EK
+gz
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+"}
+(2,1,1) = {"
+qR
+qR
+wn
+fA
+qP
+ZK
+wz
+yE
+RA
+sM
+wn
+lQ
+ys
+ys
+Ni
+lQ
+gz
+TC
+Sh
+jq
+WP
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+"}
+(3,1,1) = {"
+qR
+qR
+wn
+Dn
+hO
+xU
+WN
+zm
+WN
+mz
+wn
+MN
+LS
+El
+ru
+Vq
+gz
+HG
+WW
+FI
+WP
+qR
+TT
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+RH
+qR
+qR
+qR
+qR
+qR
+"}
+(4,1,1) = {"
+qR
+qR
+wn
+Yq
+zd
+yU
+xU
+Zn
+xU
+wk
+wn
+cT
+oW
+VW
+oW
+vD
+gz
+cB
+gh
+Pe
+gz
+gz
+rx
+gz
+qR
+qR
+qR
+qR
+Pv
+gK
+Pv
+Pv
+gK
+Pv
+Gw
+Pv
+Pv
+Gw
+Pv
+qR
+ba
+qR
+qR
+"}
+(5,1,1) = {"
+qR
+qR
+wn
+xT
+kz
+Ab
+ZU
+ZU
+xE
+wk
+wn
+PE
+iX
+tb
+tb
+Gs
+gz
+tP
+BS
+HA
+DY
+gz
+KQ
+gz
+qR
+qR
+qR
+qR
+Pv
+bA
+bU
+Gq
+hW
+Pv
+QF
+be
+Lt
+QF
+Pv
+qR
+yS
+qR
+qR
+"}
+(6,1,1) = {"
+qR
+qR
+wn
+wn
+wn
+wn
+wn
+hF
+wn
+Qc
+wn
+Iv
+am
+og
+VW
+Ux
+gz
+RN
+uF
+xg
+dE
+gz
+mp
+gz
+NS
+qR
+qR
+NS
+Pv
+QF
+tK
+ok
+QF
+Pv
+QF
+tK
+KC
+QF
+Pv
+qR
+kr
+qR
+qR
+"}
+(7,1,1) = {"
+qR
+va
+rs
+sR
+EQ
+Uy
+hd
+TK
+rs
+IX
+IX
+IX
+Mf
+kX
+ct
+xN
+BI
+zt
+sW
+Ri
+sW
+pO
+sW
+gz
+NS
+NS
+NS
+NS
+Pv
+bI
+qM
+Le
+Kd
+Pv
+wQ
+Dt
+tQ
+Kd
+Pv
+NS
+kr
+qR
+qR
+"}
+(8,1,1) = {"
+qR
+At
+kG
+nh
+Ne
+Ne
+cV
+Rb
+rs
+Ls
+FO
+xr
+Vw
+OL
+iS
+nk
+gz
+gz
+gz
+gz
+gz
+gz
+BI
+gz
+pw
+pw
+pw
+pw
+Pv
+ga
+Pv
+Pv
+nf
+Pv
+NZ
+Pv
+Pv
+mf
+Pv
+NS
+kr
+NS
+NS
+"}
+(9,1,1) = {"
+qR
+va
+nF
+hH
+vM
+Ro
+Aj
+YN
+Au
+AU
+vH
+IR
+qp
+ij
+JG
+DR
+rI
+iW
+rg
+oJ
+ad
+zq
+lW
+km
+tl
+cY
+JP
+gW
+tG
+rv
+DT
+tG
+xV
+Fd
+xV
+tG
+tG
+zO
+yi
+yi
+yi
+yi
+NS
+"}
+(10,1,1) = {"
+qR
+At
+nF
+Aq
+Hq
+Ro
+LF
+rs
+rs
+lQ
+lQ
+lQ
+Mu
+lQ
+lQ
+lQ
+lQ
+tl
+bt
+Ie
+od
+Ld
+VQ
+IA
+nb
+yK
+Wa
+QF
+Hz
+oz
+Uf
+QF
+QF
+Hz
+Yw
+QF
+VP
+fK
+OE
+CZ
+sh
+yi
+qR
+"}
+(11,1,1) = {"
+qR
+At
+nF
+bf
+Hq
+Mc
+FB
+Tp
+sr
+MJ
+cv
+JJ
+cv
+cv
+en
+Li
+PU
+wK
+tj
+LM
+VQ
+ef
+Ra
+Ct
+tl
+Kr
+Md
+oO
+bq
+UW
+LC
+Yg
+ip
+Jx
+NY
+gn
+gv
+GS
+yi
+CZ
+Jj
+yi
+qR
+"}
+(12,1,1) = {"
+qR
+At
+nF
+XB
+Hq
+Aj
+hx
+Tp
+pS
+Nw
+DM
+DM
+Nw
+sT
+yb
+AG
+IQ
+tl
+LQ
+PA
+aP
+qF
+tl
+tl
+tl
+uZ
+uE
+uZ
+uZ
+uZ
+uZ
+NH
+uZ
+uZ
+uZ
+Rq
+Uf
+XT
+yi
+WV
+TP
+yi
+qR
+"}
+(13,1,1) = {"
+qR
+At
+nF
+lI
+oF
+ra
+rs
+rs
+NB
+Nw
+Gp
+vw
+vw
+yz
+Rv
+Li
+Li
+tl
+Ti
+qi
+VQ
+Eu
+tl
+Af
+Qr
+CS
+db
+ix
+nG
+LO
+Mr
+uT
+dt
+UO
+uZ
+MO
+QF
+Xh
+yi
+XR
+Zf
+yi
+qR
+"}
+(14,1,1) = {"
+qR
+At
+nF
+PD
+Cz
+Aj
+AG
+bu
+fZ
+DM
+SY
+ot
+ve
+MR
+rd
+MR
+MR
+tl
+tl
+jY
+lG
+Ft
+tl
+uq
+ta
+hr
+XJ
+dw
+dw
+tw
+BP
+uT
+sU
+bz
+uZ
+XK
+xO
+tJ
+yi
+OE
+yi
+yi
+Bi
+"}
+(15,1,1) = {"
+qR
+At
+nF
+iY
+EZ
+qL
+Li
+jk
+je
+Nw
+Ii
+ve
+QA
+lA
+nE
+IL
+MR
+MR
+tl
+dc
+UV
+TR
+tl
+tl
+RR
+uZ
+Xz
+wX
+pc
+uZ
+YY
+uT
+HB
+dD
+DI
+QF
+QF
+gH
+yi
+CZ
+Sj
+yi
+kr
+"}
+(16,1,1) = {"
+qR
+At
+rs
+OS
+QX
+DP
+Li
+xn
+Nw
+eN
+Oh
+MR
+zQ
+Gk
+iv
+qK
+Bg
+MR
+tl
+dU
+Xu
+tW
+VX
+tl
+Ht
+uZ
+eE
+mh
+He
+TY
+RX
+uT
+Bc
+uZ
+uZ
+YG
+xO
+QM
+yi
+hL
+ox
+yi
+kr
+"}
+(17,1,1) = {"
+qR
+qR
+rs
+rs
+rs
+sQ
+Li
+Tl
+Bb
+wD
+rV
+WA
+iv
+iv
+ot
+XW
+pb
+MR
+tl
+YR
+LI
+aD
+Of
+tl
+QV
+Hp
+ta
+cQ
+cQ
+bd
+Fp
+mL
+Kl
+uZ
+Vm
+bC
+OP
+AQ
+yi
+Qy
+kx
+yi
+kr
+"}
+(18,1,1) = {"
+qR
+qR
+NS
+ur
+CU
+Dp
+Li
+WO
+BE
+yb
+Im
+MR
+kl
+Gk
+iv
+PX
+ss
+MR
+tl
+Xe
+VA
+VQ
+hl
+Nr
+oT
+uZ
+Lf
+Ip
+Ip
+RU
+mT
+CJ
+hw
+uZ
+sv
+bC
+cN
+ek
+yi
+CZ
+ic
+yi
+kr
+"}
+(19,1,1) = {"
+qR
+qR
+NS
+ur
+iE
+GG
+Li
+pX
+je
+Nw
+AB
+ve
+QA
+kl
+nE
+SK
+MR
+MR
+tl
+Pd
+vm
+Bo
+cL
+tl
+Mh
+uZ
+Rx
+aH
+aM
+Gy
+FL
+uT
+in
+uZ
+uZ
+CF
+xO
+Fy
+yi
+WV
+cb
+yi
+kr
+"}
+(20,1,1) = {"
+qR
+qR
+NS
+ur
+Px
+Ye
+TF
+bu
+bu
+DM
+SY
+ot
+ve
+MR
+bY
+MR
+MR
+kI
+tl
+tl
+tl
+wg
+tl
+tl
+BJ
+uZ
+bd
+wX
+wX
+uZ
+Zt
+uT
+uT
+uT
+dj
+gv
+QF
+TH
+yi
+CZ
+Uk
+yi
+kr
+"}
+(21,1,1) = {"
+ur
+KO
+ur
+ur
+ur
+gV
+ur
+ur
+sB
+Nw
+xG
+Fx
+Fx
+sx
+KZ
+Li
+kI
+kI
+lD
+nJ
+HF
+OD
+kI
+pm
+ta
+kV
+mT
+mT
+NM
+ws
+mT
+dD
+HD
+RI
+uZ
+Ww
+xO
+Qe
+yi
+ch
+yi
+yi
+Bi
+"}
+(22,1,1) = {"
+ur
+Wv
+Rj
+Pg
+Pq
+tL
+VJ
+Gg
+Hj
+yb
+DM
+DM
+Nw
+je
+Nw
+Db
+ca
+hf
+JX
+co
+nZ
+FT
+kI
+hK
+vY
+bZ
+iC
+Ry
+sN
+dD
+ZZ
+dD
+HR
+rN
+uZ
+vv
+hW
+Xh
+yi
+CZ
+qY
+yi
+qR
+"}
+(23,1,1) = {"
+ur
+Wo
+ej
+vf
+hV
+vx
+tm
+Gg
+Lz
+bu
+cv
+gb
+zg
+bu
+du
+Li
+fg
+Jw
+wE
+rr
+Hu
+ka
+kI
+kI
+kI
+uZ
+sk
+uZ
+uZ
+uZ
+uZ
+DI
+uZ
+uZ
+uZ
+LC
+Uf
+XT
+yi
+kD
+ik
+yi
+qR
+"}
+(24,1,1) = {"
+ur
+Dm
+ej
+FY
+xY
+vZ
+ur
+ur
+pz
+pz
+pz
+pz
+pz
+pz
+pz
+pz
+YB
+Ep
+Vj
+Vl
+fu
+YI
+Nk
+Oi
+kI
+eB
+jd
+bQ
+qb
+Pk
+LD
+Yg
+Wu
+KH
+lT
+pg
+gv
+Wn
+yi
+CZ
+nD
+yi
+qR
+"}
+(25,1,1) = {"
+ur
+YT
+ej
+dv
+sH
+BH
+ur
+jK
+pz
+kq
+ap
+lR
+Fc
+Xj
+pj
+pz
+Vf
+Ep
+Hw
+GA
+Hw
+uj
+Hh
+iu
+zi
+yK
+Mx
+QF
+nC
+iD
+Uf
+QF
+QF
+fk
+iD
+QF
+Bx
+fK
+HK
+Zi
+TI
+yi
+qR
+"}
+(26,1,1) = {"
+ur
+ur
+SX
+dx
+xY
+kp
+ur
+uA
+pz
+LW
+ap
+lx
+Uu
+la
+oC
+pz
+pz
+se
+YK
+Nt
+Nt
+kE
+wy
+cC
+kI
+Ga
+sy
+pT
+tG
+xV
+XT
+tG
+xV
+tG
+sD
+tG
+cq
+mn
+yi
+yi
+yi
+yi
+NS
+"}
+(27,1,1) = {"
+pG
+ur
+lc
+oB
+sH
+su
+ur
+ia
+pz
+bn
+ap
+LL
+Dg
+la
+ap
+bV
+UD
+YX
+kR
+Xy
+yF
+yF
+cO
+yF
+yF
+Mg
+yF
+pw
+Pv
+Ic
+Pv
+Pv
+WF
+Pv
+iH
+Pv
+Pv
+mB
+mV
+NS
+Bi
+NS
+NS
+"}
+(28,1,1) = {"
+pG
+Dz
+ej
+br
+xY
+EX
+RW
+XX
+pz
+XU
+ap
+LL
+Tz
+KF
+ap
+Ng
+yF
+yF
+yF
+yF
+yF
+xW
+Fh
+zb
+Sl
+wH
+yF
+NS
+Pv
+wQ
+vg
+WD
+mt
+Hb
+oN
+HX
+bx
+hX
+KI
+NS
+Zu
+qR
+qR
+"}
+(29,1,1) = {"
+pG
+JY
+CR
+Re
+Qw
+dN
+ur
+ah
+UZ
+fE
+ap
+LL
+zz
+la
+ap
+mR
+yF
+oy
+YJ
+Sx
+Fh
+Fh
+LP
+yF
+OR
+nu
+yF
+NS
+Pv
+QF
+IN
+LG
+QF
+Pv
+uH
+gT
+JZ
+uH
+Sy
+qR
+Zu
+qR
+qR
+"}
+(30,1,1) = {"
+pG
+JY
+vr
+vf
+vf
+vr
+ur
+GC
+pz
+jL
+ap
+au
+SA
+au
+ap
+YF
+yF
+HV
+SF
+HV
+KG
+SQ
+qB
+yF
+sY
+sY
+yF
+qR
+Pv
+QF
+Br
+Bj
+qQ
+Pv
+uH
+Di
+TB
+uH
+hT
+qR
+Bi
+qR
+qR
+"}
+(31,1,1) = {"
+pG
+ur
+pB
+iU
+YZ
+xu
+ur
+uA
+pz
+wA
+YM
+JE
+YM
+ZI
+rk
+xs
+yF
+SQ
+SQ
+SQ
+HL
+hi
+Wg
+yF
+qR
+qR
+qR
+qR
+Pv
+XC
+Pv
+Pv
+XC
+Pv
+bo
+Pv
+aO
+vA
+aw
+qR
+kr
+qR
+qR
+"}
+(32,1,1) = {"
+FE
+pN
+IT
+jF
+cF
+dH
+pn
+jK
+pz
+RC
+Et
+DX
+TU
+DX
+DX
+iz
+yF
+SQ
+SO
+SQ
+fW
+SQ
+cm
+yF
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+"}
+(33,1,1) = {"
+fT
+ur
+ur
+ur
+ur
+ur
+ur
+ur
+pz
+pz
+pz
+py
+yI
+yI
+pz
+pz
+yF
+yF
+yF
+yF
+yF
+gS
+yF
+yF
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+"}
+(34,1,1) = {"
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+tZ
+dC
+Wf
+Wf
+Wf
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+qR
+"}
diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
index 64e7be0705b6b..21b981191aeb3 100644
--- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
+++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -856,7 +856,7 @@
 	icon_state = "floor5-old"
 	},
 /obj/item/ammo_casing/spent,
-/obj/item/gun/ballistic/automatic/plastikov,
+/obj/item/gun/ballistic/automatic/smartgun,
 /obj/effect/mob_spawn/corpse/human/syndicatepilot,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/infested_frigate)
@@ -2790,7 +2790,7 @@
 	icon_state = "plastitaniumtiny"
 	},
 /mob/living/basic/alien/queen/large{
-	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/plastikov9mm,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
+	loot = list(/obj/effect/gibspawner/xeno,/obj/item/ammo_box/magazine/smartgun,/obj/effect/mob_spawn/corpse/human/syndicatecommando/soft_suit);
 	desc = "What you saw in your dreams last night.";
 	faction = list("syndicate","xenomorph")
 	},
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index ade5d068b6ebc..55f0f884f165a 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -417,6 +417,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "ce" = (
@@ -724,10 +725,13 @@
 /area/ruin/space/ancientstation/delta/hall)
 "dj" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/beta/mining)
 "dk" = (
 /obj/effect/decal/cleanable/dirt,
@@ -958,6 +962,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "em" = (
@@ -970,6 +975,7 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "eo" = (
@@ -1698,6 +1704,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hydro)
+"hJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/engie)
 "hM" = (
 /obj/structure/sign/departments/science,
 /turf/closed/wall,
@@ -1788,6 +1799,7 @@
 	dir = 4
 	},
 /obj/machinery/duct,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "ic" = (
@@ -2059,6 +2071,10 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/delta/rnd)
+"iY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/ruin/space/ancientstation/charlie/engie)
 "jc" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
@@ -2874,6 +2890,12 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/beta/mining)
 "mC" = (
@@ -2935,10 +2957,8 @@
 /area/ruin/space/ancientstation/beta/mining)
 "mP" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/catwalk_floor,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "mR" = (
 /obj/effect/decal/cleanable/dirt,
@@ -3029,6 +3049,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "nc" = (
@@ -3057,6 +3078,7 @@
 	dir = 10
 	},
 /obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
 "nf" = (
@@ -3496,6 +3518,7 @@
 	dir = 1
 	},
 /obj/machinery/computer/apc_control/away,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "pK" = (
@@ -3607,8 +3630,11 @@
 /area/ruin/space/ancientstation/delta/hall)
 "qx" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "qF" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2{
@@ -3640,11 +3666,9 @@
 "qQ" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
 /obj/machinery/door/airlock/external/glass/ruin,
-/turf/open/floor/catwalk_floor,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/charlie/engie)
 "rc" = (
 /obj/effect/decal/cleanable/dirt,
@@ -3732,6 +3756,10 @@
 /obj/effect/mapping_helpers/apc/away_general_access,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
+"rL" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump,
+/turf/open/floor/iron/dark,
+/area/ruin/space/ancientstation/beta/mining)
 "rN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -3797,6 +3825,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
+"rY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/airless,
+/area/ruin/space/ancientstation/beta/supermatter)
 "si" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb,
@@ -4237,6 +4272,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating/airless,
 /area/ruin/space/ancientstation/beta/hall)
+"vs" = (
+/obj/machinery/light/small/red/directional/east,
+/turf/open/floor/iron/dark,
+/area/ruin/space/ancientstation/charlie/engie)
 "vv" = (
 /obj/machinery/light/small/directional/south,
 /obj/structure/closet/crate,
@@ -4491,7 +4530,10 @@
 "wR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/charlie/engie)
 "wS" = (
 /obj/item/stack/rods,
@@ -4619,10 +4661,11 @@
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/ancientstation/charlie/kitchen)
 "yk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 1
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 1;
+	name = "Air to Distro"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/charlie/hall)
 "yq" = (
@@ -4723,6 +4766,7 @@
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
 /turf/open/floor/iron/white/textured_large,
 /area/ruin/space/ancientstation/delta/biolab)
 "zm" = (
@@ -4843,6 +4887,7 @@
 	dir = 4
 	},
 /obj/machinery/firealarm/directional/east,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "zZ" = (
@@ -4851,6 +4896,7 @@
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 4
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "Aa" = (
@@ -5084,6 +5130,7 @@
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 1
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "Bz" = (
@@ -5126,6 +5173,7 @@
 /area/ruin/space/ancientstation/delta/rnd)
 "BP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "BR" = (
@@ -5494,6 +5542,14 @@
 /obj/machinery/duct,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/delta/hall)
+"EI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/delta/hall)
 "EP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
@@ -5753,6 +5809,12 @@
 /area/ruin/space/ancientstation/delta/hall)
 "Gt" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/charlie/engie)
 "Gv" = (
@@ -5778,6 +5840,10 @@
 /area/ruin/space/ancientstation/delta/hall)
 "GJ" = (
 /obj/machinery/light/small/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "GK" = (
@@ -5995,6 +6061,7 @@
 /obj/machinery/light_switch/directional/west{
 	pixel_x = -24
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "Ip" = (
@@ -6290,6 +6357,8 @@
 /area/ruin/space/ancientstation/delta/hall)
 "JR" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/catwalk_floor,
 /area/ruin/space/ancientstation/delta/hall)
 "JT" = (
@@ -6527,6 +6596,17 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/engine/o2,
 /area/ruin/space/ancientstation/beta/atmos)
+"Li" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/catwalk_floor,
+/area/ruin/space/ancientstation/charlie/engie)
 "Lm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6833,7 +6913,10 @@
 "Ni" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/official/safety_internals/directional/north,
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/delta/hall)
 "Np" = (
 /obj/effect/decal/cleanable/blood/xtracks{
@@ -6879,7 +6962,10 @@
 /turf/open/floor/iron/airless,
 /area/ruin/space/ancientstation/beta/medbay)
 "NC" = (
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 1
+	},
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "ND" = (
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -7154,10 +7240,8 @@
 /area/ruin/space/ancientstation/charlie/sec)
 "Po" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/turf/open/floor/catwalk_floor,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/delta/hall)
 "Pq" = (
 /obj/machinery/door/airlock/science,
@@ -7395,6 +7479,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
+"Rd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/ruin/space/ancientstation/charlie/engie)
 "Rf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -7653,6 +7749,12 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/charlie/engie)
 "Tg" = (
@@ -7816,10 +7918,9 @@
 /area/ruin/space/solars/ancientstation/charlie/solars)
 "Ui" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/delta/hall)
 "Uj" = (
 /obj/structure/girder,
@@ -7861,6 +7962,12 @@
 /turf/open/floor/iron/white,
 /area/ruin/space/ancientstation/charlie/hall)
 "Us" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/catwalk_floor,
 /area/ruin/space/ancientstation/beta/mining)
 "Uu" = (
@@ -7891,6 +7998,10 @@
 "UN" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
 "UP" = (
@@ -8016,8 +8127,8 @@
 /area/ruin/space/ancientstation/beta/supermatter)
 "VU" = (
 /obj/machinery/door/airlock/external/glass/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/catwalk_floor,
+/obj/effect/mapping_helpers/airlock/access/all/away/general,
+/turf/open/floor/iron/dark/airless,
 /area/ruin/space/ancientstation/beta/mining)
 "VV" = (
 /turf/open/floor/plating,
@@ -8028,12 +8139,15 @@
 /area/ruin/space/ancientstation/delta/biolab)
 "Wa" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
 /obj/structure/cable,
 /obj/machinery/door/airlock/external/glass/ruin,
-/turf/open/floor/catwalk_floor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/charlie/engie)
 "Wd" = (
 /obj/effect/decal/cleanable/blood/xtracks{
@@ -8057,6 +8171,7 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
+/obj/structure/sign/warning/vacuum/directional/west,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/engie)
 "Wp" = (
@@ -8239,6 +8354,12 @@
 "XJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/ruin/space/ancientstation/charlie/engie)
 "XK" = (
@@ -8593,6 +8714,14 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/delta/hall)
+"ZN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/engine/airless,
+/area/ruin/space/ancientstation/beta/supermatter)
 "ZP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -10593,9 +10722,9 @@ iv
 Qi
 ZD
 Hj
-Hj
+ZN
 qx
-NC
+rY
 NC
 mP
 Jg
@@ -11164,11 +11293,11 @@ aa
 aa
 aa
 VU
-Us
+rL
 Us
 dj
 mB
-mG
+cm
 cm
 gh
 mM
@@ -11177,10 +11306,10 @@ mZ
 RR
 aa
 aa
-aa
-aa
-aa
-aa
+JB
+JB
+JB
+my
 dH
 dH
 my
@@ -11250,7 +11379,7 @@ aa
 my
 aa
 aa
-my
+aa
 aa
 Jg
 aa
@@ -11316,7 +11445,7 @@ aa
 my
 aa
 aa
-JB
+aa
 aa
 Jg
 aa
@@ -11377,12 +11506,12 @@ aa
 aa
 aa
 aa
-aa
+eI
 Ma
 qQ
-Ma
+eI
+aa
 aa
-JB
 aa
 Jg
 aa
@@ -11443,12 +11572,12 @@ aa
 aa
 aa
 aa
-aa
 Ma
+iY
 wR
 Ma
 aa
-JB
+aa
 aa
 Jg
 aa
@@ -11509,9 +11638,9 @@ aa
 aa
 aa
 aa
-aa
 Ma
-wR
+vs
+Li
 Ma
 aa
 aa
@@ -11575,7 +11704,7 @@ aa
 Ma
 Ma
 eI
-Ma
+dl
 eI
 Wa
 eI
@@ -11771,11 +11900,11 @@ mS
 kQ
 oy
 em
-em
+kJ
 em
 fe
 fE
-fE
+Rd
 fE
 fe
 em
@@ -11837,7 +11966,7 @@ mY
 kQ
 AX
 em
-ju
+hJ
 eM
 pn
 fF
@@ -14019,7 +14148,7 @@ MS
 EE
 cD
 Dg
-cD
+EI
 yq
 cD
 TA
diff --git a/_maps/RandomRuins/SpaceRuins/waystation.dmm b/_maps/RandomRuins/SpaceRuins/waystation.dmm
index 38f8fcbac8cdd..312eb4d9bca59 100644
--- a/_maps/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/waystation.dmm
@@ -1264,7 +1264,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/button/door/directional/north{
-	desc = "A door remote control switch. From the looks of it, It seems to be broken after being pressed too hard, it's bloody handprint still visible.";
+	desc = "A door remote control switch. From the looks of it, It seems to be broken after being pressed too hard, its bloody handprint still visible.";
 	name = "Vault Lockdown"
 	},
 /obj/item/modular_computer/laptop/preset/civilian,
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 3b5c32345c0e3..bfbc5a18c56a1 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -598,7 +598,7 @@
 /turf/open/floor/iron/freezer,
 /area/awaymission/cabin)
 "cH" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/awaymission/cabin)
@@ -660,7 +660,7 @@
 /turf/open/floor/iron/white,
 /area/awaymission/cabin)
 "cQ" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/cable,
 /turf/open/floor/carpet,
 /area/awaymission/cabin)
@@ -2904,7 +2904,7 @@
 /area/awaymission/cabin/snowforest)
 "rk" = (
 /obj/machinery/light/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowcabin,
 /obj/structure/sign/poster/official/report_crimes/directional/south,
 /obj/structure/cable,
 /turf/open/floor/carpet,
diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm
index c7a097a02ad17..64cdcbb6d362e 100644
--- a/_maps/RandomZLevels/TheBeach.dmm
+++ b/_maps/RandomZLevels/TheBeach.dmm
@@ -1688,7 +1688,7 @@
 "vq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/beach,
 /turf/open/floor/plating,
 /area/awaymission/beach)
 "vx" = (
@@ -3586,7 +3586,7 @@
 /area/awaymission/beach)
 "SB" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/beach,
 /turf/open/floor/plating,
 /area/awaymission/beach)
 "SI" = (
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index c64aa99d1aab6..a21d64d505b63 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -480,7 +480,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/research)
 "cR" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/plating,
 /area/awaymission/caves/research)
 "cS" = (
@@ -610,7 +610,7 @@
 "dw" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/iron,
 /area/awaymission/caves/bmp_asteroid/level_two)
 "dx" = (
@@ -653,7 +653,7 @@
 "dH" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "dI" = (
@@ -705,7 +705,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "ea" = (
@@ -714,7 +714,7 @@
 /area/awaymission/caves/northblock)
 "ed" = (
 /obj/structure/bed,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/wood,
 /area/awaymission/caves/northblock)
 "ee" = (
@@ -849,7 +849,7 @@
 /turf/open/floor/iron,
 /area/awaymission/caves/listeningpost)
 "eO" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/floor/iron,
 /area/awaymission/caves/listeningpost)
 "eP" = (
@@ -1584,7 +1584,7 @@
 	},
 /area/awaymission/caves/bmp_asteroid/level_two)
 "Bs" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/caves,
 /turf/open/misc/asteroid/basalt{
 	initial_gas_mix = "n2=23;o2=14;TEMP=2.7"
 	},
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index 3a4e4c8affed6..a8f52784b343a 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -1903,14 +1903,14 @@
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "ms" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/blue,
 /area/awaymission/moonoutpost19/arrivals)
 "mt" = (
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/blue,
 /area/awaymission/moonoutpost19/arrivals)
 "mu" = (
@@ -1955,7 +1955,7 @@
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mI" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mJ" = (
@@ -1965,7 +1965,7 @@
 	icon_state = "beacon";
 	name = "tracking beacon"
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/moonoutpost,
 /turf/open/floor/mineral/titanium/yellow,
 /area/awaymission/moonoutpost19/arrivals)
 "mK" = (
diff --git a/_maps/RandomZLevels/museum.dmm b/_maps/RandomZLevels/museum.dmm
index 2937250b1f9ba..afd0cd888fdcd 100644
--- a/_maps/RandomZLevels/museum.dmm
+++ b/_maps/RandomZLevels/museum.dmm
@@ -1426,7 +1426,7 @@
 /turf/open/indestructible/plating,
 /area/awaymission/museum)
 "lz" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /obj/structure/flora/bush/sparsegrass/style_random,
 /turf/open/floor/grass,
 /area/awaymission/museum)
@@ -3095,7 +3095,7 @@
 /turf/open/floor/iron/smooth_large,
 /area/awaymission/museum)
 "zd" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /turf/open/floor/grass,
 /area/awaymission/museum)
 "zg" = (
@@ -4503,7 +4503,7 @@
 	},
 /area/awaymission/museum)
 "KN" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/museum,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm
index 1e84014fa0e1b..ae1814b7d7096 100644
--- a/_maps/RandomZLevels/research.dmm
+++ b/_maps/RandomZLevels/research.dmm
@@ -389,7 +389,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bR" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bS" = (
@@ -438,7 +438,7 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "bZ" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
@@ -481,12 +481,12 @@
 /area/awaymission/research/interior/gateway)
 "cj" = (
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
 "ck" = (
 /obj/machinery/door/window/right/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
@@ -1761,7 +1761,7 @@
 /obj/structure/toilet{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/freezer,
 /area/awaymission/research/interior/bathroom)
@@ -2007,7 +2007,7 @@
 "jU" = (
 /obj/structure/bed,
 /obj/item/bedsheet/blue,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
 "jV" = (
@@ -2505,7 +2505,7 @@
 "lT" = (
 /obj/structure/bed,
 /obj/item/bedsheet/patriot,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
 "lX" = (
@@ -2976,7 +2976,7 @@
 /area/awaymission/research/interior)
 "sM" = (
 /obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/research,
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/awaymission/research/interior/gateway)
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index d66be7f5614ff..6f565143e790e 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -181,7 +181,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/item/bedsheet/purple,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
@@ -213,7 +213,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /turf/open/floor/wood,
 /area/awaymission/snowdin/post/dorm)
 "aY" = (
@@ -239,7 +239,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/item/paper/crumpled/ruins/snowdin/dontdeadopeninside,
 /obj/item/bedsheet/green,
 /turf/open/floor/wood,
@@ -414,7 +414,7 @@
 /turf/open/floor/iron/freezer,
 /area/awaymission/snowdin/post/kitchen)
 "bM" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/freezer,
 /area/awaymission/snowdin/post/kitchen)
@@ -1092,7 +1092,7 @@
 "eh" = (
 /obj/structure/bed,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/item/bedsheet/red,
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/wood,
@@ -2073,12 +2073,12 @@
 /area/awaymission/snowdin/post/gateway)
 "hR" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
 "hS" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/turf_decal/loading_area,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -2086,7 +2086,7 @@
 /area/awaymission/snowdin/post/gateway)
 "hT" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
@@ -2302,7 +2302,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 5
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
 "iB" = (
@@ -2310,7 +2310,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 10
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/machinery/holopad,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -2318,7 +2318,7 @@
 /area/awaymission/snowdin/post/gateway)
 "iC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
 "iD" = (
@@ -2579,14 +2579,14 @@
 /turf/open/floor/iron/white,
 /area/awaymission/snowdin/post/minipost)
 "ju" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/gateway)
 "jv" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -2650,7 +2650,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
 /turf/open/floor/iron,
@@ -3523,7 +3523,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/awaymission/snowdin/post/garage)
@@ -7044,7 +7044,7 @@
 	},
 /area/awaymission/snowdin/cave)
 "Be" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
 	dir = 8
 	},
@@ -7500,7 +7500,7 @@
 /obj/structure/bed{
 	dir = 4
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/snowdin,
 /obj/item/bedsheet/nanotrasen{
 	dir = 4
 	},
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 7d8b1cd028d46..16cc8924aae9b 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -101,14 +101,14 @@
 /turf/open/floor/iron/dark,
 /area/awaymission/undergroundoutpost45/central)
 "ax" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/underground,
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/central)
 "ay" = (
 /obj/structure/chair/comfy/beige{
 	dir = 4
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/underground,
 /turf/open/floor/iron/grimy,
 /area/awaymission/undergroundoutpost45/central)
 "az" = (
@@ -118,7 +118,7 @@
 	icon_state = "beacon";
 	name = "tracking beacon"
 	},
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/underground,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
@@ -126,7 +126,7 @@
 /area/awaymission/undergroundoutpost45/central)
 "aB" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/underground,
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
@@ -218,7 +218,7 @@
 /turf/open/floor/iron,
 /area/awaymission/undergroundoutpost45/central)
 "aT" = (
-/obj/effect/landmark/awaystart,
+/obj/effect/landmark/awaystart/underground,
 /turf/open/floor/iron/grimy,
 /area/awaymission/undergroundoutpost45/central)
 "aU" = (
diff --git a/_maps/bandastation/automapper/automapper_config.toml b/_maps/bandastation/automapper/automapper_config.toml
new file mode 100644
index 0000000000000..4bf2809b4d828
--- /dev/null
+++ b/_maps/bandastation/automapper/automapper_config.toml
@@ -0,0 +1,18 @@
+# Automapper configuration
+# [templates.example_template] - example_template should be replaced with the name of your map template.
+# directory - The direct path to our map files.
+# map_files - These are the names of the map files, including the extension, that will be loaded. Supports multiple for randomness.
+# required_map - This is the name of the required map that needs to be loaded in order for this template to load.
+# coordinates - The coordinates of the map template placement. (X, Y, Z). PLEASE NOTE: The Z coordinate is the same as would be shown in SDMM. NOT IN GAME.
+# leave it at 1 if it is not a multi-z map. It is relative to the map file Z, not the one loaded in game.
+# trait_name - The name of the Z level trait that will be used to determine what Z level we use.
+# Traits - Station (for station relatied edits), CentCom (for edits on the CC map), Mining (for edits on Lavaland)
+# More can be found in code\__DEFINES\maps.dm
+
+# Metastation Cryo
+# [templates.metastation_cryo]
+# map_files = ["metastation_cryo.dmm"]
+# directory = "_maps/bandastation/automapper/templates/metastation/"
+# required_map = "MetaStation.dmm"
+# coordinates = [133, 182, 1]
+# trait_name = "Station"
diff --git a/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm b/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm
new file mode 100644
index 0000000000000..473c0b647fc60
--- /dev/null
+++ b/_maps/bandastation/automapper/templates/metastation/metastation_cryo.dmm
@@ -0,0 +1,124 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/white,
+/area/station/common/cryopods)
+"i" = (
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/common/cryopods)
+"j" = (
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/station/common/cryopods)
+"p" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/common/cryopods)
+"q" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/turf/open/floor/iron/dark,
+/area/station/common/cryopods)
+"v" = (
+/turf/open/floor/iron/dark,
+/area/station/common/cryopods)
+"x" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/public/glass{
+	name = "Cryopods"
+	},
+/obj/effect/landmark/navigate_destination,
+/turf/open/floor/iron/white,
+/area/station/common/cryopods)
+"C" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/common/cryopods)
+"I" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/common/cryopods)
+"L" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/white/side{
+	dir = 1
+	},
+/area/station/commons/fitness)
+"N" = (
+/turf/closed/wall,
+/area/station/common/cryopods)
+"O" = (
+/obj/machinery/airalarm/directional/west,
+/turf/template_noop,
+/area/template_noop)
+"U" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/side{
+	dir = 9
+	},
+/area/station/commons/fitness)
+"V" = (
+/obj/effect/turf_decal/trimline/dark_red/mid_joiner,
+/obj/effect/turf_decal/trimline/dark_red/line,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron/white/smooth_half,
+/area/station/commons/fitness)
+
+(1,1,1) = {"
+N
+C
+N
+C
+N
+"}
+(2,1,1) = {"
+N
+v
+e
+i
+N
+"}
+(3,1,1) = {"
+N
+p
+I
+q
+N
+"}
+(4,1,1) = {"
+N
+j
+x
+N
+N
+"}
+(5,1,1) = {"
+a
+a
+U
+O
+a
+"}
+(6,1,1) = {"
+a
+V
+L
+a
+a
+"}
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 7816e8a9be688..00961dbd7f5d6 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -160,6 +160,10 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
+/obj/machinery/airlock_controller/incinerator_atmos{
+	pixel_x = -40;
+	pixel_y = -8
+	},
 /turf/open/floor/engine,
 /area/station/maintenance/disposal/incinerator)
 "aem" = (
@@ -205,8 +209,15 @@
 /obj/machinery/atmospherics/components/trinary/filter/flipped/layer2{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/machinery/light/small/directional/north,
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
+	pixel_x = 8;
+	pixel_y = 24
+	},
+/obj/machinery/button/door/incinerator_vent_atmos_main{
+	pixel_x = 8;
+	pixel_y = 36
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/disposal/incinerator)
 "aeX" = (
@@ -2626,7 +2637,7 @@
 "bah" = (
 /obj/structure/cable,
 /obj/item/kirbyplants/organic/applebush,
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/iron/dark/textured_corner{
 	dir = 4
 	},
@@ -2661,7 +2672,7 @@
 	dir = 1
 	},
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "baP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -4399,6 +4410,7 @@
 	cycle_id = "atmos_airlock_1"
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
 /turf/open/floor/iron,
 /area/station/engineering/atmos/office)
 "bJK" = (
@@ -4949,7 +4961,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "bWs" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -4958,8 +4970,9 @@
 /turf/open/floor/iron,
 /area/station/science/xenobiology)
 "bXb" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/electrical)
 "bXi" = (
@@ -5135,6 +5148,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
 /turf/open/floor/iron,
 /area/station/engineering/atmos/office)
 "cam" = (
@@ -5317,6 +5331,9 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-south"
+	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/tcommsat/server)
 "ccG" = (
@@ -5718,7 +5735,7 @@
 	dir = 1;
 	name = "Plasma to Pure"
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green{
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
 	dir = 4
 	},
 /turf/open/floor/iron,
@@ -7333,6 +7350,7 @@
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Engineering Storage"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment,
 /turf/open/floor/iron/smooth_half{
 	dir = 8
 	},
@@ -7552,7 +7570,7 @@
 /obj/structure/chair/stool/bar/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "cUH" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -7760,11 +7778,10 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "cYt" = (
 /obj/structure/cable,
 /turf/open/floor/plating,
@@ -8397,7 +8414,7 @@
 /obj/structure/chair/stool/bar/directional/south,
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "diI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/neutral,
@@ -9245,6 +9262,7 @@
 /area/station/maintenance/starboard/aft)
 "dzH" = (
 /obj/machinery/portable_atmospherics/canister/plasma,
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
 /turf/open/floor/engine/plasma,
 /area/station/engineering/atmos)
 "dAn" = (
@@ -9582,10 +9600,8 @@
 /turf/open/floor/engine,
 /area/station/engineering/supermatter)
 "dGV" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/closed/wall,
+/obj/structure/closet/emcloset,
+/turf/open/floor/catwalk_floor,
 /area/station/engineering/atmos/storage/gas)
 "dHk" = (
 /obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -10738,6 +10754,10 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/aft)
+"efn" = (
+/obj/effect/spawner/random/structure/crate_loot,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
 "efy" = (
 /obj/item/kirbyplants/organic/plant21,
 /obj/machinery/status_display/ai/directional/west,
@@ -12438,6 +12458,9 @@
 "eKd" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /obj/machinery/light/small/directional/west,
+/obj/machinery/airlock_sensor/incinerator_atmos{
+	pixel_y = -20
+	},
 /turf/open/floor/engine,
 /area/station/maintenance/disposal/incinerator)
 "eKf" = (
@@ -12468,9 +12491,6 @@
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"eKU" = (
-/turf/closed/wall/r_wall/rust,
-/area/station/engineering/atmos/pumproom)
 "eKW" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Bathroom"
@@ -12628,7 +12648,7 @@
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "eOY" = (
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
 	dir = 4
@@ -13154,6 +13174,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/textured,
 /area/station/ai_monitored/turret_protected/ai)
+"fai" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/closed/wall,
+/area/station/engineering/atmos/storage/gas)
 "fap" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
 	dir = 1
@@ -13237,7 +13261,7 @@
 /obj/item/aicard,
 /obj/item/pai_card,
 /obj/item/circuitboard/aicore,
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = -5
 	},
 /obj/machinery/button/door/directional/north{
@@ -13756,6 +13780,11 @@
 	c_tag = "Engineering - Canister Storage"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/start/atmospheric_technician,
+/obj/structure/chair/plastic,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/iron/small,
 /area/station/engineering/atmos/storage/gas)
 "flM" = (
@@ -14379,9 +14408,7 @@
 /area/station/science/xenobiology)
 "fxp" = (
 /obj/effect/spawner/structure/window/reinforced/plasma,
-/obj/machinery/atmospherics/pipe/smart/simple/orange{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "fxF" = (
@@ -14752,11 +14779,16 @@
 /turf/open/floor/iron/smooth,
 /area/station/ai_monitored/turret_protected/aisat_interior)
 "fDO" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
+/obj/machinery/door/airlock/command/glass{
+	name = "Telecommunications Server Room"
 	},
-/turf/closed/wall,
-/area/station/engineering/atmos/storage/gas)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-south"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/tcommsat/server)
 "fDQ" = (
 /obj/machinery/flasher/directional/north,
 /turf/open/floor/iron/dark/smooth_large,
@@ -15174,6 +15206,7 @@
 	cycle_id = "sci-entrance"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/scanner_gate/preset_guns,
 /turf/open/floor/iron/textured_half,
 /area/station/security/brig/entrance)
 "fKx" = (
@@ -16382,7 +16415,7 @@
 /obj/machinery/computer/security/hos{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/carpet/red,
 /area/station/command/heads_quarters/hos)
 "gfb" = (
@@ -16479,6 +16512,10 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
+"ggr" = (
+/obj/item/pickaxe,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
 "ggw" = (
 /obj/effect/turf_decal/stripes/white/end{
 	dir = 1
@@ -16676,7 +16713,7 @@
 	},
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "gjE" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -18841,7 +18878,7 @@
 	dir = 4
 	},
 /turf/closed/wall/r_wall,
-/area/station/engineering/atmos/pumproom)
+/area/station/maintenance/department/engine/atmos)
 "gUV" = (
 /obj/structure/cable,
 /obj/structure/chair/stool/directional/south{
@@ -19665,7 +19702,7 @@
 	dir = 4
 	},
 /turf/closed/wall/r_wall,
-/area/station/engineering/atmos/pumproom)
+/area/station/maintenance/department/engine/atmos)
 "hhL" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -20146,8 +20183,8 @@
 	},
 /area/station/science/lobby)
 "hqH" = (
-/obj/structure/reagent_dispensers/watertank,
 /obj/item/reagent_containers/cup/watering_can/wood,
+/obj/structure/table,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "hqM" = (
@@ -20985,7 +21022,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "hED" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment,
@@ -21059,6 +21096,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/station/maintenance/disposal/incinerator)
+"hGa" = (
+/obj/machinery/camera/directional/east{
+	c_tag = "Atmospherics Tank - Mix"
+	},
+/turf/open/floor/engine/vacuum,
+/area/station/engineering/atmos)
 "hGb" = (
 /turf/closed/wall/r_wall,
 /area/station/science/ordnance/storage)
@@ -21868,7 +21911,7 @@
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green,
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "hWk" = (
@@ -22199,7 +22242,7 @@
 	dir = 4
 	},
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "ibI" = (
 /obj/effect/turf_decal/siding/white/corner{
 	dir = 8
@@ -23305,7 +23348,7 @@
 /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green,
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "itw" = (
@@ -25623,13 +25666,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
-"jbE" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
 "jbV" = (
 /obj/machinery/photocopier,
 /turf/open/floor/iron/dark,
@@ -26258,14 +26294,21 @@
 /turf/open/floor/iron,
 /area/station/cargo/sorting)
 "jnB" = (
-/obj/structure/chair/plastic{
-	dir = 8
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow{
+	pixel_x = 4
 	},
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
+/obj/item/storage/pill_bottle/potassiodide{
+	pixel_y = 12;
+	pixel_x = -6
 	},
-/obj/effect/landmark/start/atmospheric_technician,
+/obj/item/pen/screwdriver,
+/obj/item/radio/intercom/directional/west,
+/obj/item/geiger_counter{
+	pixel_x = 7;
+	pixel_y = 14
+	},
+/obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/iron/small,
 /area/station/engineering/atmos/storage/gas)
 "jnI" = (
@@ -26677,6 +26720,17 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark/small,
 /area/station/command/heads_quarters/captain/private)
+"jvm" = (
+/obj/machinery/door/airlock/engineering/glass/critical{
+	heat_proof = 1;
+	name = "Supermatter Chamber"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
+/turf/open/floor/engine,
+/area/station/engineering/supermatter)
 "jvB" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -27814,7 +27868,7 @@
 /obj/machinery/atmospherics/components/binary/pump/off{
 	name = "O2 To Pure"
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green{
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
 	dir = 4
 	},
 /turf/open/floor/iron,
@@ -28099,7 +28153,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron/stairs/old{
 	dir = 4
 	},
@@ -28238,7 +28291,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "jTD" = (
 /obj/machinery/atmospherics/components/trinary/filter/atmos/o2{
 	dir = 8
@@ -28501,6 +28554,9 @@
 	name = "Telecommunications Server Room"
 	},
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-north"
+	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/tcommsat/server)
 "jXA" = (
@@ -30872,6 +30928,7 @@
 	cycle_id = "sci-entrance"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/scanner_gate/preset_guns,
 /turf/open/floor/iron/textured_half,
 /area/station/security/brig/entrance)
 "kKD" = (
@@ -30967,9 +31024,6 @@
 /area/station/maintenance/starboard/fore)
 "kNv" = (
 /obj/machinery/air_sensor/mix_tank,
-/obj/machinery/camera/directional/east{
-	c_tag = "Atmospherics Tank - Mix"
-	},
 /turf/open/floor/engine/vacuum,
 /area/station/engineering/atmos)
 "kNx" = (
@@ -32164,6 +32218,10 @@
 /obj/item/camera,
 /turf/open/floor/iron,
 /area/station/security/prison/workout)
+"lhd" = (
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "lhi" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/button/door/directional/north{
@@ -32318,6 +32376,15 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
 /area/station/maintenance/department/engine/atmos)
+"ljc" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/fore)
 "ljg" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 1
@@ -33208,9 +33275,6 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
-"lwK" = (
-/turf/closed/wall/r_wall/rust,
-/area/station/engineering/atmos/storage)
 "lwO" = (
 /obj/machinery/door/airlock/highsecurity{
 	name = "Engine Room"
@@ -33675,6 +33739,9 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-south"
+	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/tcommsat/server)
 "lDo" = (
@@ -33890,7 +33957,6 @@
 "lGO" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/sink/directional/west,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "lGT" = (
@@ -35208,7 +35274,7 @@
 /obj/machinery/computer/communications{
 	dir = 1
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/captain)
 "mau" = (
@@ -36619,13 +36685,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"mDb" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
 "mDf" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -37255,10 +37314,6 @@
 /obj/structure/broken_flooring/singular/directional/east,
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/aft)
-"mMF" = (
-/obj/structure/sign/warning/pods/directional/north,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
 "mMN" = (
 /obj/structure/chair/office{
 	dir = 8
@@ -38013,6 +38068,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/port/lesser)
+"nbN" = (
+/obj/effect/spawner/random/structure/girder,
+/turf/open/floor/plating,
+/area/station/maintenance/department/electrical)
 "ncb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/wood,
@@ -38179,10 +38238,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/security)
-"ngd" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/turf/open/floor/iron,
-/area/station/holodeck/rec_center)
 "ngq" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -39089,7 +39144,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "nuY" = (
 /obj/structure/broken_flooring/pile/directional/east,
 /obj/structure/alien/weeds/node,
@@ -39191,7 +39246,7 @@
 /obj/machinery/modular_computer/preset/id{
 	dir = 1
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/qm)
 "nxX" = (
@@ -39932,9 +39987,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/smart/simple/orange{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "nKj" = (
@@ -40886,6 +40939,7 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos/storage)
 "odh" = (
@@ -43408,6 +43462,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"oYf" = (
+/obj/machinery/button/ignition/incinerator/atmos,
+/turf/closed/wall/r_wall,
+/area/station/maintenance/disposal/incinerator)
 "oYi" = (
 /obj/effect/turf_decal/trimline/neutral/line,
 /obj/effect/turf_decal/trimline/neutral/line{
@@ -44319,6 +44377,7 @@
 /area/station/service/chapel)
 "pnO" = (
 /obj/structure/cable,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating,
 /area/station/maintenance/disposal/incinerator)
 "pnQ" = (
@@ -44545,6 +44604,10 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/lobby)
+"prd" = (
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/smooth_large,
+/area/station/engineering/supermatter/room)
 "prf" = (
 /obj/structure/cable,
 /obj/effect/spawner/structure/window/reinforced,
@@ -45870,9 +45933,6 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/service/library)
-"pOT" = (
-/turf/closed/wall,
-/area/station/holodeck/rec_center)
 "pOX" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -46118,11 +46178,10 @@
 	name = "Maintenance"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/service/maintenance,
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "pTq" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Crematorium Maintenance"
@@ -46148,7 +46207,7 @@
 /obj/effect/spawner/random/entertainment/arcade,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "pTZ" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 8
@@ -46468,7 +46527,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
@@ -46681,6 +46739,7 @@
 	pixel_x = -6;
 	pixel_y = 6
 	},
+/obj/machinery/light_switch/directional/north,
 /turf/open/floor/iron/smooth,
 /area/station/engineering/break_room)
 "qcf" = (
@@ -46954,7 +47013,7 @@
 	dir = 1;
 	name = "CO2 to Pure"
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green{
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
 	dir = 4
 	},
 /turf/open/floor/iron,
@@ -49754,7 +49813,7 @@
 /turf/open/floor/wood/tile,
 /area/station/maintenance/central/lesser)
 "rdH" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/station/command/heads_quarters/ce)
 "rdM" = (
@@ -50653,6 +50712,7 @@
 	name = "Engine Airlock"
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "ruS" = (
@@ -52918,7 +52978,7 @@
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
 /obj/structure/chair/stool/bar/directional/north,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "sjl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -53432,7 +53492,7 @@
 /area/station/maintenance/port/greater)
 "srw" = (
 /turf/closed/wall/r_wall/rust,
-/area/station/engineering/atmospherics_engine)
+/area/station/maintenance/department/electrical)
 "srx" = (
 /obj/machinery/power/port_gen/pacman,
 /obj/effect/turf_decal/bot{
@@ -53464,6 +53524,9 @@
 	name = "Telecommunications Server Room"
 	},
 /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-south"
+	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/tcommsat/server)
 "srH" = (
@@ -53603,7 +53666,7 @@
 	},
 /obj/effect/landmark/start/hangover,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "sul" = (
 /obj/effect/turf_decal/siding{
 	dir = 1
@@ -54396,6 +54459,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
 /area/station/commons/vacant_room/office)
+"sJf" = (
+/obj/structure/water_source/puddle,
+/turf/open/misc/asteroid,
+/area/station/maintenance/starboard/greater)
 "sJg" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/machinery/door/airlock/command{
@@ -56174,11 +56241,9 @@
 "tlJ" = (
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
 /obj/item/kirbyplants/random,
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "tlX" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/blue/fourcorners,
@@ -56502,6 +56567,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/station/commons/fitness/recreation)
+"tqn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/engineering/atmospherics_engine)
 "tqo" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -58664,6 +58735,9 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos/project)
+"uct" = (
+/turf/open/floor/engine/vacuum,
+/area/station/engineering/atmos)
 "ucy" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/siding/red{
@@ -59942,7 +60016,7 @@
 /obj/effect/turf_decal/tile/neutral/opposingcorners,
 /obj/effect/spawner/random/entertainment/arcade,
 /turf/open/floor/iron,
-/area/station/holodeck/rec_center)
+/area/station/commons/fitness/recreation/entertainment)
 "uwB" = (
 /obj/effect/turf_decal/tile/dark_red/half/contrasted{
 	dir = 4
@@ -60085,19 +60159,6 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/wood/tile,
 /area/station/command/bridge)
-"uAM" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/bot{
-	dir = 1
-	},
-/obj/structure/closet/firecloset,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
 "uAY" = (
 /turf/open/floor/plating,
 /area/station/maintenance/department/bridge)
@@ -61705,10 +61766,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/interrogation)
-"vcm" = (
-/obj/item/pickaxe,
-/turf/open/misc/asteroid,
-/area/station/maintenance/department/electrical)
 "vcB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63890,7 +63947,7 @@
 /obj/machinery/door/airlock/engineering{
 	name = "Engineering Office"
 	},
-/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment,
 /turf/open/floor/iron/smooth_half{
 	dir = 8
 	},
@@ -64562,6 +64619,20 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
+"vSM" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/command{
+	name = "Telecomms Server Room"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-north"
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/tcommsat/server)
 "vSW" = (
 /obj/effect/spawner/random/engineering/atmospherics_portable,
 /turf/open/floor/plating,
@@ -64584,22 +64655,16 @@
 /turf/open/floor/engine/vacuum,
 /area/station/science/ordnance/freezerchamber)
 "vTg" = (
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow{
-	pixel_x = 4
-	},
-/obj/item/storage/pill_bottle/potassiodide{
-	pixel_y = 12;
-	pixel_x = -6
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms,
+/obj/machinery/door/airlock/command/glass{
+	name = "Telecommunications Server Room"
 	},
-/obj/item/pen/screwdriver,
-/obj/item/radio/intercom/directional/west,
-/obj/item/geiger_counter{
-	pixel_x = 7;
-	pixel_y = 14
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "comms-entrance-north"
 	},
-/turf/open/floor/iron/small,
-/area/station/engineering/atmos/storage/gas)
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/tcommsat/server)
 "vTj" = (
 /obj/effect/spawner/random/maintenance,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -65416,14 +65481,6 @@
 "wfr" = (
 /turf/closed/wall/r_wall,
 /area/station/medical/pharmacy)
-"wfB" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/structure/steam_vent,
-/turf/open/floor/plating,
-/area/station/maintenance/department/electrical)
 "wfG" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/firealarm/directional/west,
@@ -66236,6 +66293,9 @@
 	name = "AI Upload"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
 /turf/open/floor/iron/dark/textured_half,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "wtv" = (
@@ -67670,10 +67730,10 @@
 /obj/machinery/atmospherics/components/binary/pump/on{
 	name = "O2 to Airmix"
 	},
-/obj/machinery/atmospherics/pipe/bridge_pipe/green{
+/obj/machinery/light/no_nightlight/directional/north,
+/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
 	dir = 4
 	},
-/obj/machinery/light/no_nightlight/directional/north,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "wPP" = (
@@ -67782,6 +67842,7 @@
 	name = "Secure Network Access"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /turf/open/floor/iron/dark/textured_half,
 /area/station/ai_monitored/turret_protected/ai_upload_foyer)
 "wQT" = (
@@ -68045,7 +68106,7 @@
 	pixel_x = 6;
 	req_access = list("medical")
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /turf/open/floor/wood/parquet,
 /area/station/command/heads_quarters/cmo)
 "wTX" = (
@@ -70256,6 +70317,10 @@
 	heat_proof = 1;
 	name = "Supermatter Chamber"
 	},
+/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter)
 "xAA" = (
@@ -72280,7 +72345,7 @@
 /area/station/hallway/primary/starboard)
 "yei" = (
 /obj/machinery/door/airlock/maintenance{
-	name = "Transit Tube Station"
+	name = "Atmospherics Maintenance"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -81857,7 +81922,7 @@ wBo
 sRf
 wBo
 hFO
-wBo
+oYf
 mPB
 wWm
 nlR
@@ -83950,7 +84015,7 @@ kjW
 fcE
 ceN
 cDV
-kUN
+bNq
 ybs
 knv
 knv
@@ -84176,8 +84241,8 @@ wzv
 wzv
 fjh
 dfd
-ybO
-jbE
+pnl
+ooo
 ukP
 ooo
 jZl
@@ -84188,7 +84253,7 @@ wmq
 vMI
 pKW
 kiP
-wmq
+tqn
 dYv
 jZl
 feu
@@ -84207,7 +84272,7 @@ tKn
 eWr
 xcW
 prP
-kUN
+bNq
 ybs
 knv
 aJq
@@ -84433,7 +84498,7 @@ wzv
 wzv
 fjh
 wzv
-ybO
+pnl
 dpH
 kNv
 gAy
@@ -84464,7 +84529,7 @@ hBi
 bzF
 gzM
 svd
-kUN
+bNq
 liX
 jqd
 lxP
@@ -84690,10 +84755,10 @@ pWm
 pWm
 uEH
 dfd
-ybO
-ybO
-ybO
-ybO
+pnl
+uct
+uct
+uct
 jZl
 bEG
 rCk
@@ -84721,7 +84786,7 @@ isC
 bPd
 vDG
 rry
-kUN
+bNq
 olj
 cmf
 gBh
@@ -84946,11 +85011,11 @@ wzv
 wzv
 wzv
 yil
-yil
-wfB
-kNn
-yil
-kNn
+wzv
+pnl
+uct
+hGa
+uct
 jZl
 oqq
 tmK
@@ -84978,7 +85043,7 @@ uqg
 cjS
 gqS
 kmL
-eKU
+ecq
 olj
 gBh
 gBh
@@ -85199,15 +85264,15 @@ dDB
 aWx
 tdY
 qcF
-wzv
+kNn
 yil
 xnL
 yil
-pWm
-pWm
-pWm
-mMF
-mDb
+bXb
+pnl
+pnl
+pnl
+pnl
 srw
 tXF
 qaU
@@ -85235,7 +85300,7 @@ hMQ
 tNm
 nWa
 iua
-kUN
+bNq
 bJK
 dez
 gBh
@@ -85456,13 +85521,13 @@ pWm
 pWm
 pWm
 pWm
-pWm
 rjo
 pWm
 pWm
 pWm
-bvt
-bvt
+bXb
+bXb
+bXb
 bXb
 yil
 fTJ
@@ -85492,7 +85557,7 @@ kti
 iwR
 oQK
 dFG
-kUN
+bNq
 cvJ
 olj
 knv
@@ -85711,18 +85776,18 @@ dDB
 dDB
 tYT
 aJq
-aJq
-pWm
+gcs
 ako
 mmT
 vtJ
 acg
 pWm
-bvt
-bvt
-vcm
+efn
+wzv
+wzv
+wzv
 oii
-jZl
+pnl
 sZP
 wvZ
 mDS
@@ -85749,7 +85814,7 @@ lkN
 rjw
 vSt
 kOH
-kUN
+bNq
 cvJ
 aIk
 knv
@@ -85968,8 +86033,7 @@ dDB
 dDB
 tYT
 aJq
-aJq
-pWm
+gcs
 arN
 wOz
 viE
@@ -85977,9 +86041,10 @@ bOa
 pWm
 bvt
 bvt
-bvt
+nbN
+ggr
 oii
-jZl
+pnl
 gmv
 jrD
 jrD
@@ -86006,7 +86071,7 @@ vuV
 xLS
 lfq
 cHt
-kUN
+bNq
 xxt
 liX
 knv
@@ -86156,7 +86221,7 @@ xjz
 xjz
 xjz
 xjz
-dDB
+xjz
 dDB
 blb
 blb
@@ -86225,8 +86290,7 @@ dDB
 dDB
 tYT
 aJq
-aJq
-pWm
+gcs
 pWm
 hDg
 qMG
@@ -86235,17 +86299,18 @@ bvt
 bvt
 bvt
 bvt
+bvt
 yil
-jZl
+pnl
 wFZ
 oLc
 jDi
 jDi
 jDi
-jZl
+pnl
 srw
-jZl
-jZl
+pnl
+pnl
 jZl
 xck
 cag
@@ -86253,17 +86318,17 @@ xck
 bJH
 xck
 cGV
-cGV
-cGV
-lwK
-cGV
-kUN
+bNq
+bNq
+ecq
+bNq
+bNq
 hhr
-kUN
+bNq
 gUQ
-kUN
-kUN
-kUN
+bNq
+bNq
+bNq
 knv
 tZE
 knv
@@ -86412,7 +86477,7 @@ hJC
 aHJ
 wmy
 tBm
-xjz
+tBm
 xjz
 blb
 blb
@@ -86484,22 +86549,22 @@ dDB
 tYT
 aJq
 bvt
-bvt
 fiw
 oIf
 pWm
 bvt
 bvt
 bvt
+bvt
 pWm
 oii
-jZl
+pnl
 jDi
 jDi
 jDi
 jDi
 jDi
-jZl
+pnl
 oCE
 oCE
 lYH
@@ -86669,7 +86734,7 @@ aWt
 sis
 sis
 sis
-tBm
+lhd
 xjz
 blb
 dDB
@@ -86750,13 +86815,13 @@ bvt
 bvt
 pWm
 yil
-jZl
+pnl
 urP
 kLr
 wkj
 tuu
 kHd
-jZl
+pnl
 oCE
 pWm
 pWm
@@ -87008,11 +87073,11 @@ bvt
 pWm
 qjp
 kNn
-jZl
-jZl
-jZl
+pnl
+pnl
+pnl
 srw
-jZl
+pnl
 tOc
 oCE
 pWm
@@ -90351,7 +90416,7 @@ szg
 tpW
 pUM
 kMe
-kMe
+prd
 fGf
 ayK
 izf
@@ -91628,7 +91693,7 @@ cBd
 cBd
 dyI
 ozQ
-xAx
+jvm
 brA
 dyI
 oer
@@ -92410,8 +92475,8 @@ yjE
 rNG
 whK
 cTK
-jKU
-jKU
+fai
+dGV
 jRU
 iqB
 ahW
@@ -92659,15 +92724,15 @@ buI
 kjs
 xUK
 vni
-uAM
+nHH
 lHd
 nHH
 xTr
 yjE
-dGV
-fDO
 jKU
-vTg
+jKU
+jKU
+jKU
 jKU
 nQB
 pVM
@@ -112253,13 +112318,13 @@ cvk
 nFW
 uvG
 siN
-ngd
+jpp
 nuV
 sue
-ngd
+jpp
 cUB
 baO
-pOT
+pzd
 gMz
 rem
 rQA
@@ -112512,11 +112577,11 @@ pTA
 hEw
 bWp
 gjn
-ngd
+jpp
 ibF
 diG
 baO
-pOT
+pzd
 ycQ
 rem
 nvB
@@ -112765,13 +112830,13 @@ eav
 eav
 nFW
 nFW
-pOT
-pOT
+pzd
+pzd
 tlJ
 cYp
 jTC
 eOX
-pOT
+pzd
 xQJ
 xQJ
 xQJ
@@ -113023,12 +113088,12 @@ tLj
 wOp
 fsq
 iRl
-pOT
-pOT
+pzd
+pzd
 pTk
-pOT
-pOT
-pOT
+pzd
+pzd
+pzd
 xqs
 xMO
 xQJ
@@ -113282,7 +113347,7 @@ fLg
 tHi
 tfc
 wOp
-mTc
+ljc
 xQJ
 ejn
 vJx
@@ -113539,7 +113604,7 @@ pot
 rUq
 lyq
 wOp
-mTc
+ljc
 xQJ
 mbV
 vJx
@@ -119491,7 +119556,7 @@ xok
 qID
 iHM
 uSB
-lDc
+vSM
 qxB
 nKj
 jXr
@@ -119751,7 +119816,7 @@ gDB
 ccF
 gMe
 nRr
-pJu
+vTg
 rqm
 vwx
 rYp
@@ -119766,7 +119831,7 @@ woD
 qCY
 toh
 tAT
-pJu
+fDO
 ldx
 gMe
 ccF
@@ -129016,7 +129081,7 @@ ylD
 hqH
 vzv
 brz
-cgM
+sJf
 ylD
 wyj
 dYR
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f4691cfb2ab04..8959abab5589d 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4050,6 +4050,29 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/maintenance/solars/port/fore)
+"aYN" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig"
+	},
+/obj/structure/cable,
+/obj/effect/landmark/navigate_destination,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
 "aYO" = (
 /obj/structure/chair/pew/right,
 /turf/open/floor/iron/chapel{
@@ -10367,14 +10390,12 @@
 /area/station/command/corporate_showroom)
 "czg" = (
 /obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/plant_analyzer,
 /obj/machinery/camera/directional/east{
 	c_tag = "Permabrig - Garden";
 	network = list("ss13","prison")
 	},
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "czi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -18863,7 +18884,7 @@
 /obj/structure/sign/nanotrasen{
 	pixel_x = 32
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
 	dir = 1
@@ -19590,10 +19611,8 @@
 /area/station/engineering/atmos)
 "eQx" = (
 /obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/shovel/spade,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "eQB" = (
 /obj/machinery/door/airlock/public/glass{
@@ -22260,7 +22279,7 @@
 /turf/open/floor/iron,
 /area/station/service/kitchen)
 "fyH" = (
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_x = 6
 	},
 /obj/machinery/light_switch/directional/south{
@@ -22838,12 +22857,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/checkpoint/medical/medsci)
-"fGn" = (
-/obj/machinery/deepfryer,
-/obj/effect/turf_decal/bot,
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "fGt" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -25546,7 +25559,7 @@
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/aft)
 "goc" = (
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_y = -38
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -27275,7 +27288,7 @@
 	pixel_y = -6;
 	req_access = list("hos")
 	},
-/obj/machinery/keycard_auth/directional/east{
+/obj/machinery/keycard_auth/wall_mounted/directional/east{
 	pixel_x = 38;
 	pixel_y = 6
 	},
@@ -27544,10 +27557,8 @@
 "gLT" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/warning/electric_shock/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "gMd" = (
 /obj/structure/window/reinforced/spawner/directional/west,
@@ -30860,23 +30871,10 @@
 /turf/open/floor/iron,
 /area/station/commons/vacant_room/commissary)
 "hHi" = (
-/obj/structure/closet/crate/hydroponics,
-/obj/item/paper/guides/jobs/hydroponics,
-/obj/item/seeds/onion,
-/obj/item/seeds/garlic,
-/obj/item/seeds/potato,
-/obj/item/seeds/tomato,
-/obj/item/seeds/carrot,
-/obj/item/seeds/grass,
-/obj/item/seeds/ambrosia,
-/obj/item/seeds/wheat,
-/obj/item/seeds/pumpkin,
-/obj/effect/spawner/random/contraband/prison,
 /obj/structure/window/spawner/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/seeds/tower,
 /obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron,
+/obj/structure/water_source/puddle,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "hHo" = (
 /obj/structure/disposalpipe/trunk,
@@ -32151,7 +32149,7 @@
 /area/station/science/research/abandoned)
 "hXQ" = (
 /obj/machinery/door/window/left/directional/east{
-	name = "'Monkey Pen";
+	name = "Monkey Pen";
 	req_access = list("genetics")
 	},
 /obj/structure/flora/bush/lavendergrass,
@@ -42744,6 +42742,24 @@
 /obj/item/storage/crayons,
 /turf/open/floor/wood,
 /area/station/service/library/abandoned)
+"kEp" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance"
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
 "kEw" = (
 /obj/structure/cable,
 /obj/structure/reagent_dispensers/plumbed{
@@ -50644,28 +50660,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
-"mEB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig"
-	},
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
 "mEH" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -59519,13 +59513,23 @@
 /area/station/service/chapel)
 "oWp" = (
 /obj/structure/window/spawner/directional/south,
-/obj/structure/sink/directional/south,
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/cup/watering_can,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/tower,
+/obj/effect/spawner/random/contraband/prison,
+/obj/item/seeds/pumpkin,
+/obj/item/seeds/wheat,
+/obj/item/seeds/ambrosia,
+/obj/item/seeds/grass,
+/obj/item/seeds/carrot,
+/obj/item/seeds/tomato,
+/obj/item/seeds/potato,
+/obj/item/seeds/garlic,
+/obj/item/seeds/onion,
+/obj/item/paper/guides/jobs/hydroponics,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "oWt" = (
@@ -72704,6 +72708,11 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/engineering/main)
+"shc" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/smartfridge/drying,
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "shm" = (
 /obj/effect/spawner/random/structure/table_or_rack,
 /obj/machinery/airalarm/directional/north,
@@ -74136,7 +74145,7 @@
 	pixel_x = 38;
 	pixel_y = 3
 	},
-/obj/machinery/keycard_auth/directional/east{
+/obj/machinery/keycard_auth/wall_mounted/directional/east{
 	pixel_x = 40;
 	pixel_y = -8
 	},
@@ -76961,7 +76970,7 @@
 /area/station/command/bridge)
 "tns" = (
 /obj/structure/table/wood,
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/item/flashlight/lamp,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
@@ -78591,11 +78600,9 @@
 /area/station/command/corporate_showroom)
 "tGW" = (
 /obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
 /obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "tHc" = (
 /obj/structure/table/wood/fancy,
@@ -79856,10 +79863,8 @@
 	dir = 1
 	},
 /obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/turf/open/floor/iron,
+/obj/structure/water_source/puddle,
+/turf/open/misc/sandy_dirt,
 /area/station/service/hydroponics/garden)
 "tXe" = (
 /obj/effect/turf_decal/loading_area/red{
@@ -80350,23 +80355,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
-"ucz" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
 "ucA" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -84677,6 +84665,7 @@
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/green,
+/obj/item/reagent_containers/cup/watering_can,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "veD" = (
@@ -90300,10 +90289,8 @@
 "wAt" = (
 /obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "wAz" = (
 /obj/structure/table/wood,
@@ -90611,7 +90598,7 @@
 /obj/machinery/modular_computer/preset/id{
 	dir = 1
 	},
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_x = -5
 	},
 /obj/machinery/button/door/directional/south{
@@ -91827,11 +91814,9 @@
 /area/space)
 "wVy" = (
 /obj/machinery/hydroponics/soil,
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/directional/west,
-/obj/effect/mapping_helpers/burnt_floor,
 /obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/west,
-/turf/open/floor/plating,
+/turf/open/misc/sandy_dirt,
 /area/station/security/prison/garden)
 "wVJ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -127687,7 +127672,7 @@ spq
 nyp
 vmh
 rEJ
-fGn
+shc
 xtp
 hBF
 jUU
@@ -146989,9 +146974,9 @@ hOz
 hOz
 hOz
 dzw
-mEB
+aYN
 hOz
-ucz
+kEp
 mTA
 mTA
 tNZ
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 748b501c75f9e..b88647d4934a0 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -1,4 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aac" = (
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Security Checkpoint"
+	},
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brigoutpost"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark/textured_edge{
+	dir = 8
+	},
+/area/station/security/brig/entrance)
 "aap" = (
 /obj/effect/spawner/random/engineering/tracking_beacon,
 /turf/open/floor/iron,
@@ -859,9 +876,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/commons/dorms)
-"aoC" = (
-/turf/open/openspace,
-/area/icemoon/underground/explored)
 "apb" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -950,7 +964,7 @@
 /obj/structure/cable,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /obj/machinery/light/small/directional/north,
-/obj/machinery/computer/security/telescreen/engine/directional/north,
+/obj/machinery/incident_display/delam/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/engine_smes)
 "apS" = (
@@ -1157,7 +1171,7 @@
 	dir = 4
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "asM" = (
 /obj/machinery/light/directional/east,
@@ -7906,6 +7920,13 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
+"cmd" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/smartfridge/drying,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/service/kitchen)
 "cmg" = (
 /obj/effect/turf_decal/tile/green/opposingcorners{
 	dir = 1
@@ -9015,6 +9036,9 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "cBG" = (
@@ -14249,7 +14273,7 @@
 	dir = 1
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "egj" = (
 /obj/structure/rack,
@@ -14353,7 +14377,7 @@
 /turf/open/floor/iron,
 /area/station/commons/locker)
 "ehy" = (
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
@@ -14569,7 +14593,7 @@
 	dir = 1
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "ekW" = (
 /obj/structure/cable,
@@ -15737,6 +15761,7 @@
 /obj/item/analyzer,
 /obj/item/pipe_dispenser,
 /obj/item/flashlight,
+/obj/machinery/incident_display/delam/directional/north,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "eEm" = (
@@ -15774,22 +15799,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
-"eEZ" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Security Checkpoint"
-	},
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brigoutpost"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/dark/textured_edge{
-	dir = 8
-	},
-/area/station/security/brig/entrance)
 "eFd" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
@@ -18818,22 +18827,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/general,
 /turf/open/floor/plating,
 /area/station/security/processing)
-"fEC" = (
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Security Checkpoint"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brigoutpost"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/dark/textured_edge{
-	dir = 4
-	},
-/area/station/security/brig/entrance)
 "fER" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
 	dir = 4
@@ -24782,10 +24775,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"hto" = (
-/obj/structure/girder,
-/turf/closed/wall,
-/area/station/maintenance/starboard/aft)
 "htp" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "xenobio2";
@@ -27817,7 +27806,7 @@
 	pixel_y = 4
 	},
 /obj/item/folder/yellow,
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_x = -25;
 	pixel_y = -5
 	},
@@ -29297,7 +29286,7 @@
 /obj/item/bedsheet/cmo,
 /obj/machinery/light_switch/directional/south,
 /obj/effect/landmark/start/chief_medical_officer,
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/machinery/camera{
 	c_tag = "Chief Medical Officer Bedroom";
 	dir = 4;
@@ -29369,8 +29358,12 @@
 	pixel_y = 2
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
-/area/station/science/cytology)
+/obj/machinery/camera/directional/south{
+	c_tag = "Ordnance Lower Mix Lab";
+	network = list("ss13","rd")
+	},
+/turf/open/openspace/icemoon,
+/area/icemoon/underground/explored)
 "iPP" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/landmark/start/bartender,
@@ -29672,7 +29665,7 @@
 	},
 /obj/machinery/holopad,
 /obj/effect/landmark/start/depsec/medical,
-/obj/machinery/computer/security/telescreen/cmo/directional/east,
+/obj/machinery/computer/security/telescreen/med_sec/directional/east,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/security/checkpoint/medical)
 "iTJ" = (
@@ -33584,7 +33577,7 @@
 	dir = 1
 	},
 /obj/structure/railing,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "kdT" = (
 /obj/machinery/iv_drip,
@@ -35656,6 +35649,23 @@
 	dir = 1
 	},
 /area/station/commons/storage/art)
+"kGJ" = (
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Security Checkpoint"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brigoutpost"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark/textured_edge{
+	dir = 4
+	},
+/area/station/security/brig/entrance)
 "kGP" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/red{
@@ -38876,10 +38886,6 @@
 	dir = 1
 	},
 /area/station/hallway/secondary/service)
-"lEc" = (
-/obj/structure/stairs/east,
-/turf/open/misc/asteroid/snow,
-/area/station/science/ordnance)
 "lEg" = (
 /obj/machinery/door/window/left/directional/north{
 	name = "AI Core Door";
@@ -40954,7 +40960,7 @@
 	dir = 5
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "mnC" = (
 /obj/structure/grille,
@@ -41848,7 +41854,6 @@
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
-/obj/machinery/incident_display/bridge/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "mDw" = (
@@ -42046,7 +42051,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/aft)
 "mGV" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "mHd" = (
@@ -42532,7 +42537,7 @@
 	dir = 8
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "mRr" = (
 /obj/structure/cable,
@@ -43352,7 +43357,7 @@
 /area/station/service/hydroponics)
 "nce" = (
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "nci" = (
 /obj/structure/cable,
@@ -43686,7 +43691,7 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/machinery/camera/autoname/directional/south{
 	c_tag = "Research Director's Office";
 	network = list("ss13","rd")
@@ -43788,6 +43793,7 @@
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/item/radio/intercom/directional/west,
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "nhT" = (
@@ -44617,6 +44623,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"nsH" = (
+/obj/effect/turf_decal/siding/white{
+	dir = 1
+	},
+/obj/machinery/deepfryer,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/service/kitchen)
 "nsK" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
@@ -46176,7 +46189,7 @@
 	dir = 9
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "nOb" = (
 /obj/machinery/door/airlock/external{
@@ -49539,6 +49552,10 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/wood,
 /area/station/maintenance/aft/lesser)
+"oNW" = (
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "oNX" = (
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/dark,
@@ -52111,14 +52128,6 @@
 /obj/structure/flora/tree/jungle/small/style_random,
 /turf/open/floor/grass,
 /area/station/security/warden)
-"pBS" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/item/kirbyplants/organic/applebush,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/service/kitchen)
 "pBV" = (
 /obj/structure/chair/office/light,
 /turf/open/floor/iron/dark,
@@ -52418,6 +52427,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics/garden)
 "pGJ" = (
@@ -53787,8 +53799,8 @@
 	dir = 8
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
-/area/station/science/cytology)
+/turf/open/openspace/icemoon,
+/area/icemoon/underground/explored)
 "qbA" = (
 /obj/structure/cable,
 /obj/machinery/airalarm/directional/east,
@@ -54279,10 +54291,10 @@
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/qm)
 "qiT" = (
-/obj/structure/reagent_dispensers/watertank,
 /obj/effect/turf_decal/tile/green/anticorner/contrasted{
 	dir = 4
 	},
+/obj/item/kirbyplants/random,
 /turf/open/floor/iron/dark,
 /area/station/service/hydroponics/garden)
 "qjb" = (
@@ -54346,6 +54358,13 @@
 /obj/structure/girder,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
+"qjs" = (
+/obj/machinery/camera/directional/south{
+	c_tag = "Ordnance Lower Mix Lab";
+	network = list("ss13","rd")
+	},
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
 "qjx" = (
 /obj/structure/cable,
 /obj/machinery/holopad/secure,
@@ -57076,14 +57095,6 @@
 /obj/effect/spawner/random/food_or_drink/booze,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
-"qWf" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
-/obj/machinery/deepfryer,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/service/kitchen)
 "qWh" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -58111,6 +58122,7 @@
 /obj/item/stock_parts/power_store/cell/high/empty,
 /obj/machinery/cell_charger,
 /obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/engineering/lobby)
 "rlS" = (
@@ -61849,7 +61861,7 @@
 /area/station/maintenance/department/medical/central)
 "sqU" = (
 /obj/machinery/newscaster/directional/west,
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain)
 "sqW" = (
@@ -63816,7 +63828,7 @@
 /turf/open/floor/iron/white,
 /area/station/medical/chemistry)
 "sSS" = (
-/obj/item/radio/intercom/directional/north,
+/obj/machinery/incident_display/delam/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/lobby)
 "sTe" = (
@@ -66997,7 +67009,7 @@
 	dir = 4
 	},
 /obj/structure/lattice/catwalk,
-/turf/open/openspace,
+/turf/open/openspace/icemoon,
 /area/icemoon/underground/explored)
 "tTL" = (
 /obj/structure/chair,
@@ -67386,7 +67398,6 @@
 /obj/machinery/modular_computer/preset/civilian{
 	dir = 8
 	},
-/obj/structure/sign/poster/official/build/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/lobby)
 "tZR" = (
@@ -73909,7 +73920,6 @@
 /turf/open/floor/iron/large,
 /area/station/command/heads_quarters/ce)
 "wcz" = (
-/obj/structure/sink/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/turf_decal/tile/green/half/contrasted{
 	dir = 1
@@ -74285,8 +74295,8 @@
 /area/station/medical/virology)
 "wiM" = (
 /obj/machinery/computer/station_alert,
-/obj/item/radio/intercom/directional/north,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/computer/security/telescreen/engine/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/engine_smes)
 "wiO" = (
@@ -74300,7 +74310,7 @@
 /obj/machinery/computer/cargo{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/effect/turf_decal/tile/blue/anticorner/contrasted{
 	dir = 8
 	},
@@ -77696,15 +77706,12 @@
 /turf/open/floor/carpet/blue,
 /area/station/hallway/secondary/entry)
 "xhg" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
 /obj/machinery/camera/directional/east{
 	c_tag = "Garden"
 	},
-/obj/item/kirbyplants/random,
 /obj/machinery/status_display/ai/directional/east,
-/turf/open/floor/iron/dark,
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "xhk" = (
 /turf/open/floor/iron/dark,
@@ -79380,9 +79387,14 @@
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
 "xFM" = (
-/obj/machinery/incident_display/delam,
-/turf/closed/wall/r_wall,
-/area/station/engineering/supermatter/room)
+/obj/effect/turf_decal/bot{
+	dir = 1
+	},
+/obj/machinery/suit_storage_unit/engine,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/engine_smes)
 "xFT" = (
 /obj/effect/turf_decal/trimline/green/filled/corner,
 /obj/effect/turf_decal/trimline/blue/filled/warning/corner,
@@ -80714,6 +80726,10 @@
 	},
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/camera/directional/south{
+	c_tag = "Ordnance Lower Mix Lab";
+	network = list("ss13","rd")
+	},
 /turf/open/floor/iron/smooth_large,
 /area/station/science/cytology)
 "ybf" = (
@@ -129266,7 +129282,7 @@ iDt
 iDt
 iDt
 iDt
-iDt
+qjs
 fIt
 fIt
 oSU
@@ -167752,7 +167768,7 @@ jlF
 jNf
 dpC
 cGQ
-whr
+oNW
 nmr
 hVY
 gjq
@@ -168267,7 +168283,7 @@ jNf
 qIo
 tau
 dWK
-ozX
+whr
 hVY
 gjq
 gjq
@@ -193514,9 +193530,9 @@ thA
 thA
 xMq
 xMq
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 kdJ
 iDt
 iDt
@@ -193771,11 +193787,11 @@ thA
 thA
 xMq
 xMq
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 kdJ
-aoC
+lvt
 wnp
 wnp
 sjD
@@ -194027,10 +194043,10 @@ thA
 thA
 thA
 xMq
-aoC
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
+lvt
 mRp
 qbz
 wnp
@@ -194284,9 +194300,9 @@ thA
 thA
 thA
 rcY
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 nNV
 ege
 iPK
@@ -194541,9 +194557,9 @@ thA
 tjo
 tjo
 rcY
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 ekN
 nce
 qcl
@@ -194798,9 +194814,9 @@ thA
 tjo
 tjo
 rcY
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 mnB
 tTK
 rSZ
@@ -195055,10 +195071,10 @@ thA
 tjo
 tjo
 rcY
-aoC
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
+lvt
 asG
 qcl
 qcl
@@ -195313,12 +195329,12 @@ tjo
 tjo
 qZG
 ebX
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 kdJ
-aoC
-aoC
+lvt
+lvt
 wnp
 wnp
 dqt
@@ -195572,11 +195588,11 @@ tjo
 qZG
 kNC
 ebX
-aoC
+lvt
 kdJ
-aoC
-aoC
-aoC
+lvt
+lvt
+lvt
 wnp
 qcl
 qcl
@@ -195584,7 +195600,7 @@ wnp
 uIf
 odm
 odm
-lEc
+odm
 odm
 nqy
 jGR
@@ -240591,7 +240607,7 @@ gTK
 gTK
 myX
 sSJ
-xFM
+gka
 eEh
 fab
 eDC
@@ -240844,7 +240860,7 @@ mNY
 wiM
 tMD
 ehJ
-rpF
+xFM
 twt
 tXB
 sSJ
@@ -241022,7 +241038,7 @@ iiH
 teP
 teP
 teP
-fEC
+kGJ
 gMK
 fng
 rHc
@@ -241536,7 +241552,7 @@ uwB
 lvS
 xLO
 fGM
-eEZ
+aac
 nUJ
 qbA
 csB
@@ -251069,7 +251085,7 @@ fkk
 fkk
 fkk
 spj
-pBS
+cmd
 vrw
 jlT
 lso
@@ -251840,7 +251856,7 @@ cki
 gtw
 gtw
 aHZ
-qWf
+nsH
 vrw
 jlT
 lso
@@ -259605,7 +259621,7 @@ lXi
 vzD
 vzD
 vzD
-hto
+vzD
 jOj
 vzD
 daT
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f37d9a419f73e..a719ae4c67114 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -7125,7 +7125,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/spawner/random/structure/crate,
 /obj/structure/disposalpipe/segment{
-	dir = 6
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
@@ -9494,7 +9494,6 @@
 /obj/structure/cable,
 /obj/effect/spawner/random/maintenance,
 /obj/machinery/recharge_station,
-/obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "dvn" = (
@@ -9634,16 +9633,6 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
-/obj/structure/table,
-/obj/item/storage/box/bandages{
-	pixel_y = 6;
-	pixel_x = 4
-	},
-/obj/effect/spawner/random/entertainment/deck,
-/obj/effect/spawner/random/entertainment/cigarette_pack{
-	pixel_x = -6;
-	pixel_y = 8
-	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "dxq" = (
@@ -10607,9 +10596,7 @@
 	},
 /obj/effect/turf_decal/tile/red/fourcorners,
 /obj/machinery/light/small/directional/west,
-/obj/machinery/computer/security/telescreen/cmo/directional/west{
-	name = "Medbay Monitor"
-	},
+/obj/machinery/computer/security/telescreen/med_sec/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/medical)
 "dQO" = (
@@ -12952,6 +12939,20 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/aft)
+"eEa" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/smartfridge/drying,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/trimline/brown/warning{
+	dir = 9
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/service/kitchen)
 "eEf" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Bar - Backroom"
@@ -13805,7 +13806,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
 	},
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = -5
 	},
 /turf/open/floor/wood/large,
@@ -14534,6 +14535,8 @@
 /mob/living/simple_animal/bot/mulebot{
 	name = "Leaping Rabbit"
 	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "fhp" = (
@@ -15262,25 +15265,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"frH" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/flasher/directional/east{
-	id = "secentranceflasher"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "frZ" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/components/binary/pump{
@@ -15553,13 +15537,10 @@
 /turf/open/floor/plating/airless,
 /area/station/solars/port/fore)
 "fzr" = (
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/spawner/random/food_or_drink/seed{
-	spawn_all_loot = 1;
-	spawn_random_offset = 1
-	},
-/turf/open/floor/iron,
+/obj/structure/window/spawner/directional/south,
+/obj/structure/window/spawner/directional/west,
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "fzE" = (
 /obj/structure/sign/warning/vacuum/external/directional/north,
@@ -16175,20 +16156,6 @@
 /obj/machinery/power/tracker,
 /turf/open/floor/plating/airless,
 /area/station/solars/starboard/fore)
-"fLS" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "fMf" = (
 /obj/structure/chair/office{
 	dir = 1
@@ -16902,7 +16869,7 @@
 /obj/machinery/computer/crew{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_x = 6
 	},
 /obj/machinery/button/door/directional/south{
@@ -22009,7 +21976,7 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain/private)
 "hSt" = (
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/ce)
@@ -24145,7 +24112,7 @@
 	dir = 8
 	},
 /obj/machinery/status_display/ai/directional/north,
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/captain/private)
 "iDq" = (
@@ -25498,6 +25465,26 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"jau" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/flasher/directional/east{
+	id = "secentranceflasher"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "jay" = (
 /obj/structure/chair{
 	dir = 4
@@ -27075,10 +27062,13 @@
 /area/station/cargo/miningoffice)
 "jBp" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/machinery/conveyor_switch/oneway{
-	id = "mining";
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
+/obj/machinery/disposal/bin{
+	name = "Jim Norton's Quebecois Coffee disposal unit"
+	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "jBu" = (
@@ -35020,7 +35010,7 @@
 /obj/machinery/computer/records/security{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/machinery/requests_console/directional/north{
 	department = "Head of Security's Desk";
 	name = "Head of Security Requests Console"
@@ -36122,20 +36112,6 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
 /turf/open/floor/iron/dark,
 /area/station/security/range)
-"mPZ" = (
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/deepfryer,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/trimline/brown/warning{
-	dir = 9
-	},
-/turf/open/floor/iron/cafeteria,
-/area/station/service/kitchen)
 "mQa" = (
 /obj/machinery/camera/directional/north{
 	c_tag = "Port Primary Hallway - Middle"
@@ -39009,6 +38985,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 9
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "nNw" = (
@@ -39547,6 +39524,10 @@
 /obj/structure/table,
 /obj/structure/extinguisher_cabinet/directional/west,
 /obj/effect/turf_decal/stripes/line,
+/obj/effect/spawner/random/food_or_drink/seed{
+	spawn_all_loot = 1;
+	spawn_random_offset = 1
+	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "nYU" = (
@@ -40297,6 +40278,9 @@
 "omV" = (
 /obj/effect/spawner/random/structure/grille,
 /obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/fore)
 "onf" = (
@@ -40425,7 +40409,6 @@
 /obj/machinery/hydroponics/soil,
 /obj/item/cultivator,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
 "opG" = (
@@ -42574,6 +42557,21 @@
 /obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/maintenance/starboard/greater)
+"pdI" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "pdT" = (
 /obj/effect/spawner/random/vending/colavend,
 /obj/effect/turf_decal/delivery,
@@ -43416,7 +43414,7 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/hos)
 "psy" = (
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/hop)
 "psz" = (
@@ -44982,13 +44980,16 @@
 /area/station/security/brig)
 "pVV" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted,
-/obj/machinery/disposal/bin{
-	name = "Jim Norton's Quebecois Coffee disposal unit"
+/obj/structure/table,
+/obj/item/storage/box/bandages{
+	pixel_y = 6;
+	pixel_x = 4
 	},
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
+/obj/effect/spawner/random/entertainment/cigarette_pack{
+	pixel_x = -6;
+	pixel_y = 8
 	},
+/obj/effect/spawner/random/entertainment/deck,
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "pVZ" = (
@@ -46937,18 +46938,9 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/structure/table,
-/obj/item/flashlight/lamp{
-	pixel_x = -7;
-	pixel_y = 9
-	},
-/obj/item/folder/yellow{
-	pixel_y = -5;
-	pixel_x = 5
-	},
-/obj/item/pen/blue{
-	pixel_x = 4;
-	pixel_y = -3
+/obj/machinery/conveyor_switch/oneway{
+	id = "mining";
+	dir = 1
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
@@ -47476,6 +47468,9 @@
 	department = "Mining";
 	name = "Mining Requests Console"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
 "qPs" = (
@@ -48534,7 +48529,7 @@
 /area/station/command/teleporter)
 "rhL" = (
 /obj/machinery/computer/security/mining,
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /obj/item/radio/intercom/directional/north{
 	pixel_y = 34
 	},
@@ -50763,8 +50758,6 @@
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "rVb" = (
-/obj/structure/sink/directional/west,
-/obj/item/reagent_containers/cup/watering_can,
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 4
 	},
@@ -51197,7 +51190,6 @@
 "sbX" = (
 /obj/machinery/hydroponics/soil,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
 /obj/item/plant_analyzer,
 /turf/open/floor/grass,
 /area/station/security/prison/garden)
@@ -54064,7 +54056,7 @@
 /obj/item/aicard,
 /obj/item/pai_card,
 /obj/item/circuitboard/aicore,
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = -5
 	},
 /obj/machinery/button/door/directional/north{
@@ -55378,6 +55370,7 @@
 /obj/effect/turf_decal/trimline/green/filled/line{
 	dir = 8
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/security/prison/garden)
 "tCF" = (
@@ -63874,6 +63867,12 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/iron,
 /area/station/science/robotics/mechbay)
+"wsG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/water_source/puddle,
+/obj/item/reagent_containers/cup/watering_can,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "wsI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -65142,7 +65141,6 @@
 /turf/open/floor/iron/white,
 /area/station/science/robotics/lab)
 "wRF" = (
-/obj/structure/window/spawner/directional/west,
 /obj/structure/flora/rock/pile,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
@@ -87407,7 +87405,7 @@ aaa
 lMJ
 aaa
 aaa
-aaa
+cmB
 cmB
 cmB
 cmB
@@ -87665,7 +87663,7 @@ lMJ
 aaa
 aaa
 cmB
-cmB
+wsG
 opF
 sbX
 jTi
@@ -87691,7 +87689,7 @@ hJO
 duG
 omV
 fhn
-jXu
+cuh
 jBp
 wsk
 qHt
@@ -87948,7 +87946,7 @@ bkJ
 iIE
 cAf
 dve
-cuh
+jXu
 pVV
 qqr
 iId
@@ -97205,7 +97203,7 @@ uok
 bzV
 ezg
 uVv
-fLS
+pdI
 pjh
 gpc
 gGo
@@ -97719,7 +97717,7 @@ lsP
 vYF
 eaP
 lTj
-frH
+jau
 afj
 qGs
 gCD
@@ -105467,7 +105465,7 @@ mal
 bDK
 oRs
 pem
-mPZ
+eEa
 huG
 huG
 huG
diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm
index 5bc3a711a1b03..01234def93289 100644
--- a/_maps/map_files/Mining/Lavaland.dmm
+++ b/_maps/map_files/Mining/Lavaland.dmm
@@ -82,6 +82,12 @@
 /obj/item/clothing/glasses/meson,
 /turf/open/floor/iron/dark,
 /area/mine/storage/public)
+"as" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "av" = (
 /obj/machinery/computer/arcade/orion_trail{
 	dir = 4
@@ -93,6 +99,16 @@
 /obj/structure/cable,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"aF" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
+"aH" = (
+/obj/structure/railing{
+	dir = 10
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "aM" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
 	cycle_id = "lavaland_living_east_maint"
@@ -137,6 +153,20 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
+"aX" = (
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/structure/railing{
+	dir = 9
+	},
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
+"ba" = (
+/obj/structure/chair/sofa/middle{
+	dir = 1;
+	color = "#AA4A44"
+	},
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "bb" = (
 /obj/structure/closet/crate/internals,
 /obj/item/tank/internals/emergency_oxygen,
@@ -154,6 +184,13 @@
 	dir = 4
 	},
 /area/mine/laborcamp/production)
+"be" = (
+/obj/machinery/door/airlock/external/glass{
+	name = "Raptor Ranch External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lobby/raptor)
 "bf" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth_large,
@@ -197,6 +234,10 @@
 	},
 /turf/open/floor/plating,
 /area/mine/maintenance/production)
+"bE" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "bH" = (
 /obj/structure/table,
 /obj/item/book/manual/chef_recipes{
@@ -344,11 +385,10 @@
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
 "ct" = (
-/obj/structure/railing/wooden_fence{
-	dir = 6
-	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/structure/marker_beacon/purple,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "cw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -506,6 +546,13 @@
 	},
 /turf/open/floor/iron/white,
 /area/mine/cafeteria)
+"de" = (
+/obj/structure/railing{
+	dir = 6
+	},
+/obj/structure/lattice/catwalk/mining,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "dh" = (
 /obj/machinery/mech_bay_recharge_port{
 	dir = 2
@@ -581,6 +628,19 @@
 /obj/structure/lattice/catwalk/mining,
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"dF" = (
+/obj/structure/table/wood,
+/obj/item/food/meat/slab,
+/obj/item/food/meat/slab{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
+"dI" = (
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lobby/raptor)
 "dJ" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -628,6 +688,12 @@
 /obj/item/soap/homemade,
 /turf/open/floor/iron/freezer,
 /area/mine/laborcamp)
+"ej" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "eo" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -713,6 +779,18 @@
 	dir = 8
 	},
 /area/mine/cafeteria)
+"eL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
+"eN" = (
+/obj/structure/chair/wood{
+	dir = 1
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "eP" = (
 /obj/structure/chair/sofa/left/brown,
 /obj/effect/turf_decal/tile/bar/opposingcorners{
@@ -754,6 +832,9 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/mine/laborcamp/security/maintenance)
+"fa" = (
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "fb" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -855,6 +936,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
+"fK" = (
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/structure/railing,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "fL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1197,6 +1283,10 @@
 /obj/structure/sign/poster/official/cleanliness/directional/north,
 /turf/open/floor/iron/freezer,
 /area/mine/living_quarters)
+"hl" = (
+/obj/structure/tank_holder/extinguisher,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "hn" = (
 /obj/effect/turf_decal/trimline/brown/filled/line{
 	dir = 9
@@ -1315,8 +1405,12 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "hM" = (
-/turf/closed/wall/mineral/wood/nonmetal,
-/area/lavaland/surface)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "hR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1418,7 +1512,7 @@
 "il" = (
 /obj/item/flashlight/lantern/on,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "io" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1523,6 +1617,13 @@
 	dir = 1
 	},
 /area/mine/living_quarters)
+"jb" = (
+/obj/structure/railing{
+	dir = 10
+	},
+/obj/structure/lattice/catwalk/mining,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "jc" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -1598,6 +1699,10 @@
 	},
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"jt" = (
+/obj/structure/fireplace,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "jw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -1642,6 +1747,11 @@
 	},
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"jJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "jL" = (
 /obj/structure/stone_tile/surrounding_tile,
 /obj/structure/stone_tile/surrounding_tile{
@@ -1692,11 +1802,12 @@
 	},
 /area/mine/production)
 "jX" = (
-/obj/structure/railing/wooden_fence{
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "ka" = (
 /obj/structure/table,
 /obj/machinery/newscaster/directional/north,
@@ -1707,9 +1818,19 @@
 	},
 /turf/open/floor/iron/checker,
 /area/mine/cafeteria)
+"kf" = (
+/obj/structure/railing{
+	dir = 9
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "kg" = (
 /turf/closed/wall/r_wall,
 /area/mine/laborcamp)
+"ki" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lobby/raptor)
 "kk" = (
 /obj/structure/stone_tile/block{
 	dir = 8
@@ -1959,10 +2080,7 @@
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "lt" = (
-/obj/structure/railing/wooden_fence{
-	dir = 5
-	},
-/turf/open/misc/asteroid/basalt/lava_land_surface,
+/turf/open/misc/hay/lavaland,
 /area/lavaland/surface/outdoors)
 "lv" = (
 /obj/structure/stone_tile/block/cracked{
@@ -2100,6 +2218,10 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron,
 /area/mine/lounge)
+"lP" = (
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "lQ" = (
 /obj/structure/stone_tile/surrounding/cracked{
 	dir = 6
@@ -2200,7 +2322,7 @@
 	},
 /obj/item/raptor_dex,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "ml" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 8
@@ -2613,6 +2735,12 @@
 /obj/effect/spawner/random/trash/food_packaging,
 /turf/open/floor/iron/checker,
 /area/mine/laborcamp)
+"nO" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "nP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/portable_atmospherics/scrubber,
@@ -2789,6 +2917,15 @@
 /obj/effect/turf_decal/trimline/green/filled/line,
 /turf/open/floor/iron/dark,
 /area/mine/laborcamp)
+"oO" = (
+/obj/machinery/door/airlock/external/glass{
+	name = "Mining External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lobby/raptor)
 "oS" = (
 /obj/machinery/door/airlock/external/glass{
 	name = "Mining External Airlock"
@@ -2935,6 +3072,12 @@
 	},
 /turf/open/floor/plating,
 /area/mine/laborcamp)
+"pF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "pH" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2960,6 +3103,10 @@
 /obj/structure/sign/poster/official/cleanliness/directional/north,
 /turf/open/floor/iron/freezer,
 /area/mine/laborcamp/quarters)
+"pM" = (
+/obj/structure/bookcase/random/reference,
+/turf/open/floor/wood,
+/area/mine/lobby/raptor)
 "pO" = (
 /obj/machinery/shower/directional/south,
 /obj/machinery/door/window/left/directional/south,
@@ -3051,12 +3198,6 @@
 	dir = 4
 	},
 /area/mine/laborcamp/quarters)
-"qi" = (
-/obj/structure/railing/wooden_fence{
-	dir = 4
-	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
 "qo" = (
 /obj/machinery/door/airlock/glass{
 	name = "Equipment Storage"
@@ -3125,6 +3266,11 @@
 	},
 /turf/open/floor/iron/dark,
 /area/mine/laborcamp/security)
+"qB" = (
+/obj/machinery/smartfridge/drying/rack,
+/obj/item/food/cheese/firm_cheese,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "qH" = (
 /obj/machinery/door/airlock{
 	id_tag = "miningbathroomprivate";
@@ -3184,6 +3330,35 @@
 	},
 /turf/open/floor/plating/lavaland_atmos,
 /area/lavaland/surface/outdoors)
+"rf" = (
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
+"rj" = (
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = -1;
+	pixel_x = 5
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 9;
+	pixel_x = 8
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 9;
+	pixel_x = 2
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?"
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "rm" = (
 /obj/structure/sign/warning/gas_mask/directional/west,
 /obj/effect/decal/cleanable/dirt,
@@ -3225,6 +3400,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
+"rB" = (
+/obj/structure/chair/sofa/corner{
+	dir = 1;
+	color = "#AA4A44"
+	},
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "rF" = (
 /turf/closed/wall/r_wall,
 /area/mine/maintenance/labor)
@@ -3299,7 +3481,7 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lantern/on,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "se" = (
 /turf/open/floor/iron/dark/textured_large,
 /area/mine/eva)
@@ -3399,7 +3581,7 @@
 "sQ" = (
 /obj/structure/ore_container/food_trough/raptor_trough,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "sR" = (
 /obj/machinery/light/small/directional/west,
 /obj/effect/decal/cleanable/dirt,
@@ -3473,6 +3655,13 @@
 	dir = 4
 	},
 /area/mine/cafeteria)
+"tf" = (
+/obj/structure/chair/sofa/corner{
+	dir = 8;
+	color = "#AA4A44"
+	},
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "tg" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/airlock/maintenance{
@@ -3628,6 +3817,12 @@
 /obj/item/crowbar/large/emergency,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"up" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "uq" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -3654,7 +3849,7 @@
 "uw" = (
 /obj/effect/spawner/random/lavaland_mob/raptor,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "ux" = (
 /obj/machinery/door/airlock{
 	id_tag = "miningdorm1";
@@ -3701,11 +3896,11 @@
 /area/mine/lounge)
 "uT" = (
 /obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
+/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
 	dir = 1
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/area/mine/maintenance/service)
 "uU" = (
 /turf/closed/mineral/random/labormineral/volcanic,
 /area/lavaland/surface/outdoors)
@@ -3817,6 +4012,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/mine/hydroponics)
+"vr" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "vu" = (
 /obj/structure/bed/medical/emergency,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -3885,6 +4086,14 @@
 /obj/item/cigbutt,
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp)
+"vM" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "vN" = (
 /obj/machinery/computer/records/security,
 /obj/structure/cable,
@@ -3936,6 +4145,12 @@
 /obj/effect/turf_decal/siding/wideplating_new,
 /turf/open/floor/iron/checker,
 /area/mine/laborcamp)
+"wa" = (
+/obj/machinery/camera/autoname/directional/north{
+	network = list("mine")
+	},
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "wb" = (
 /obj/structure/chair{
 	dir = 8
@@ -4225,6 +4440,12 @@
 	dir = 1
 	},
 /area/mine/storage/public)
+"xW" = (
+/obj/structure/railing/corner/end{
+	dir = 4
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "yc" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -4399,8 +4620,7 @@
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
 "ze" = (
-/obj/effect/spawner/random/lavaland_mob/raptor,
-/turf/open/misc/asteroid/basalt/lava_land_surface,
+/turf/open/misc/ashplanet/rocky,
 /area/lavaland/surface/outdoors)
 "zf" = (
 /obj/machinery/door/airlock{
@@ -4459,9 +4679,12 @@
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp)
 "zs" = (
-/obj/structure/railing/wooden_fence,
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/obj/structure/railing{
+	dir = 5
+	},
+/obj/structure/lattice/catwalk/mining,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "zw" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4552,6 +4775,13 @@
 /obj/structure/cable,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"zX" = (
+/obj/structure/chair/wood{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "Ae" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4567,6 +4797,13 @@
 	},
 /turf/open/floor/plating,
 /area/mine/laborcamp/production)
+"Ah" = (
+/obj/machinery/microwave{
+	pixel_y = 6
+	},
+/obj/structure/table/wood,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "Ai" = (
 /obj/structure/stone_tile/cracked{
 	dir = 1
@@ -4602,11 +4839,21 @@
 /obj/effect/mapping_helpers/airlock/access/any/supply/mining_station,
 /turf/open/floor/iron/dark/textured_large,
 /area/mine/production)
+"Av" = (
+/obj/structure/railing{
+	dir = 9
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "Ax" = (
 /obj/item/pickaxe,
 /obj/effect/mob_spawn/corpse/human/miner,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Az" = (
+/obj/item/flashlight/lantern/on,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "AA" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/disposalpipe/segment,
@@ -4620,6 +4867,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp)
+"AF" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "AI" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4797,12 +5051,31 @@
 	},
 /turf/open/floor/iron/checker,
 /area/mine/cafeteria)
-"Cv" = (
-/obj/structure/railing/wooden_fence{
-	dir = 5
+"Cn" = (
+/obj/structure/table/wood,
+/obj/item/plate{
+	pixel_x = 6;
+	pixel_y = 7
 	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/obj/item/plate{
+	pixel_x = -6;
+	pixel_y = -6
+	},
+/obj/item/reagent_containers/cup/glass/mug/tea{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
+"Cv" = (
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/structure/marker_beacon/purple,
+/obj/effect/turf_decal/sand/plating/volcanic,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "Cz" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Infirmary"
@@ -4901,6 +5174,9 @@
 /obj/structure/curtain,
 /turf/open/floor/iron/freezer,
 /area/mine/living_quarters)
+"CV" = (
+/turf/closed/wall/mineral/iron,
+/area/mine/lobby/raptor)
 "CX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4978,10 +5254,9 @@
 /turf/closed/wall,
 /area/mine/medical)
 "DB" = (
-/obj/structure/railing/wooden_fence{
-	dir = 8
-	},
-/turf/open/misc/asteroid/basalt/lava_land_surface,
+/obj/structure/marker_beacon/purple,
+/obj/effect/turf_decal/sand/plating/volcanic,
+/turf/open/floor/plating/lavaland_atmos,
 /area/lavaland/surface/outdoors)
 "DF" = (
 /obj/structure/cable,
@@ -5149,6 +5424,10 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
+"EL" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lounge)
 "EM" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -5162,6 +5441,12 @@
 	dir = 1
 	},
 /area/mine/production)
+"EP" = (
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "EQ" = (
 /turf/open/floor/iron/smooth_edge{
 	dir = 8
@@ -5216,6 +5501,12 @@
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Fo" = (
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "Fp" = (
 /obj/structure/table,
 /obj/machinery/recharger,
@@ -5224,6 +5515,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/mine/laborcamp/security)
+"Fr" = (
+/obj/machinery/door/airlock/external/glass{
+	name = "Mining Shuttle Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/turf/open/floor/iron/dark/textured_large,
+/area/mine/production)
 "Fs" = (
 /obj/effect/turf_decal/sand/plating/volcanic,
 /obj/effect/spawner/random/maintenance/two,
@@ -5267,6 +5565,10 @@
 "FH" = (
 /turf/closed/wall,
 /area/lavaland/surface/outdoors)
+"FI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "FL" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/light/small/directional/west,
@@ -5388,11 +5690,8 @@
 	},
 /area/mine/production)
 "GG" = (
-/obj/structure/railing/wooden_fence{
-	dir = 9
-	},
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "GH" = (
 /obj/machinery/door/airlock/glass{
 	name = "Arrival Lounge"
@@ -5402,6 +5701,12 @@
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron,
 /area/mine/lounge)
+"GI" = (
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/wood/fifty,
+/obj/item/lighter,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "GL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5464,6 +5769,18 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/plating,
 /area/mine/maintenance/public/north)
+"Hj" = (
+/obj/machinery/door/airlock/external/glass{
+	name = "Mining External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lounge)
+"Hl" = (
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lounge)
 "Hp" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/effect/turf_decal/trimline/brown/filled/line{
@@ -5781,6 +6098,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp)
+"Jg" = (
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/structure/railing{
+	dir = 10
+	},
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "Jh" = (
 /obj/structure/cable,
 /obj/machinery/light/small/directional/east,
@@ -5950,6 +6274,13 @@
 	dir = 1
 	},
 /area/mine/living_quarters)
+"JQ" = (
+/obj/machinery/door/airlock/external/glass{
+	name = "Raptor Ranch External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lounge)
 "JR" = (
 /obj/structure/stone_tile,
 /obj/structure/stone_tile{
@@ -6031,6 +6362,41 @@
 /obj/structure/girder,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Km" = (
+/obj/structure/rack,
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?"
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 9
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 9;
+	pixel_x = 2
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 6
+	},
+/obj/item/food/grown/grass/fairy{
+	name = "weird hay";
+	desc = "Somehow, somewhere, this tells you it should increase your friendship level with your animals. Too bad that doesn't work, right?";
+	pixel_y = 6;
+	pixel_x = 9
+	},
+/obj/item/crowbar/large,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "Kn" = (
 /obj/machinery/telecomms/relay/preset/mining,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -6123,6 +6489,12 @@
 	},
 /turf/open/floor/iron/checker,
 /area/mine/cafeteria)
+"KO" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "KV" = (
 /obj/structure/table,
 /obj/machinery/light/directional/east,
@@ -6243,6 +6615,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/mine/storage)
+"Lv" = (
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "Lw" = (
 /obj/effect/turf_decal/sand/plating/volcanic,
 /obj/effect/turf_decal/stripes/line{
@@ -6348,6 +6729,13 @@
 	},
 /turf/open/floor/plating/lavaland_atmos,
 /area/lavaland/surface/outdoors)
+"LV" = (
+/obj/structure/railing{
+	dir = 9
+	},
+/obj/structure/lattice/catwalk/mining,
+/turf/open/lava/smooth/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "LY" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -6392,6 +6780,10 @@
 	dir = 8
 	},
 /area/mine/lounge)
+"Mf" = (
+/obj/item/kirbyplants/random,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "Mr" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -6574,6 +6966,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth_large,
 /area/mine/laborcamp/production)
+"Ns" = (
+/obj/structure/flora/ash/fireblossom,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "Nt" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/light/small/directional/west,
@@ -6627,11 +7023,8 @@
 /turf/open/floor/iron/dark,
 /area/mine/production)
 "NK" = (
-/obj/structure/railing/wooden_fence{
-	dir = 1
-	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/turf/open/misc/ashplanet/ash,
+/area/lavaland/surface/outdoors)
 "NL" = (
 /obj/structure/railing,
 /obj/structure/lattice/catwalk/mining,
@@ -6641,6 +7034,13 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/mine/laborcamp/security/maintenance)
+"NP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable,
+/turf/open/floor/plating/lavaland_atmos,
+/area/mine/lobby/raptor)
 "NR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
@@ -6652,7 +7052,7 @@
 /area/mine/laborcamp/production)
 "NS" = (
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "NT" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6747,6 +7147,13 @@
 	},
 /turf/open/floor/iron,
 /area/mine/lounge)
+"Oo" = (
+/obj/structure/railing{
+	dir = 5
+	},
+/obj/item/reagent_containers/cup/bucket/wooden,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "Op" = (
 /obj/structure/stone_tile/slab,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
@@ -6768,6 +7175,16 @@
 	dir = 4
 	},
 /area/mine/laborcamp/security)
+"OE" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/chair/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "OH" = (
 /obj/item/storage/fancy/cigarettes/cigpack_robust{
 	pixel_x = -8;
@@ -6824,7 +7241,7 @@
 	},
 /obj/item/soap/deluxe,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "OZ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -6834,6 +7251,10 @@
 	dir = 1
 	},
 /area/mine/mechbay)
+"Pb" = (
+/obj/structure/water_source/puddle,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "Pc" = (
 /obj/structure/closet/crate/grave,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
@@ -6844,6 +7265,13 @@
 /obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/plating/lavaland_atmos,
 /area/lavaland/surface/outdoors)
+"Pe" = (
+/obj/structure/lattice/catwalk/mining,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "Pi" = (
 /obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/trimline/red/filled/line,
@@ -6881,6 +7309,12 @@
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
 /area/mine/cafeteria)
+"Pn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "Po" = (
 /obj/structure/table,
 /obj/item/paper/guides/jobs/security/labor_camp,
@@ -7187,6 +7621,28 @@
 	},
 /turf/open/floor/iron/dark,
 /area/mine/production)
+"Ri" = (
+/obj/item/canvas/twentythree_nineteen,
+/obj/structure/easel,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
+"Rj" = (
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/turf_decal/trimline/brown/filled/line{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark/smooth_edge{
+	dir = 8
+	},
+/area/mine/eva)
+"Rm" = (
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "Ro" = (
 /obj/effect/turf_decal/loading_area,
 /obj/effect/turf_decal/trimline/brown/filled/line{
@@ -7271,6 +7727,13 @@
 /obj/structure/lattice/catwalk,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"RO" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/mine/eva)
 "RV" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -7332,6 +7795,11 @@
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Sj" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "Sm" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/turf_decal/siding/yellow,
@@ -7345,6 +7813,14 @@
 	},
 /turf/open/floor/iron/dark,
 /area/mine/hydroponics)
+"Sp" = (
+/obj/structure/easel,
+/obj/item/canvas/fortyfive_twentyseven,
+/obj/item/canvas/thirtysix_twentyfour,
+/obj/item/canvas/twentythree_nineteen,
+/obj/item/paint_palette,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "Sq" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/structure/cable,
@@ -7517,17 +7993,22 @@
 	},
 /area/mine/production)
 "Tt" = (
-/obj/structure/railing/wooden_fence{
-	dir = 10
+/obj/item/kirbyplants/random,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
 	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "Tu" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp)
+"Tw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "Tx" = (
 /obj/machinery/light/small/directional/north,
 /obj/effect/decal/cleanable/dirt,
@@ -7706,6 +8187,10 @@
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"Uz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "UD" = (
 /obj/structure/toilet{
 	dir = 8
@@ -7713,9 +8198,7 @@
 /turf/open/floor/iron/freezer,
 /area/mine/living_quarters)
 "UI" = (
-/obj/structure/railing/wooden_fence{
-	dir = 4
-	},
+/obj/structure/flora/ash/stem_shroom,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "UK" = (
@@ -7796,11 +8279,9 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Vd" = (
-/obj/structure/railing/wooden_fence{
-	dir = 9
-	},
+/obj/structure/railing,
 /turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/area/mine/lobby/raptor)
 "Ve" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/textured_large,
@@ -7922,6 +8403,15 @@
 	},
 /turf/open/floor/iron/checker,
 /area/mine/laborcamp)
+"VI" = (
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/structure/table/wood,
+/turf/open/floor/carpet/red,
+/area/mine/lobby/raptor)
 "VJ" = (
 /obj/structure/closet/crate,
 /obj/item/food/mint,
@@ -7945,11 +8435,11 @@
 /turf/open/floor/plating,
 /area/mine/maintenance/labor)
 "VP" = (
-/obj/structure/railing/wooden_fence{
+/obj/effect/turf_decal/siding/wood/end{
 	dir = 8
 	},
-/turf/open/misc/hay/lavaland,
-/area/lavaland/surface)
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "VS" = (
 /obj/machinery/hydroponics/constructable,
 /obj/effect/decal/cleanable/dirt,
@@ -7959,6 +8449,12 @@
 /obj/item/seeds/potato,
 /turf/open/floor/iron/dark,
 /area/mine/laborcamp)
+"VU" = (
+/obj/structure/railing/corner/end{
+	dir = 8
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "VX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -7989,6 +8485,18 @@
 /obj/effect/turf_decal/sand/plating/volcanic,
 /turf/open/floor/plating/lavaland_atmos,
 /area/mine/lounge)
+"Wh" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
+"Wk" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "Wl" = (
 /obj/machinery/door/airlock/external/glass{
 	name = "Mining External Airlock"
@@ -8008,6 +8516,12 @@
 	dir = 1
 	},
 /area/mine/laborcamp/security)
+"Wq" = (
+/obj/structure/railing{
+	dir = 5
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
 "Wt" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/structure/disposalpipe/segment,
@@ -8174,6 +8688,10 @@
 	dir = 4
 	},
 /area/mine/production)
+"Xk" = (
+/obj/effect/spawner/random/lavaland_mob/raptor,
+/turf/open/misc/hay/lavaland,
+/area/lavaland/surface/outdoors)
 "Xp" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8265,7 +8783,7 @@
 /area/mine/laborcamp)
 "XM" = (
 /obj/structure/sign/directions/evac/directional/south{
-	pixel_x = 32;
+	pixel_x = -32;
 	pixel_y = 0
 	},
 /turf/open/floor/iron/dark/textured_large,
@@ -8360,6 +8878,8 @@
 /area/mine/lounge)
 "Yg" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
 /turf/open/floor/iron/dark/textured_large,
 /area/mine/eva)
 "Yk" = (
@@ -8438,6 +8958,14 @@
 /obj/structure/barricade/wooden,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"YP" = (
+/obj/structure/bookcase/random/reference,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
 "YR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -8520,6 +9048,10 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/mine/laborcamp/production)
+"Zs" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "Zt" = (
 /turf/closed/wall,
 /area/mine/laborcamp)
@@ -8559,6 +9091,18 @@
 	dir = 8
 	},
 /area/mine/lounge)
+"ZB" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood,
+/turf/open/floor/wood/large,
+/area/mine/lobby/raptor)
+"ZF" = (
+/obj/effect/turf_decal/sand/plating/volcanic,
+/obj/effect/turf_decal/sand/plating/volcanic,
+/turf/open/floor/plating/lavaland_atmos,
+/area/lavaland/surface/outdoors)
 "ZH" = (
 /obj/structure/closet/secure_closet/labor_camp_security,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -8567,6 +9111,13 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/iron/dark,
 /area/mine/laborcamp/security)
+"ZL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/chair/wood,
+/obj/structure/cable,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "ZM" = (
 /obj/structure/railing{
 	dir = 8
@@ -8597,6 +9148,17 @@
 /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
 /turf/open/floor/plating,
 /area/mine/maintenance/public/north)
+"ZU" = (
+/obj/structure/railing{
+	dir = 6
+	},
+/turf/open/misc/hay/lavaland,
+/area/mine/lobby/raptor)
+"ZX" = (
+/obj/structure/table/wood,
+/obj/item/knife,
+/turf/open/floor/wood/parquet,
+/area/mine/lobby/raptor)
 "ZY" = (
 /turf/closed/mineral/random/volcanic,
 /area/lavaland/surface/outdoors/unexplored)
@@ -41748,8 +42310,8 @@ eA
 eA
 pU
 pU
-aj
-aj
+pU
+pU
 aj
 aj
 aj
@@ -41998,16 +42560,16 @@ MS
 QP
 LE
 os
-SP
+JQ
+Hl
+Hj
+pU
+BP
+pU
+NK
+ze
 pU
-ai
-ai
-ai
 pU
-aj
-aj
-aj
-aj
 aj
 aj
 "}
@@ -42255,16 +42817,16 @@ JZ
 PR
 ib
 os
-SP
+EL
+EL
+EL
 pU
 pU
-ai
-ai
+ze
+BP
+ze
+pU
 pU
-aj
-aj
-aj
-aj
 aj
 aj
 "}
@@ -42515,12 +43077,12 @@ Jt
 Zq
 pU
 pU
-ai
 pU
-aj
-aj
-aj
-aj
+pU
+ze
+ze
+pU
+pU
 aj
 aj
 aj
@@ -42773,11 +43335,11 @@ Zq
 pU
 pU
 aj
-aj
-aj
 pU
-aj
-aj
+pU
+DB
+BP
+DB
 aj
 aj
 aj
@@ -43030,11 +43592,11 @@ pU
 pU
 aj
 aj
-pU
-pU
-aj
 aj
 aj
+LV
+tF
+jb
 aj
 aj
 aj
@@ -43289,9 +43851,9 @@ aj
 aj
 aj
 aj
-aj
-aj
-pU
+zs
+tF
+de
 aj
 aj
 aj
@@ -43546,9 +44108,9 @@ aj
 aj
 aj
 pU
-aj
-pU
-pU
+DB
+BP
+DB
 aj
 aj
 aj
@@ -43803,9 +44365,9 @@ aj
 aj
 aj
 pU
-ad
-ad
-ai
+pU
+pU
+pU
 aj
 aj
 aj
@@ -44059,11 +44621,11 @@ aj
 aj
 aj
 pU
-ai
-ad
-ad
-ai
-aj
+pU
+pU
+BP
+pU
+pU
 aj
 aj
 "}
@@ -44315,14 +44877,14 @@ aj
 aj
 aj
 aj
-pU
-ad
-ad
-ad
-ad
+aj
+aj
+NK
+NK
 pU
 aj
 aj
+aj
 "}
 (140,1,1) = {"
 aa
@@ -44573,13 +45135,13 @@ aj
 aj
 aj
 aj
-ad
-ad
-ad
-ad
+pU
+pU
+ze
 pU
 aj
 aj
+aj
 "}
 (141,1,1) = {"
 aa
@@ -44831,10 +45393,10 @@ aj
 aj
 aj
 pU
-ad
-ad
-ad
-ai
+BP
+ze
+pU
+pU
 aj
 aj
 "}
@@ -45088,11 +45650,11 @@ aj
 aj
 aj
 pU
-ai
-ad
-ad
-ad
-aj
+NK
+pU
+pU
+pU
+pU
 aj
 "}
 (143,1,1) = {"
@@ -45344,10 +45906,10 @@ aj
 aj
 aj
 aj
+aj
+pU
 pU
 pU
-ai
-ai
 pU
 aj
 aj
@@ -45603,9 +46165,9 @@ aj
 aj
 aj
 aj
-pU
-pU
-aj
+DB
+BP
+DB
 aj
 aj
 "}
@@ -45860,9 +46422,9 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
+LV
+tF
+jb
 aj
 aj
 "}
@@ -46116,10 +46678,10 @@ aj
 aj
 aj
 aj
-pU
-aj
-aj
 aj
+zs
+tF
+de
 aj
 aj
 "}
@@ -46372,11 +46934,11 @@ pU
 aj
 aj
 aj
-aj
 pU
-ai
-aj
-aj
+pU
+DB
+BP
+DB
 aj
 aj
 "}
@@ -46628,12 +47190,12 @@ pU
 pU
 aj
 aj
-aj
 pU
-ad
-ad
 pU
-aj
+pU
+pU
+pU
+pU
 aj
 aj
 "}
@@ -46882,16 +47444,16 @@ BP
 BP
 Lw
 pU
-pU
-aj
-aj
-aj
-aj
-ai
-ad
 aj
 aj
 aj
+pU
+pU
+NK
+BP
+ze
+pU
+pU
 aj
 "}
 (150,1,1) = {"
@@ -47139,14 +47701,14 @@ BP
 BP
 Lw
 pU
-pU
-aj
-aj
 aj
 aj
 aj
 pU
-aj
+ze
+ze
+ze
+ze
 aj
 aj
 aj
@@ -47381,7 +47943,7 @@ lb
 Yl
 Le
 Le
-NU
+Fr
 Le
 Le
 BP
@@ -47396,14 +47958,14 @@ BP
 BP
 Lw
 pU
-pU
-aj
-aj
 aj
 aj
 aj
 pU
-aj
+BP
+ze
+NK
+pU
 aj
 aj
 aj
@@ -47637,9 +48199,9 @@ Ra
 oh
 pK
 NU
-pU
-aj
-aj
+BP
+BP
+BP
 JD
 BP
 BP
@@ -47656,11 +48218,11 @@ pU
 pU
 aj
 aj
-aj
-aj
-aj
-aj
-aj
+pU
+NK
+NK
+pU
+pU
 aj
 aj
 aj
@@ -47894,9 +48456,9 @@ Kc
 mT
 pK
 pU
-aj
-aj
-pU
+BP
+ZF
+BP
 JD
 BP
 BP
@@ -47913,12 +48475,12 @@ pU
 pU
 aj
 aj
-aj
-aj
 pU
 pU
-aj
-aj
+pU
+pU
+pU
+pU
 aj
 aj
 "}
@@ -48151,9 +48713,9 @@ Yg
 li
 dK
 pU
-aj
-aj
-pU
+Cv
+BP
+Cv
 zk
 mc
 mc
@@ -48170,14 +48732,14 @@ pU
 pU
 aj
 aj
-aj
 pU
+DB
+BP
+DB
 pU
 aj
 aj
 aj
-aj
-aj
 "}
 (155,1,1) = {"
 aa
@@ -48408,9 +48970,9 @@ Yg
 TQ
 dK
 pU
-aj
-aj
-pU
+aX
+BP
+Jg
 pU
 pU
 pU
@@ -48428,9 +48990,9 @@ pU
 aj
 aj
 aj
-pU
-aj
-aj
+LV
+tF
+jb
 aj
 aj
 aj
@@ -48661,13 +49223,13 @@ lb
 pK
 Ob
 IL
-IL
+Rj
 KV
 pK
 aj
-aj
-aj
-aj
+yV
+BP
+fK
 pU
 pU
 pU
@@ -48685,9 +49247,9 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
+yV
+tF
+NL
 aj
 aj
 aj
@@ -48918,13 +49480,13 @@ NU
 pK
 pK
 dK
-dK
+RO
 pK
 pK
 aj
-aj
-aj
-aj
+yV
+tF
+NL
 aj
 aj
 pU
@@ -48942,9 +49504,9 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
+zs
+tF
+de
 aj
 aj
 aj
@@ -49175,13 +49737,13 @@ NU
 ai
 pU
 pU
+Pn
 pU
 aj
 aj
-aj
-pU
-pU
-aj
+yV
+tF
+NL
 aj
 aj
 aj
@@ -49197,11 +49759,11 @@ aj
 aj
 pU
 pU
-pU
-pU
-pU
-pU
-pU
+aj
+aj
+DB
+BP
+DB
 pU
 pU
 aj
@@ -49432,37 +49994,37 @@ pU
 pU
 pU
 pU
-aj
+AF
 aj
 aj
 pU
-ad
-ad
+yV
+tF
+NL
+aj
+aj
 pU
 aj
 aj
 aj
 aj
+pU
+aj
 aj
 aj
+aj
+pU
+pU
 pU
 pU
 aj
+pU
+pU
+pU
+pU
 aj
 aj
 aj
-GG
-DB
-DB
-hM
-hM
-hM
-hM
-hM
-hM
-hM
-hM
-hM
 "}
 (160,1,1) = {"
 aa
@@ -49689,16 +50251,16 @@ pU
 aj
 aj
 aj
+AF
 aj
-aj
-pU
-pU
-pU
 pU
 aj
+yV
+tF
+NL
 aj
 pU
-aj
+pU
 aj
 aj
 aj
@@ -49708,18 +50270,18 @@ aj
 aj
 aj
 pU
-jX
 pU
 pU
-NK
-sQ
-NS
-zs
-NS
-NS
-sQ
-NS
-hM
+pU
+ze
+ze
+ze
+pU
+pU
+pU
+aj
+aj
+aj
 "}
 (161,1,1) = {"
 aa
@@ -49946,37 +50508,37 @@ aj
 aj
 aj
 aj
+AF
 aj
 aj
 aj
-pU
-aj
-aj
-aj
-aj
+zs
+tF
+de
 aj
 aj
 aj
 aj
 aj
+pU
 aj
 aj
 aj
 aj
 aj
 pU
-jX
 pU
 pU
+ze
 NK
-il
-NS
-zs
-NS
-NS
-il
-NS
-hM
+ze
+BP
+pU
+pU
+pU
+aj
+aj
+pU
 "}
 (162,1,1) = {"
 aa
@@ -50203,13 +50765,13 @@ aj
 aj
 aj
 aj
+AF
 aj
 aj
 aj
-aj
-aj
-aj
-aj
+ct
+BP
+ct
 pU
 aj
 aj
@@ -50220,20 +50782,20 @@ aj
 aj
 aj
 aj
-aj
 pU
-jX
 pU
 pU
+ze
+BP
 NK
-NS
-NS
-zs
-NS
-NS
-NS
-NS
-hM
+ze
+pU
+pU
+pU
+aj
+aj
+pU
+pU
 "}
 (163,1,1) = {"
 aa
@@ -50460,37 +51022,37 @@ ai
 ai
 pU
 pU
-pU
-pU
-aj
+AF
 aj
 aj
 aj
+BP
+BP
+BP
 pU
 pU
 aj
 aj
-aj
-aj
-aj
-aj
+pU
+pU
+pU
 pU
 aj
 pU
 pU
 pU
-jX
+ze
+ze
+NK
+ze
+lP
+pU
+pU
+pU
+aj
+aj
 pU
 pU
-Cv
-qi
-NS
-ct
-NS
-NS
-qi
-qi
-hM
 "}
 (164,1,1) = {"
 aa
@@ -50717,37 +51279,37 @@ ai
 ai
 ai
 ai
+Pn
+AF
+AF
+AF
+Pe
+BP
+BP
+BP
+BP
 pU
 pU
 pU
 pU
-aj
-aj
 pU
-aj
-aj
-aj
-pU
-aj
-aj
-aj
 pU
 pU
+lt
+Ri
+eN
 pU
+ze
+ze
+ze
+ze
 pU
 pU
+aj
+aj
+aj
 pU
-ze
 pU
-NS
-NS
-NS
-NS
-NS
-uw
-NS
-NS
-hM
 "}
 (165,1,1) = {"
 aa
@@ -50978,33 +51540,33 @@ ai
 pU
 pU
 pU
+AF
+BP
+BP
+BP
+BP
+ct
+pU
 pU
-aj
-aj
-aj
-aj
 pU
 pU
-aj
-aj
 pU
+lt
+Ns
+lt
 pU
 pU
 pU
 pU
+ze
 pU
 pU
+aj
+aj
+aj
+aj
 pU
 pU
-NS
-mk
-sa
-NS
-NS
-NS
-OW
-sa
-hM
 "}
 (166,1,1) = {"
 aa
@@ -51232,36 +51794,36 @@ aj
 aj
 ai
 ai
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-pU
+CV
+CV
+ki
+NP
+ki
+CV
+CV
+CV
+lt
 pU
 pU
 pU
 pU
 pU
 pU
+lt
 pU
+lP
 pU
+BP
 pU
 pU
 pU
+aj
+aj
+aj
+aj
+aj
+aj
 pU
-NS
-NS
-uw
-NS
-NS
-NS
-NS
-NS
-hM
 "}
 (167,1,1) = {"
 aa
@@ -51488,14 +52050,19 @@ aj
 aj
 aj
 aj
-aj
-pU
-pU
-pU
-pU
+CV
+CV
+Km
+qB
+eL
+Ah
+VI
+ZX
+ki
+Ns
+lt
 pU
-aj
-aj
+BP
 pU
 pU
 pU
@@ -51506,19 +52073,14 @@ pU
 pU
 pU
 pU
+aj
+aj
+aj
 pU
-jX
 pU
+aj
+aj
 pU
-Vd
-VP
-NS
-Tt
-NS
-NS
-VP
-VP
-hM
 "}
 (168,1,1) = {"
 aa
@@ -51745,37 +52307,37 @@ aj
 aj
 aj
 aj
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-aj
-pU
-pU
-pU
-pU
+CV
+GG
+jX
+Tw
+eL
+aF
+pF
+dF
+ki
+lt
+lt
+lt
 pU
 pU
 pU
+BP
+NK
+NK
+ze
 pU
 pU
 pU
+aj
+aj
+aj
 pU
-jX
 pU
 pU
-NK
-NS
-NS
-zs
-NS
-NS
-NS
-NS
-hM
+aj
+aj
+aj
 "}
 (169,1,1) = {"
 aa
@@ -52002,37 +52564,37 @@ ai
 pU
 aj
 aj
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+Sp
+OE
+as
+ZL
+Cn
+zX
+CV
+CV
 pU
+lt
 pU
 pU
 pU
 pU
+ze
+NK
+ze
+BP
 pU
 pU
 pU
-jX
+aj
+aj
+aj
 pU
 pU
-NK
-il
-NS
-zs
-NS
-NS
-il
-NS
-hM
+aj
+aj
+aj
+aj
 "}
 (170,1,1) = {"
 aa
@@ -52259,37 +52821,37 @@ ai
 ai
 ai
 pU
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+GG
+Tt
+fa
+eL
+ZB
+GG
+CV
 pU
 pU
 pU
+lP
 pU
+BP
 pU
+ze
+NK
 pU
+UI
 pU
 pU
-jX
 pU
 pU
-NK
-sQ
-NS
-zs
-NS
-NS
-sQ
-NS
-hM
+aj
+aj
+aj
+aj
+aj
+aj
+aj
+aj
 "}
 (171,1,1) = {"
 aa
@@ -52516,37 +53078,37 @@ aj
 ai
 ai
 ai
-ai
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+wa
+rB
+fa
+eL
+Lv
+CV
+CV
+CV
+ct
 pU
 pU
 pU
 pU
 pU
+ze
 pU
 pU
+lt
+lt
+lt
+UI
 pU
+aj
 pU
 pU
+aj
 pU
 pU
-lt
-UI
-UI
-hM
-hM
-hM
-hM
-hM
-hM
-hM
-hM
-hM
+aj
+aj
 "}
 (172,1,1) = {"
 aa
@@ -52773,22 +53335,28 @@ aj
 aj
 pU
 ai
-ai
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+jt
+ba
+fa
+jJ
+ZB
+be
+dI
+oO
+BP
 pU
+BP
 pU
 pU
 pU
+ct
+BP
+lt
+lt
+Ns
+lt
+lt
 pU
 pU
 pU
@@ -52798,12 +53366,6 @@ pU
 pU
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
 "}
 (173,1,1) = {"
 aa
@@ -53030,36 +53592,36 @@ aj
 aj
 aj
 aj
+CV
+GG
+tf
+fa
+Sj
+ZB
+CV
+CV
+CV
+ct
 pU
 pU
 pU
 pU
 pU
+BP
+Av
+Wh
+Wh
+CV
+ki
+ki
+CV
+CV
+ki
+ki
+CV
+CV
 pU
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-pU
-aj
-pU
-aj
 aj
 "}
 (174,1,1) = {"
@@ -53287,37 +53849,37 @@ aj
 aj
 aj
 aj
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+rf
+VP
+fa
+Sj
+ZB
+Mf
+CV
+hl
 pU
+lt
+lt
 pU
 pU
+lt
+lt
+up
+lt
 pU
+vr
+sQ
+NS
+Vd
+NS
+NS
+sQ
+NS
+CV
 pU
 pU
 aj
-aj
-aj
-aj
-aj
-aj
-aj
 "}
 (175,1,1) = {"
 aa
@@ -53544,37 +54106,37 @@ aj
 aj
 aj
 aj
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+GI
+vM
+FI
+jJ
+Fo
+hM
+CV
+CV
+Ns
+lt
 pU
 pU
+lt
+lt
+lt
+up
 pU
-aj
-aj
 pU
+vr
+il
+NS
+Vd
+NS
+NS
+il
+NS
+ki
 pU
 aj
 aj
-aj
 "}
 (176,1,1) = {"
 aa
@@ -53801,37 +54363,37 @@ aj
 aj
 aj
 aj
-aj
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
+CV
+pM
+YP
+GG
+Uz
+Uz
+Uz
+Zs
+ki
+lt
+lt
 pU
 pU
 pU
+lt
 pU
+Wk
+UI
+ct
+vr
+NS
+NS
+Vd
+NS
+NS
+NS
+NS
+ki
 pU
-aj
-aj
-aj
 pU
 aj
-aj
-aj
-aj
-aj
-aj
 "}
 (177,1,1) = {"
 aa
@@ -54056,38 +54618,38 @@ pU
 pU
 pU
 pU
+aj
+aj
+CV
+CV
+YP
+GG
+fa
+fa
+Rm
+bE
+ki
+lt
 pU
 pU
 pU
 pU
 pU
 pU
+Wk
 pU
+lt
+Wq
+EP
+NS
+ZU
+NS
+NS
+EP
+EP
+CV
+CV
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
 aj
 "}
 (178,1,1) = {"
@@ -54314,37 +54876,37 @@ pU
 pU
 pU
 pU
+aj
+aj
+CV
+CV
+ki
+ki
+ki
+CV
+CV
+CV
+lt
 pU
 pU
+lt
 pU
 pU
 pU
+VU
+Xk
+lt
+NS
+NS
+NS
+NS
+NS
+uw
+NS
+NS
+NS
+ki
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
 aj
 "}
 (179,1,1) = {"
@@ -54572,6 +55134,9 @@ pU
 pU
 pU
 pU
+aj
+aj
+aj
 pU
 pU
 pU
@@ -54581,26 +55146,23 @@ pU
 pU
 pU
 pU
+Ns
+Az
 pU
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-pU
-aj
+lt
+lt
+lt
+NS
+mk
+sa
+NS
+NS
+NS
+OW
+sa
+NS
+ki
 aj
 aj
 "}
@@ -54841,23 +55403,23 @@ pU
 pU
 pU
 pU
+lt
+lt
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+xW
+lt
+lt
+lt
+NS
+NS
+uw
+NS
+NS
+NS
+NS
+NS
+NS
+ki
 pU
 aj
 "}
@@ -55099,22 +55661,22 @@ pU
 pU
 pU
 pU
+lt
 pU
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-pU
-pU
-pU
-aj
-aj
+Wk
+lt
+lt
+kf
+KO
+NS
+aH
+NS
+NS
+KO
+KO
+CV
+CV
 pU
 aj
 "}
@@ -55359,19 +55921,19 @@ pU
 pU
 pU
 pU
+Wk
 pU
+ct
+vr
+NS
+rj
+Vd
+NS
+NS
+NS
+NS
+ki
 pU
-pU
-pU
-pU
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-aj
 aj
 aj
 "}
@@ -55614,23 +56176,23 @@ pU
 pU
 pU
 pU
+lt
+lt
+Wk
 pU
 pU
+vr
+il
+NS
+Vd
+NS
+NS
+il
+NS
+ki
 pU
 pU
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-pU
 "}
 (184,1,1) = {"
 aa
@@ -55870,24 +56432,24 @@ pU
 pU
 pU
 pU
+lt
+Ns
+lt
+up
+Pb
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
+vr
+sQ
+NS
+Vd
+NS
+NS
+sQ
+NS
+CV
 pU
 pU
 aj
-aj
 "}
 (185,1,1) = {"
 aa
@@ -56127,22 +56689,22 @@ pU
 pU
 pU
 pU
+lt
+lt
+BP
+Oo
+ej
+nO
+CV
+ki
+ki
+CV
+CV
+ki
+ki
+CV
+CV
 pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-pU
-aj
-aj
 aj
 aj
 "}
@@ -56386,6 +56948,12 @@ pU
 pU
 pU
 pU
+ct
+BP
+pU
+pU
+pU
+lt
 pU
 pU
 pU
@@ -56395,12 +56963,6 @@ pU
 pU
 pU
 pU
-aj
-aj
-aj
-aj
-aj
-aj
 aj
 "}
 (187,1,1) = {"
@@ -56644,8 +57206,13 @@ pU
 pU
 pU
 pU
+lt
 pU
 pU
+lt
+Ns
+lt
+lt
 pU
 pU
 pU
@@ -56654,11 +57221,6 @@ pU
 pU
 aj
 aj
-aj
-aj
-aj
-aj
-aj
 "}
 (188,1,1) = {"
 aa
@@ -56884,12 +57446,6 @@ ZY
 pU
 pU
 pU
-yc
-pU
-pU
-pU
-pU
-pU
 pU
 pU
 pU
@@ -56906,7 +57462,15 @@ pU
 pU
 pU
 pU
+lt
+lt
+lt
 pU
+lt
+lt
+lt
+lt
+lt
 pU
 pU
 aj
@@ -56914,8 +57478,6 @@ aj
 aj
 aj
 aj
-aj
-aj
 "}
 (189,1,1) = {"
 aa
@@ -57137,268 +57699,266 @@ ZY
 ZY
 ZY
 ZY
-ZY
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-"}
-(190,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-HX
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-pU
-aj
-pU
-aj
-aj
-pU
-pU
-pU
-pU
-pU
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-fQ
-ZY
-ZY
-ZY
-ZY
-ZY
+ZY
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+Ns
+pU
+pU
+UI
+lt
+lt
+Ns
+lt
+pU
+aj
+aj
+aj
+aj
+aj
+aj
+"}
+(190,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+HX
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+pU
+aj
+pU
+aj
+aj
+pU
 pU
 pU
 pU
 pU
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+fQ
+ZY
+ZY
+ZY
+ZY
+ZY
+pU
+pU
 pU
 pU
 pU
@@ -57422,6 +57982,8 @@ pU
 pU
 pU
 pU
+lt
+lt
 pU
 aj
 aj
@@ -58430,7 +58992,7 @@ pU
 pU
 pU
 pU
-pU
+yc
 pU
 pU
 pU
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 081edcaf67701..b4168c7d54d93 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -838,7 +838,7 @@
 	id = "captain_privacy";
 	name = "Privacy Shutters"
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/structure/table/wood,
 /obj/item/book/manual/wiki/security_space_law,
 /obj/item/hand_tele,
@@ -1564,6 +1564,26 @@
 /obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/wood/large,
 /area/station/service/library/artgallery)
+"atP" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance-aft"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig Aft Entrance"
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "briglockdown";
+	name = "Brig Lockdown"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
 "atT" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/flora/bush/flowers_br/style_random,
@@ -10201,17 +10221,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/side,
 /area/station/hallway/floor1/fore)
-"cBl" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig Fore Entrance"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint)
 "cBq" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck,
@@ -13509,6 +13518,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/aft)
+"dvB" = (
+/obj/machinery/light/directional/east,
+/obj/machinery/smartfridge/drying,
+/turf/open/floor/iron/kitchen,
+/area/station/service/kitchen)
 "dvC" = (
 /obj/machinery/door/airlock/public/glass{
 	name = "Garden"
@@ -14978,6 +14992,18 @@
 "dPH" = (
 /turf/closed/wall/r_wall,
 /area/station/security/brig)
+"dPS" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig Fore Entrance"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint)
 "dPT" = (
 /obj/machinery/light/small/red/directional/east,
 /obj/effect/spawner/random/trash/mess,
@@ -18330,6 +18356,18 @@
 /obj/machinery/duct,
 /turf/open/floor/iron/dark,
 /area/station/hallway/floor3/fore)
+"eJy" = (
+/obj/effect/turf_decal/weather/dirt{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/dark_blue,
+/obj/effect/turf_decal/weather/dirt{
+	dir = 1
+	},
+/turf/open/floor/iron/dark/side{
+	dir = 8
+	},
+/area/station/security/prison/garden)
 "eJF" = (
 /obj/machinery/airalarm/directional/south,
 /obj/item/kirbyplants/random,
@@ -20870,6 +20908,24 @@
 	name = "boxing ring"
 	},
 /area/station/commons/fitness)
+"fvA" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig-entrance-aft"
+	},
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "outerbrig";
+	name = "Brig Aft Entrance"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+	id = "briglockdown";
+	name = "Brig Lockdown"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/brig)
 "fvD" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -29585,7 +29641,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/item/kirbyplants/random,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/hop)
@@ -29778,23 +29834,6 @@
 	dir = 1
 	},
 /area/station/hallway/floor4/fore)
-"hLN" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance-aft"
-	},
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig Aft Entrance"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
-	id = "briglockdown";
-	name = "Brig Lockdown"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
 "hLP" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -30216,7 +30255,7 @@
 	name = "Privacy Shutters Control";
 	pixel_y = 6
 	},
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_y = -8
 	},
 /turf/open/floor/wood,
@@ -35046,25 +35085,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningdock)
-"jfr" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig-entrance-aft"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	id_tag = "outerbrig";
-	name = "Brig Aft Entrance"
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "briglockdown";
-	name = "Brig Lockdown"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
 "jfs" = (
 /obj/docking_port/stationary/laborcamp_home/kilo{
 	dir = 2
@@ -42269,7 +42289,7 @@
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "kWD" = (
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = -22
 	},
 /obj/effect/turf_decal/tile/blue/fourcorners,
@@ -45069,7 +45089,7 @@
 /obj/effect/turf_decal/tile/neutral/opposingcorners{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/east{
+/obj/machinery/keycard_auth/wall_mounted/directional/east{
 	pixel_x = 25;
 	pixel_y = 16
 	},
@@ -53936,6 +53956,21 @@
 /obj/machinery/light/floor,
 /turf/open/floor/iron/dark,
 /area/station/hallway/floor4/aft)
+"nQY" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig Fore Entrance"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron/dark,
+/area/station/security/checkpoint)
 "nQZ" = (
 /obj/effect/turf_decal/trimline/yellow/corner,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -54084,7 +54119,9 @@
 /area/station/maintenance/floor1/starboard)
 "nSz" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sink/kitchen/directional/south,
+/obj/effect/turf_decal/weather/dirt{
+	dir = 8
+	},
 /turf/open/floor/iron/dark/side{
 	dir = 5
 	},
@@ -55310,20 +55347,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/service/library/lounge)
-"ojB" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig Fore Entrance"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/effect/mapping_helpers/airlock/access/all/security/general,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint)
 "ojM" = (
 /obj/structure/chair/comfy{
 	dir = 4
@@ -58519,11 +58542,6 @@
 	dir = 4
 	},
 /area/station/science/robotics/lab)
-"pbr" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/deepfryer,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
 "pbt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -59387,6 +59405,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor1/starboard/aft)
+"ppf" = (
+/obj/effect/turf_decal/weather/sand/light,
+/turf/closed/wall/r_wall,
+/area/station/security/execution/education)
 "ppi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
@@ -63314,7 +63336,7 @@
 /obj/structure/chair/wood{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "qoJ" = (
@@ -64259,15 +64281,9 @@
 /turf/open/floor/iron/dark,
 /area/station/command/teleporter)
 "qzQ" = (
-/obj/effect/turf_decal/weather/dirt{
-	dir = 8
-	},
-/obj/item/reagent_containers/cup/watering_can,
-/obj/effect/turf_decal/tile/dark_blue,
 /obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron/dark/side{
-	dir = 9
-	},
+/obj/structure/water_source/puddle,
+/turf/open/misc/dirt/jungle,
 /area/station/security/prison/garden)
 "qzX" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -64973,7 +64989,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_x = 6
 	},
 /obj/effect/landmark/start/chief_engineer,
@@ -68260,6 +68276,7 @@
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/item/reagent_containers/cup/watering_can,
 /turf/open/floor/iron/dark/corner{
 	dir = 4
 	},
@@ -75262,7 +75279,7 @@
 /obj/machinery/computer/security/qm{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /turf/open/floor/wood/large,
 /area/station/command/heads_quarters/qm)
 "tun" = (
@@ -91844,7 +91861,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/cargo/sorting)
 "xEv" = (
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = 9
 	},
 /obj/machinery/button/door/directional/north{
@@ -251970,7 +251987,7 @@ vhd
 fAz
 gyr
 gyr
-pbr
+dvB
 sFt
 sxt
 sal
@@ -318006,7 +318023,7 @@ gYS
 gir
 tnj
 tEv
-cBl
+dPS
 xFp
 dGF
 kHR
@@ -318263,7 +318280,7 @@ aBV
 kyj
 dfm
 xnY
-ojB
+nQY
 xyw
 xyw
 tnR
@@ -322375,7 +322392,7 @@ txa
 mlH
 vOE
 nYZ
-jfr
+atP
 hxz
 vES
 uyX
@@ -322889,7 +322906,7 @@ cmM
 bVy
 tnV
 daD
-hLN
+fvA
 kkK
 fDA
 emk
@@ -329833,7 +329850,7 @@ oyh
 oyh
 oyh
 fkA
-fkA
+ppf
 wmD
 fkA
 kUZ
@@ -331377,7 +331394,7 @@ oyh
 wMF
 wMF
 qzQ
-pfL
+eJy
 pfL
 pfL
 yfr
diff --git a/_maps/map_files/debug/gateway_test.dmm b/_maps/map_files/debug/gateway_test.dmm
index d3cc2563d47e5..d136530a07bdf 100644
--- a/_maps/map_files/debug/gateway_test.dmm
+++ b/_maps/map_files/debug/gateway_test.dmm
@@ -215,10 +215,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_y = 7
 	},
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_y = -7
 	},
 /turf/open/indestructible,
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 1b1fdf387396f..6c38b33783521 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -61,63 +61,32 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"at" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
 "av" = (
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
 "aw" = (
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
-"aA" = (
-/turf/open/floor/iron,
-/area/station/engineering/main)
-"aB" = (
+"ax" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"aC" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external/glass/ruin,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/engineering/main)
-"aD" = (
-/turf/open/floor/iron,
-/area/station/security/brig)
-"aE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 6
+"ay" = (
+/obj/effect/turf_decal/plaque{
+	icon_state = "L7"
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/engineering/main)
-"aF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
+/area/station/commons/storage/primary)
+"aA" = (
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"aG" = (
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/closet/radiation,
-/obj/structure/cable,
+"aD" = (
 /turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
+/area/station/security/brig)
 "aH" = (
 /obj/machinery/light/directional/east,
 /obj/machinery/recharge_station,
@@ -150,12 +119,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
-"aP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
 "aS" = (
 /obj/structure/table,
 /obj/item/flashlight{
@@ -165,36 +128,6 @@
 /obj/item/stock_parts/power_store/cell/infinite,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"aT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/main)
-"aU" = (
-/obj/machinery/door/airlock/engineering/glass{
-	name = "Gravity Generator"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
-"aV" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
 "aX" = (
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Gravity Generator"
@@ -208,10 +141,6 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
-"ba" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
 "bb" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 4
@@ -235,11 +164,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"be" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/main)
 "bf" = (
 /obj/machinery/suit_storage_unit/captain,
 /turf/open/floor/iron,
@@ -258,19 +182,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"bk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/door/airlock,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
-"bl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
 "bm" = (
 /obj/machinery/atmospherics/components/binary/valve/on{
 	dir = 4
@@ -305,11 +216,6 @@
 /obj/machinery/announcement_system,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"bt" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/science)
 "bu" = (
 /turf/closed/wall/r_wall,
 /area/station/command/bridge)
@@ -321,12 +227,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/security/brig)
-"bx" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/engineering/main)
 "by" = (
 /turf/closed/wall/r_wall,
 /area/station/medical/medbay)
@@ -353,10 +253,6 @@
 /obj/machinery/computer/rdconsole,
 /turf/open/floor/iron,
 /area/station/science)
-"bH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "bI" = (
 /obj/structure/table,
 /obj/item/card/emag,
@@ -395,10 +291,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"bN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "bO" = (
 /obj/machinery/door/poddoor,
 /turf/open/floor/engine,
@@ -425,35 +317,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/brig)
-"bV" = (
-/obj/machinery/light/directional/north,
-/mob/living/carbon/human,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
-"bW" = (
-/obj/machinery/camera/directional/north,
-/mob/living/carbon/human,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
-"bX" = (
-/obj/machinery/sleeper/syndie/fullupgrade,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
 "bY" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -489,18 +352,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"ch" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/medical/chemistry)
-"ci" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "cj" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -536,11 +387,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"cq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron,
-/area/station/command/bridge)
 "cr" = (
 /obj/machinery/light/directional/south,
 /obj/structure/closet/secure_closet/hos{
@@ -553,107 +399,6 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
-"cu" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
-"cw" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/command/bridge)
-"cx" = (
-/obj/machinery/door/airlock/public/glass,
-/turf/open/floor/iron,
-/area/station/medical/medbay)
-"cy" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/station/medical/medbay)
-"cz" = (
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/station/medical/medbay)
-"cA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"cB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"cC" = (
-/obj/machinery/camera/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"cD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"cE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/station/medical/chemistry)
-"cF" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/medical/chemistry)
-"cG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/station/medical/medbay)
-"cH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/table,
-/obj/item/gun/magic/wand/resurrection/debug,
-/obj/item/gun/magic/wand/death/debug{
-	pixel_y = 10
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/item/debug/human_spawner{
-	pixel_x = 6;
-	pixel_y = -4
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
 "cI" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
@@ -668,62 +413,16 @@
 	},
 /turf/open/floor/iron/cafeteria,
 /area/station/medical/medbay)
-"cK" = (
-/obj/machinery/light/directional/south,
-/obj/structure/table/glass,
-/obj/item/disk/surgery/debug,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 6;
-	pixel_y = 1
-	},
-/obj/item/storage/box/monkeycubes{
-	pixel_x = -6;
-	pixel_y = 2
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/item/disk/data/debug{
-	pixel_y = 9;
-	pixel_x = 7
-	},
-/turf/open/floor/iron/white/corner,
-/area/station/medical/medbay)
-"cL" = (
-/obj/item/surgery_tray/full/advanced,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/iron/white/corner,
-/area/station/medical/medbay)
 "cN" = (
 /turf/closed/wall/r_wall,
 /area/station/construction)
-"cP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/station/construction)
 "cS" = (
 /turf/closed/wall/r_wall,
 /area/station/commons/storage/primary)
-"cT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/medical/chemistry)
 "cV" = (
 /obj/machinery/door/airlock/public/glass,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"cX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/construction)
 "cY" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
@@ -734,10 +433,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/construction)
-"da" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/station/commons/storage/primary)
 "db" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/station/hallway/secondary/entry)
@@ -766,14 +461,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
-"dk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 10
-	},
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "dl" = (
 /turf/open/floor/plating,
 /area/station/commons/storage/primary)
@@ -856,13 +543,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/construction)
-"dA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "dB" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
@@ -884,20 +564,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"dF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "dG" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"dH" = (
-/obj/machinery/door/airlock,
-/turf/open/floor/plating,
-/area/station/maintenance/department/bridge)
 "dI" = (
 /obj/effect/landmark/start,
 /turf/open/floor/iron,
@@ -923,18 +593,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/construction)
-"dN" = (
-/obj/machinery/vending/subtype_vendor,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"dO" = (
-/obj/structure/table,
-/obj/machinery/light/directional/south,
-/obj/item/storage/medkit/regular,
-/obj/item/healthanalyzer/advanced,
-/obj/item/debug/omnitool/item_spawner,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "dP" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -960,16 +618,6 @@
 /obj/machinery/camera/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
-"dU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/camera/directional/north,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "dV" = (
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
@@ -1022,30 +670,13 @@
 /obj/machinery/door/airlock,
 /turf/open/floor/iron,
 /area/station/construction)
-"eg" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "eh" = (
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"ei" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "ej" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"ek" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "el" = (
 /obj/structure/fans/tiny/invisible,
 /turf/open/floor/engine,
@@ -1057,13 +688,18 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
-"ep" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 8
+"er" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
 	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/obj/structure/closet/secure_closet/medical3{
+	locked = 0
+	},
+/obj/item/healthanalyzer/advanced,
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
 "es" = (
 /obj/machinery/dna_scannernew,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -1081,11 +717,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"ew" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/vacuum,
-/turf/open/floor/plating,
-/area/station/cargo/storage)
 "ex" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Escape Pod One"
@@ -1093,17 +724,6 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
-"ez" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "eA" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -1111,6 +731,14 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"eB" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/stripes/full,
+/turf/open/floor/iron,
+/area/station/engineering/main)
 "eC" = (
 /obj/machinery/conveyor{
 	dir = 8;
@@ -1135,14 +763,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"eH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "eJ" = (
 /obj/docking_port/stationary{
 	dir = 4;
@@ -1154,10 +774,6 @@
 	},
 /turf/open/space/basic,
 /area/space)
-"eL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "eN" = (
 /obj/machinery/conveyor{
 	dir = 9;
@@ -1177,36 +793,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"eR" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/machinery/door/airlock/external/ruin{
-	name = "Supply Dock Airlock"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"eS" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external/ruin{
-	name = "Supply Dock Airlock"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
 "eT" = (
 /obj/machinery/conveyor{
 	dir = 5;
@@ -1235,19 +821,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/cargo/storage)
-"eZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"fa" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
 "fb" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Departure Lounge Airlock"
@@ -1267,23 +840,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/cargo/storage)
-"fe" = (
-/obj/machinery/computer/cargo{
-	dir = 8
-	},
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/east{
-	id = "cargounload";
-	name = "Loading Doors";
-	pixel_y = 8
-	},
-/obj/machinery/button/door/directional/east{
-	id = "cargoload";
-	name = "Loading Doors";
-	pixel_y = -8
-	},
-/turf/open/floor/iron,
-/area/station/cargo/storage)
 "ff" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -1365,125 +921,21 @@
 /obj/structure/fans/tiny,
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
-"ft" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/hallway/primary/central)
-"fw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fx" = (
-/obj/effect/turf_decal/plaque{
-	icon_state = "L1"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fy" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/plaque{
-	icon_state = "L3"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fz" = (
-/obj/effect/turf_decal/plaque{
-	icon_state = "L5"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fA" = (
-/obj/effect/turf_decal/plaque{
-	icon_state = "L7"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "fB" = (
 /obj/machinery/status_display/supply,
 /turf/closed/wall/r_wall,
 /area/station/cargo/storage)
-"fC" = (
-/obj/effect/turf_decal/plaque{
-	icon_state = "L9"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fD" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/camera/directional/north,
-/obj/effect/turf_decal/plaque{
-	icon_state = "L11"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fE" = (
-/obj/effect/turf_decal/plaque{
-	icon_state = "L13"
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"fF" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/caution/stand_clear,
-/obj/structure/fans/tiny,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"fH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
 "fI" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
-"fK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 5
+"fL" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
 	},
-/obj/structure/cable,
+/obj/item/storage/part_replacer/bluespace/tier4,
 /turf/open/floor/iron,
-/area/station/commons/storage/primary)
+/area/station/cargo/bitrunning/den)
 "fM" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
@@ -1500,20 +952,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"fN" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/commons/storage/primary)
 "fO" = (
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "fP" = (
 /obj/machinery/light/directional/north,
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "fQ" = (
@@ -1523,24 +967,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"fR" = (
-/obj/machinery/door/airlock,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/commons/storage/primary)
 "fS" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"fW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 6
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
 "fX" = (
 /obj/structure/sign/directions/supply{
 	dir = 4;
@@ -1562,21 +993,9 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"fZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "ga" = (
 /turf/closed/wall/r_wall,
 /area/station/hallway/secondary/exit/departure_lounge)
-"gb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
 "gc" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Auxiliary Airlock"
@@ -1608,75 +1027,24 @@
 	},
 /turf/open/floor/plating,
 /area/station/commons/storage/primary)
-"gk" = (
+"gi" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/debug/omnitool,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"gk" = (
 /obj/structure/sign/departments/evac,
 /turf/closed/wall/r_wall,
 /area/station/hallway/secondary/exit/departure_lounge)
-"gl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
-"gm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 10
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
 "gn" = (
 /obj/machinery/camera/directional/north,
 /turf/open/floor/iron,
 /area/station/security/brig)
-"go" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
-"gp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/station/cargo/miningoffice)
-"gq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"gr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 5
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"gu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "gv" = (
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"gw" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"gx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
 "gy" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1687,30 +1055,9 @@
 "gz" = (
 /obj/structure/table,
 /obj/item/card/id/advanced/gold/captains_spare,
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"gB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"gC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"gD" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
 "gE" = (
 /obj/machinery/camera/directional/north,
 /turf/open/floor/iron,
@@ -1726,6 +1073,10 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/station/construction)
+"gH" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor,
+/area/station/cargo/storage)
 "gI" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/camera/directional/north,
@@ -1742,25 +1093,23 @@
 /obj/structure/sign/warning/radiation/rad_area/directional/north,
 /turf/open/floor/plating,
 /area/station/engineering/gravity_generator)
-"gY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/science)
 "hm" = (
 /obj/machinery/airalarm/directional/west,
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
-"hv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
+"hp" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
 	},
-/obj/item/storage/part_replacer/bluespace/tier4,
 /turf/open/floor/iron,
-/area/station/cargo/bitrunning/den)
+/area/station/hallway/primary/central)
+"hr" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
 "hD" = (
 /obj/structure/closet/secure_closet/chemical/heisenberg{
 	locked = 0
@@ -1774,32 +1123,69 @@
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
 /area/station/construction)
-"is" = (
-/obj/structure/sign/warning/vacuum/external/directional/east,
-/obj/machinery/vending/subtype_vendor,
-/turf/open/floor/iron,
-/area/station/medical/medbay)
-"jb" = (
+"io" = (
 /obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/command/bridge)
+"jg" = (
+/obj/effect/turf_decal/plaque{
+	icon_state = "L1"
+	},
 /obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/science)
-"jE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+/area/station/commons/storage/primary)
+"jk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"jz" = (
+/obj/structure/table/glass,
+/obj/item/disk/surgery/debug,
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 6;
+	pixel_y = 1
+	},
+/obj/item/storage/box/monkeycubes{
+	pixel_x = -6;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
+/obj/item/disk/data/debug{
+	pixel_y = 9;
+	pixel_x = 7
+	},
+/turf/open/floor/iron/white/corner,
+/area/station/medical/medbay)
+"jL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "jU" = (
 /obj/structure/table,
 /obj/item/melee/energy/axe,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"kj" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable,
+"jZ" = (
+/obj/machinery/sleeper/syndie/fullupgrade,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/camera/directional/north,
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
+"kf" = (
+/obj/machinery/vending/subtype_vendor,
 /turf/open/floor/iron,
-/area/station/cargo/miningoffice)
+/area/station/commons/storage/primary)
 "kn" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
@@ -1808,129 +1194,191 @@
 /obj/structure/server,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
-"kQ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+"kS" = (
+/turf/closed/wall/r_wall,
+/area/station/medical/chemistry)
 "lc" = (
 /turf/open/floor/engine,
 /area/station/hallway/secondary/entry)
-"lg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/main)
-"lH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 6
-	},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
-"lX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+"lu" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"mi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/machinery/light/directional/north,
+"mb" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"mE" = (
+/area/station/medical/chemistry)
+"mk" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/chem_mass_spec,
 /turf/open/floor/iron,
-/area/station/medical/chemistry)
-"nn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/area/station/engineering/main)
+"mC" = (
+/turf/open/floor/iron/dark,
+/area/station/medical/medbay)
+"nb" = (
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/engineering/gravity_generator)
+"ng" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/cargo/storage)
 "nq" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"ny" = (
+"nT" = (
 /obj/structure/table,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/debug/omnitool,
+/obj/machinery/light/directional/south,
+/obj/item/storage/medkit/regular,
+/obj/item/healthanalyzer/advanced,
+/obj/item/debug/omnitool/item_spawner,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
-"nI" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/cargo/bitrunning/den)
 "od" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
 /turf/open/floor/plating,
 /area/station/hallway/secondary/entry)
-"oV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+"os" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock/research,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
+"ou" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/medical/chemistry)
+/area/station/construction)
+"oK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/engineering/main)
+"pe" = (
+/obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
+"pr" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
 "pv" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"pA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/station/science)
-"pI" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+"pw" = (
+/obj/effect/turf_decal/plaque{
+	icon_state = "L9"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"pL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/caution/stand_clear{
 	dir = 8
 	},
-/obj/machinery/door/airlock/external/glass/ruin,
-/turf/open/floor/plating,
-/area/station/medical/medbay)
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"pZ" = (
+/obj/machinery/light/directional/north,
+/obj/machinery/camera/directional/north,
+/obj/effect/turf_decal/plaque{
+	icon_state = "L11"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "qb" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"qg" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/turf_decal/stripes/full,
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
+"qv" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"qw" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "qx" = (
 /obj/machinery/airalarm/directional/west,
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"qH" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
 "qQ" = (
 /turf/open/floor/engine,
 /area/station/cargo/miningoffice)
-"rn" = (
+"rh" = (
+/obj/machinery/door/airlock,
 /obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/science)
+"ru" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"rC" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/plaque{
+	icon_state = "L3"
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "rK" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
-"rL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
 "rT" = (
 /turf/open/floor/circuit/green,
 /area/station/cargo/bitrunning/den)
@@ -1938,6 +1386,29 @@
 /obj/machinery/door/airlock/shell,
 /turf/open/floor/iron/dark,
 /area/station/construction)
+"sN" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"sT" = (
+/obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/main)
+"tn" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
+"tz" = (
+/obj/machinery/status_display/supply,
+/turf/closed/wall/r_wall,
+/area/station/commons/storage/primary)
 "tE" = (
 /obj/machinery/door/airlock/research,
 /turf/open/floor/iron/dark,
@@ -1949,6 +1420,13 @@
 	},
 /turf/open/space/basic,
 /area/space)
+"tQ" = (
+/obj/machinery/door/airlock/public/glass,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
 "tV" = (
 /obj/structure/bot,
 /turf/open/floor/iron/dark,
@@ -1974,6 +1452,11 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"uL" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/bitrunning/den)
 "uO" = (
 /obj/machinery/door/airlock/public/glass,
 /obj/structure/cable,
@@ -1995,11 +1478,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
-"vb" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/iron,
-/area/station/cargo/bitrunning/den)
 "vm" = (
 /mob/living/circuit_drone,
 /turf/open/floor/iron/dark,
@@ -2014,43 +1492,127 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
-"vP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+"vB" = (
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/machinery/door/airlock/public/glass,
-/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/corner,
+/area/station/medical/medbay)
+"vQ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
-/area/station/medical/chemistry)
-"wb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+/area/station/cargo/storage)
+"vS" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/airlock_pump{
 	dir = 4
 	},
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
+/turf/open/floor/iron,
+/area/station/engineering/main)
+"wa" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/corner{
 	dir = 1
 	},
+/area/station/medical/medbay)
+"wc" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/iron,
-/area/station/hallway/primary/central)
+/area/station/science)
+"wk" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/iron/cafeteria,
+/area/station/medical/medbay)
+"wl" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"wp" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/bitrunning/den)
 "wB" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
-"wM" = (
+"wD" = (
+/obj/machinery/door/airlock,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
+/area/station/cargo/miningoffice)
 "wU" = (
 /turf/closed/wall/r_wall,
 /area/station/science/explab)
+"xD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/tile/blue/half/contrasted,
+/turf/open/floor/iron,
+/area/station/command/bridge)
+"xK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"xY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/engineering/atmos)
+"ya" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 8
+	},
+/obj/machinery/light/small/red/dim/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
+"yi" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
+"yl" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "yA" = (
 /obj/docking_port/stationary/laborcamp_home{
 	dir = 8
 	},
 /turf/open/space/basic,
 /area/space)
+"yH" = (
+/obj/effect/turf_decal/stripes/full,
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Medbay Airlock"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/medical/medbay)
 "yK" = (
 /obj/structure/fans/tiny/invisible,
 /obj/effect/turf_decal/stripes/line{
@@ -2063,6 +1625,12 @@
 /obj/machinery/power/rtg/debug,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"zg" = (
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "zo" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
@@ -2073,16 +1641,57 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
 /area/station/science)
+"zY" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "Aj" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/cargo/bitrunning/den)
-"AP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+"An" = (
+/turf/open/floor/iron/dark,
+/area/station/cargo/storage)
+"Ao" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/caution/stand_clear{
 	dir = 8
 	},
 /turf/open/floor/iron,
-/area/station/science)
+/area/station/cargo/storage)
+"AD" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
+"Bp" = (
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/engineering/gravity_generator)
+"Bz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"BB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor,
+/area/station/medical/medbay)
 "BD" = (
 /obj/structure/closet/secure_closet/chief_medical{
 	locked = 0
@@ -2096,13 +1705,44 @@
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"BM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "Ce" = (
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
+"Cg" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "Ct" = (
 /obj/structure/closet/syndicate/resources/everything,
 /turf/open/floor/iron,
 /area/station/science)
+"CF" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white/corner,
+/area/station/medical/medbay)
+"CG" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"CJ" = (
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Medbay Airlock"
+	},
+/obj/effect/turf_decal/stripes/full,
+/turf/open/floor/iron/dark,
+/area/station/medical/medbay)
 "CQ" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/stripes/line{
@@ -2114,11 +1754,6 @@
 /obj/machinery/component_printer,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
-"CV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/medical/chemistry)
 "Df" = (
 /obj/machinery/light/directional/east,
 /obj/item/integrated_circuit/loaded/hello_world,
@@ -2126,6 +1761,35 @@
 /obj/structure/rack,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
+"DC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
+"DD" = (
+/mob/living/carbon/human,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
+"DO" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"DT" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/turf_decal/stripes/full,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
 "DW" = (
 /obj/machinery/computer/scan_consolenew{
 	dir = 1
@@ -2135,15 +1799,19 @@
 	},
 /turf/open/floor/iron/white/corner,
 /area/station/medical/medbay)
-"EA" = (
+"Ef" = (
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"Es" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/construction)
-"EB" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron,
-/area/station/medical/medbay)
 "EG" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -2166,13 +1834,21 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
-"ES" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+"EN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/meter/layer4,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"ER" = (
+/mob/living/carbon/human,
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
 "EX" = (
 /obj/structure/table,
 /obj/item/screwdriver{
@@ -2196,6 +1872,70 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"Fy" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/exit/departure_lounge)
+"FA" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"FC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"FE" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"GC" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"GN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"GQ" = (
+/obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/brig)
+"GV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/cargo/storage)
+"GZ" = (
+/obj/machinery/chem_mass_spec,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
+"Hb" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron,
+/area/station/construction)
+"Hc" = (
+/obj/machinery/camera/directional/north,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"Hg" = (
+/obj/effect/turf_decal/plaque{
+	icon_state = "L5"
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "HW" = (
 /obj/machinery/airalarm/directional/east,
 /obj/effect/mapping_helpers/airalarm/unlocked,
@@ -2213,6 +1953,11 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/science/explab)
+"Is" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
 "Iy" = (
 /obj/structure/closet/secure_closet/research_director{
 	locked = 0
@@ -2220,24 +1965,6 @@
 /obj/effect/turf_decal/tile/blue/half/contrasted,
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"IB" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/structure/table,
-/obj/item/debug/omnitool{
-	pixel_x = -4;
-	pixel_y = 6
-	},
-/obj/item/debug/omnitool/item_spawner{
-	pixel_x = 4;
-	pixel_y = -6
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 1
-	},
-/area/station/medical/medbay)
 "IF" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -2259,25 +1986,52 @@
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
+"IV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
+"IX" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "cargounload"
+	},
+/obj/structure/sign/warning/vacuum/directional/east,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"Jd" = (
+/obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/commons/storage/primary)
 "Jp" = (
 /obj/machinery/gravity_generator/main,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
-"JF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
+"JV" = (
+/obj/machinery/camera/autoname/directional/east,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
 	},
+/obj/structure/cable,
 /turf/open/floor/iron,
-/area/station/medical/chemistry)
-"JS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/north,
-/obj/effect/mapping_helpers/airalarm/unlocked,
+/area/station/commons/storage/primary)
+"Kg" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/full,
 /turf/open/floor/iron,
-/area/station/hallway/primary/central)
+/area/station/engineering/main)
+"Ks" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
 "Kx" = (
 /obj/structure/table,
 /obj/item/analyzer,
@@ -2285,45 +2039,87 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
+"Lb" = (
+/obj/machinery/door/airlock,
+/turf/open/floor/plating,
+/area/station/medical/medbay)
+"Lq" = (
+/obj/effect/turf_decal/stripes/full,
+/obj/machinery/door/airlock/external/glass/ruin{
+	name = "Medbay Airlock"
+	},
+/turf/open/floor/iron,
+/area/station/medical/medbay)
 "Ly" = (
 /obj/machinery/chem_dispenser/chem_synthesizer,
 /turf/open/floor/iron/dark,
 /area/station/medical/chemistry)
-"LH" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+"LD" = (
+/obj/item/surgery_tray/full/advanced,
+/obj/structure/table/glass,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
 	},
-/obj/machinery/door/airlock/research,
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/white/corner,
+/area/station/medical/medbay)
 "LS" = (
 /obj/machinery/quantum_server,
 /turf/open/floor/iron,
 /area/station/cargo/bitrunning/den)
+"LU" = (
+/obj/machinery/vending/subtype_vendor,
+/turf/open/floor/iron,
+/area/station/medical/chemistry)
 "LW" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"Ma" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/engineering/main)
+"Mg" = (
+/obj/machinery/door/airlock/public/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/medical/medbay)
 "Mh" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"Ml" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"My" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/science)
 "ME" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /turf/open/floor/iron,
 /area/station/cargo/miningoffice)
+"MM" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "MN" = (
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/engineering/gravity_generator)
-"MY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
 "Nb" = (
 /obj/machinery/bci_implanter,
 /turf/open/floor/iron/dark,
@@ -2332,11 +2128,26 @@
 /obj/machinery/chem_recipe_debug,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
+"Ni" = (
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
 "Ns" = (
 /obj/machinery/door/airlock/public/glass,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/medical/medbay)
+"Nu" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"NG" = (
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
 "NZ" = (
 /obj/machinery/rnd/production/protolathe/department,
 /turf/open/floor/iron,
@@ -2362,15 +2173,58 @@
 /obj/item/stock_parts/power_store/cell/bluespace,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
+"OF" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"OI" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
+"OO" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/explab)
+"OS" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "OU" = (
 /obj/item/disk/tech_disk/debug,
 /turf/open/floor/iron,
 /area/station/science)
+"Pc" = (
+/obj/effect/turf_decal/plaque{
+	icon_state = "L13"
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/commons/storage/primary)
 "Pk" = (
 /obj/machinery/airalarm/directional/north,
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
+"Pr" = (
+/obj/machinery/atmospherics/components/unary/airlock_pump{
+	dir = 8
+	},
+/obj/machinery/light/small/red/dim/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/medical/medbay)
+"Pv" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/meter/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
 "Px" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder,
@@ -2383,19 +2237,11 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/security/brig)
-"Qi" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/station/hallway/secondary/entry)
-"Qt" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+"PK" = (
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/machinery/door/airlock/external/glass/ruin,
-/turf/open/floor/plating,
+/turf/open/floor/iron/white/corner,
 /area/station/medical/medbay)
 "Qu" = (
 /obj/docking_port/stationary/mining_home{
@@ -2403,6 +2249,35 @@
 	},
 /turf/open/floor/engine,
 /area/station/cargo/miningoffice)
+"QM" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/science)
+"QP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/button/door/directional/east{
+	id = "cargoload";
+	name = "Loading Doors";
+	pixel_y = -9
+	},
+/obj/machinery/button/door/directional/east{
+	id = "cargounload";
+	name = "Unloading Doors";
+	pixel_y = 8
+	},
+/obj/machinery/computer/cargo{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"QV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "QY" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -2421,6 +2296,41 @@
 /obj/machinery/byteforge,
 /turf/open/floor/circuit/green,
 /area/station/cargo/bitrunning/den)
+"Ru" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
+"Rx" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/closet/radiation,
+/turf/open/floor/iron,
+/area/station/engineering/gravity_generator)
+"RD" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/debug/omnitool{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/item/debug/omnitool/item_spawner{
+	pixel_x = 4;
+	pixel_y = -6
+	},
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
+"RE" = (
+/obj/machinery/door/airlock/external/glass/ruin,
+/obj/effect/turf_decal/stripes/full,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
 "RM" = (
 /obj/structure/closet/secure_closet/hop{
 	locked = 0
@@ -2449,6 +2359,14 @@
 /obj/item/bitrunning_debug,
 /turf/open/floor/iron,
 /area/station/cargo/bitrunning/den)
+"SU" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/security/brig)
+"SX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/hallway/secondary/entry)
 "Td" = (
 /obj/machinery/light/directional/east,
 /obj/effect/turf_decal/stripes/line{
@@ -2460,28 +2378,50 @@
 /obj/machinery/door/poddoor,
 /turf/open/floor/engine,
 /area/station/hallway/secondary/entry)
+"Ts" = (
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Gravity Generator"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/engineering/gravity_generator)
 "Tt" = (
 /turf/open/floor/plating,
 /area/station/maintenance/aft)
+"TJ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
 "TR" = (
-/obj/machinery/netpod,
-/turf/open/floor/iron,
-/area/station/cargo/bitrunning/den)
-"TV" = (
-/obj/machinery/door/airlock,
-/obj/structure/cable,
+/obj/machinery/netpod,
 /turf/open/floor/iron,
-/area/station/construction)
+/area/station/cargo/bitrunning/den)
+"TT" = (
+/obj/structure/lattice,
+/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
+	dir = 8
+	},
+/turf/open/space,
+/area/space/nearstation)
 "Ue" = (
 /turf/closed/wall/r_wall,
 /area/station/cargo/bitrunning/den)
-"Ut" = (
-/obj/structure/closet/secure_closet/medical3{
-	locked = 0
-	},
-/obj/item/healthanalyzer/advanced,
+"Un" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
 /area/station/medical/medbay)
+"Uy" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "Va" = (
 /obj/machinery/power/smes/full,
 /obj/effect/turf_decal/stripes/line{
@@ -2497,23 +2437,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"Vr" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/explab)
 "Vy" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"VA" = (
-/obj/structure/fans/tiny,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/main)
 "We" = (
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/iron,
@@ -2522,32 +2449,20 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
-"Wq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/hallway/primary/central)
-"Wx" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
 "WK" = (
 /obj/structure/money_bot,
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
-"WT" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external/glass/ruin,
+"WL" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/medical/medbay)
+"WR" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/engineering/main)
+/turf/open/floor/iron,
+/area/station/security/brig)
 "Xg" = (
 /obj/machinery/light/directional/east,
 /obj/machinery/vending/syndichem{
@@ -2563,10 +2478,44 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"Xy" = (
+/obj/machinery/door/airlock,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/station/hallway/primary/central)
+"XA" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/sign/warning/vacuum/external/directional/east,
+/turf/open/floor/iron/white/corner,
+/area/station/medical/medbay)
 "XC" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science)
+"XF" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "cargoload"
+	},
+/obj/structure/sign/warning/vacuum/directional/east,
+/turf/open/floor/iron,
+/area/station/cargo/storage)
+"XG" = (
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
+"XK" = (
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "XN" = (
 /obj/structure/table,
 /obj/item/organ/internal/cyberimp/bci{
@@ -2580,12 +2529,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
-"XR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
 "XU" = (
 /obj/machinery/atmospherics/components/tank/air,
 /obj/machinery/light/directional/north,
@@ -2609,6 +2552,11 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/explab)
+"Yt" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/obj/machinery/meter,
+/turf/open/floor/plating,
+/area/station/engineering/atmos)
 "Yy" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/rnd/production/circuit_imprinter/department,
@@ -2616,6 +2564,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science)
+"Yz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/station/medical/medbay)
 "YL" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -2628,6 +2581,28 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
+"Zl" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/iron,
+/area/station/engineering/main)
+"Zo" = (
+/obj/structure/table,
+/obj/item/gun/magic/wand/resurrection/debug,
+/obj/item/gun/magic/wand/death/debug{
+	pixel_y = 10
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/obj/item/debug/human_spawner{
+	pixel_x = 6;
+	pixel_y = -4
+	},
+/turf/open/floor/iron/white/corner{
+	dir = 1
+	},
+/area/station/medical/medbay)
 "Zz" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/effect/turf_decal/stripes/line,
@@ -2636,6 +2611,12 @@
 /obj/effect/mapping_helpers/airalarm/unlocked,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
+"ZB" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
 "ZD" = (
 /obj/machinery/suit_storage_unit/ce,
 /turf/open/floor/iron,
@@ -3410,7 +3391,7 @@ aa
 Ue
 LS
 Yd
-hv
+fL
 TR
 Ue
 aa
@@ -3502,7 +3483,7 @@ aa
 Ue
 IF
 Aj
-vb
+uL
 SC
 Ue
 aa
@@ -3594,7 +3575,7 @@ em
 Ue
 Ue
 Ue
-nI
+wp
 QY
 Ue
 Tj
@@ -3686,7 +3667,7 @@ rK
 rK
 vy
 em
-aB
+jL
 eh
 LW
 lc
@@ -3778,7 +3759,7 @@ qQ
 qQ
 ME
 em
-aB
+jL
 eh
 LW
 lc
@@ -3870,7 +3851,7 @@ qQ
 qQ
 ME
 em
-aB
+jL
 eh
 LW
 lc
@@ -3962,7 +3943,7 @@ qQ
 qQ
 CQ
 em
-mi
+OF
 eh
 LW
 lc
@@ -4054,7 +4035,7 @@ qQ
 qQ
 ME
 em
-aB
+jL
 eh
 LW
 lc
@@ -4146,7 +4127,7 @@ qQ
 qQ
 YL
 em
-aB
+jL
 eh
 LW
 lc
@@ -4235,11 +4216,11 @@ II
 Td
 II
 II
-gl
-gD
-kj
-aB
-wM
+Uy
+Cg
+wD
+jL
+jL
 LW
 lc
 lc
@@ -4327,11 +4308,11 @@ em
 em
 em
 EM
-gm
-go
-gp
-eL
-gr
+yi
+yi
+em
+eh
+ax
 LW
 lc
 lc
@@ -4423,7 +4404,7 @@ dY
 dY
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -4515,7 +4496,7 @@ od
 dj
 ed
 eh
-gu
+ax
 LW
 lc
 lc
@@ -4607,7 +4588,7 @@ fi
 dP
 ex
 eh
-gu
+ax
 LW
 lc
 lc
@@ -4699,7 +4680,7 @@ Re
 dV
 dY
 ej
-gu
+ax
 LW
 lc
 lc
@@ -4791,7 +4772,7 @@ dY
 dY
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -4883,7 +4864,7 @@ aa
 aa
 dY
 gE
-gu
+ax
 LW
 lc
 lc
@@ -4974,8 +4955,8 @@ aa
 aa
 aa
 dY
-gq
-ei
+SX
+ax
 LW
 lc
 lc
@@ -4986,7 +4967,7 @@ lc
 lc
 wB
 eh
-gw
+GN
 dY
 aa
 aa
@@ -4994,7 +4975,7 @@ aa
 aa
 aa
 dY
-gB
+ru
 eh
 en
 aa
@@ -5067,7 +5048,7 @@ aa
 aa
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -5078,7 +5059,7 @@ lc
 lc
 wB
 eh
-ek
+BM
 en
 aa
 aa
@@ -5086,7 +5067,7 @@ aa
 aa
 aa
 en
-ek
+BM
 eh
 dY
 aa
@@ -5159,7 +5140,7 @@ aa
 aa
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -5170,7 +5151,7 @@ lc
 lc
 wB
 eh
-ek
+BM
 en
 aa
 aa
@@ -5178,7 +5159,7 @@ aa
 aa
 aa
 en
-ek
+BM
 eh
 en
 aa
@@ -5251,7 +5232,7 @@ aa
 aa
 dY
 ej
-gu
+ax
 LW
 lc
 lc
@@ -5262,7 +5243,7 @@ lc
 lc
 wB
 eh
-ek
+BM
 en
 aa
 aa
@@ -5270,7 +5251,7 @@ aa
 aa
 aa
 en
-ek
+BM
 eh
 dY
 aa
@@ -5343,7 +5324,7 @@ aa
 aa
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -5354,7 +5335,7 @@ lc
 lc
 wB
 eh
-gx
+Ml
 dY
 aa
 aa
@@ -5362,7 +5343,7 @@ aa
 aa
 aa
 dY
-gC
+OI
 eh
 dY
 aa
@@ -5435,7 +5416,7 @@ aa
 aa
 dY
 eh
-gu
+ax
 LW
 lc
 lc
@@ -5446,7 +5427,7 @@ lc
 lc
 wB
 eh
-ek
+BM
 en
 aa
 aa
@@ -5454,7 +5435,7 @@ eE
 aa
 aa
 en
-ek
+BM
 eh
 dY
 aa
@@ -5527,7 +5508,7 @@ bw
 ag
 ag
 eh
-gu
+ax
 LW
 dh
 en
@@ -5538,7 +5519,7 @@ en
 dY
 wB
 eh
-ek
+BM
 dY
 dY
 fn
@@ -5546,7 +5527,7 @@ fs
 en
 dY
 dY
-ek
+BM
 eh
 dY
 aa
@@ -5619,7 +5600,7 @@ aD
 dR
 ag
 eh
-gu
+ax
 eh
 eV
 eh
@@ -5630,7 +5611,7 @@ eh
 eV
 eh
 eh
-ek
+BM
 eh
 eV
 eh
@@ -5638,7 +5619,7 @@ eh
 eh
 eV
 eh
-ek
+BM
 eh
 dY
 aa
@@ -5703,34 +5684,34 @@ ag
 gn
 aD
 aD
-bH
-ci
-ci
-ci
-ci
-ci
-eg
-ei
-gu
-ei
-ep
-ei
-ei
-ei
-ei
-ei
-ei
-ei
-ei
-gu
-ei
-ei
-ei
-ei
-ei
-ei
-Qi
-fZ
+SU
+WR
+WR
+WR
+WR
+WR
+GQ
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+ax
+jL
+BM
 eh
 dY
 aa
@@ -5805,7 +5786,7 @@ ag
 eh
 eh
 eh
-gu
+ax
 eh
 eh
 eh
@@ -5821,7 +5802,7 @@ eh
 eh
 eh
 eh
-rn
+jL
 eh
 eh
 dY
@@ -5897,7 +5878,7 @@ bA
 gd
 bA
 bZ
-ft
+Xy
 bZ
 cN
 cN
@@ -5913,7 +5894,7 @@ cN
 cN
 cN
 cN
-LH
+os
 en
 dY
 dY
@@ -5980,7 +5961,7 @@ ut
 aw
 hm
 aw
-aw
+hr
 Kx
 ah
 zS
@@ -5989,7 +5970,7 @@ ca
 If
 bA
 kn
-ES
+xK
 bE
 cN
 Sg
@@ -6005,7 +5986,7 @@ dy
 dm
 dM
 cN
-Vr
+Ni
 vm
 uQ
 Ov
@@ -6069,22 +6050,22 @@ aa
 aa
 ah
 am
-aw
-aw
-ba
-jE
-MY
-bk
-bt
-bt
-bt
-AP
-pA
-kQ
-ES
-rL
-cP
-cX
+EN
+FC
+FC
+Nu
+xY
+Ks
+My
+My
+My
+bD
+bA
+XK
+xK
+Mh
+cN
+ou
 dn
 dn
 dn
@@ -6097,7 +6078,7 @@ dn
 dn
 dL
 sr
-nn
+OO
 ZP
 ZP
 WK
@@ -6161,22 +6142,22 @@ aa
 aa
 ah
 dS
-aw
+GC
 aN
 bb
-bl
+Ru
 zo
 ah
 Yy
 bD
-XC
-gY
-jb
-ES
-bE
-Mh
-TV
-EA
+QM
+QM
+rh
+ZB
+QV
+FA
+Hb
+Es
 dn
 dn
 dn
@@ -6253,19 +6234,19 @@ aa
 aa
 ah
 am
-aw
+bm
 aO
 bc
-bm
+Ru
 ZD
 ah
 bF
 OU
-XC
+wc
 Ct
 gd
-cA
 bE
+QV
 bE
 ef
 cY
@@ -6345,10 +6326,10 @@ aa
 aa
 ah
 XU
-bl
-aP
-aP
-XR
+Yt
+FE
+FE
+Pv
 Xp
 ah
 NZ
@@ -6356,8 +6337,8 @@ bD
 XC
 co
 bA
-JS
-bE
+OS
+QV
 bE
 cN
 dW
@@ -6436,11 +6417,11 @@ aa
 aa
 aa
 ah
-Wh
-ah
 ah
 Wh
-ah
+Wh
+Wh
+TJ
 ah
 ah
 bu
@@ -6448,8 +6429,8 @@ bu
 cd
 bu
 bu
-cB
-bE
+Ef
+QV
 bE
 cN
 cY
@@ -6532,7 +6513,7 @@ ab
 ab
 ab
 ab
-ab
+TT
 ab
 ab
 bu
@@ -6540,9 +6521,9 @@ Fd
 ce
 cp
 bu
-cC
-lX
-bE
+Hc
+QV
+hp
 cN
 cY
 dn
@@ -6632,8 +6613,8 @@ bI
 cf
 EI
 bv
-dU
-bE
+Hc
+QV
 bE
 cN
 cY
@@ -6724,8 +6705,8 @@ BG
 cf
 BD
 bu
-dU
-bE
+Hc
+QV
 bE
 cN
 cY
@@ -6814,10 +6795,10 @@ ab
 bv
 bJ
 cf
-cq
-cw
-Wq
-bE
+xD
+io
+lu
+QV
 bE
 ef
 cY
@@ -6908,8 +6889,8 @@ bK
 cf
 Iy
 bu
-cD
-bE
+XG
+QV
 bE
 ef
 cY
@@ -6991,7 +6972,7 @@ ae
 ac
 ac
 aj
-aC
+Kg
 aj
 ac
 ac
@@ -7000,8 +6981,8 @@ aK
 cf
 RM
 bv
-cD
-bE
+XG
+QV
 bE
 cN
 dK
@@ -7083,7 +7064,7 @@ aj
 aj
 aj
 aj
-VA
+vS
 aj
 ac
 ac
@@ -7092,8 +7073,8 @@ bM
 cg
 cr
 bu
-wb
-bE
+DO
+QV
 bE
 cS
 cS
@@ -7175,7 +7156,7 @@ aj
 al
 aA
 aj
-WT
+eB
 aj
 aj
 aj
@@ -7184,8 +7165,8 @@ bu
 cd
 bu
 bu
-cE
-bE
+kS
+QV
 bE
 cS
 Zz
@@ -7267,7 +7248,7 @@ aj
 ap
 aA
 We
-Vy
+Ma
 aS
 bd
 bo
@@ -7276,8 +7257,8 @@ hD
 cj
 ct
 Nc
-cF
-bE
+qH
+QV
 bE
 cS
 dc
@@ -7358,21 +7339,21 @@ aa
 aj
 aq
 Vy
-Vy
-aE
-aT
-be
-be
-bx
-CV
-CV
-ch
-CV
-cT
-bN
-bN
-da
-fK
+Zl
+Ma
+oK
+oK
+oK
+sT
+IV
+IV
+Ce
+Ce
+qH
+QV
+bE
+cS
+qv
 dJ
 dJ
 dJ
@@ -7451,20 +7432,20 @@ aj
 IH
 aA
 aH
-aF
-lg
+aA
+mk
 bf
 bp
 aj
 Px
+tn
 Ce
-JF
-mE
-oV
-bE
+GZ
+qH
+QV
 bE
 cS
-fx
+jg
 dq
 dJ
 dJ
@@ -7475,7 +7456,7 @@ dJ
 dJ
 dJ
 dJ
-ny
+gi
 cS
 fI
 ga
@@ -7544,19 +7525,19 @@ ad
 ak
 ak
 ak
-aU
+Ts
 ak
 ak
 ak
 bQ
-Ce
-Ce
-cj
-vP
-Mh
+tn
+tn
+tn
+tQ
+sN
 Vg
 cS
-fy
+rC
 dr
 dJ
 dJ
@@ -7567,7 +7548,7 @@ dJ
 dJ
 dJ
 dJ
-dO
+nT
 cS
 fO
 fO
@@ -7635,20 +7616,20 @@ ad
 af
 ak
 Va
-aG
-aV
+Bp
+nb
 bg
 bq
 ak
 bR
 cj
+mb
 cj
-cj
-oV
-bE
+qH
+QV
 Mh
 uO
-fz
+Hg
 ds
 dJ
 dJ
@@ -7726,21 +7707,21 @@ aa
 bY
 af
 ak
-at
-Wx
+Rx
+bh
 bh
 bh
 br
 ak
 bS
 Ce
-Ce
+LU
 cj
-oV
-bE
-bE
-cV
-fA
+qH
+QV
+QV
+zg
+ay
 dt
 dJ
 dD
@@ -7828,11 +7809,11 @@ Ly
 EX
 Xg
 cj
-oV
-bE
+qH
+QV
 bE
 cV
-fC
+pw
 du
 dJ
 dJ
@@ -7920,11 +7901,11 @@ by
 ck
 by
 Ns
-cG
-cx
+by
+Mg
 by
 by
-fD
+pZ
 dv
 dJ
 dJ
@@ -8010,13 +7991,13 @@ av
 by
 Ot
 cl
-IB
+RD
 cl
-cH
-cu
+Zo
+wa
 cJ
 by
-fE
+Pc
 dw
 dJ
 dJ
@@ -8027,7 +8008,7 @@ dJ
 dJ
 dJ
 dJ
-dN
+kf
 cS
 fQ
 fO
@@ -8100,20 +8081,20 @@ av
 Jp
 av
 by
-bV
-cm
+DD
 cm
 cm
 cm
 cm
+WL
 Sj
 by
-dA
+jk
 dJ
 dJ
 dJ
 dJ
-dF
+yl
 dJ
 dJ
 dJ
@@ -8122,8 +8103,8 @@ dJ
 dJ
 cS
 fS
-lH
-gb
+fO
+AD
 fO
 gk
 aa
@@ -8192,30 +8173,30 @@ MN
 MN
 av
 by
-bW
-cm
-cm
+ER
 cm
 cm
 cm
-cL
+Un
+WL
+LD
 by
-dk
-eH
-eH
-eH
-eH
-fH
-fw
-eH
-eH
-eH
-eH
-fH
-fR
-fW
-lH
-fO
+DC
+Bz
+Bz
+Bz
+Bz
+wl
+DC
+MM
+MM
+MM
+MM
+qw
+pe
+pr
+Fy
+Fy
 fO
 ga
 aa
@@ -8284,21 +8265,21 @@ aY
 av
 av
 by
-bX
+jZ
+cm
 cm
-is
-cy
-Ut
 cm
-cK
+cm
+WL
+jz
 by
 dB
 dx
 dl
 dl
 gg
-ez
-dB
+JV
+zY
 dl
 dl
 dl
@@ -8376,12 +8357,12 @@ ak
 ak
 ak
 by
-by
-dH
-by
-Qt
-by
-EB
+er
+cm
+cm
+cm
+cm
+WL
 DW
 by
 cS
@@ -8389,9 +8370,9 @@ cS
 cS
 cS
 cS
-fN
-vv
-cS
+Is
+Jd
+tz
 cS
 cS
 cS
@@ -8467,13 +8448,13 @@ af
 af
 af
 af
-af
-af
-af
-by
-cz
-by
-cm
+Lb
+wk
+PK
+PK
+CF
+XA
+vB
 es
 by
 eu
@@ -8481,8 +8462,8 @@ eu
 qx
 eP
 fY
-eZ
-eu
+NG
+vQ
 fq
 fr
 eu
@@ -8559,13 +8540,13 @@ ad
 ad
 ad
 ad
-ad
-ad
-ad
 by
-pI
 by
 by
+Lq
+yH
+by
+ck
 by
 by
 eu
@@ -8573,8 +8554,8 @@ eu
 eu
 eQ
 eu
-fa
-eu
+CG
+vQ
 eu
 eu
 fo
@@ -8651,25 +8632,25 @@ fg
 fg
 fg
 fg
-fg
-fg
-fg
-fg
-fg
-fg
-fg
-fg
-et
+aa
+aa
+ck
+mC
+BB
+Yz
+mC
+mC
+by
 ev
 eA
 eA
-eA
+IX
 eN
-ev
-fe
-ev
+Ao
+QP
+pL
 eT
-fm
+XF
 fm
 ev
 et
@@ -8745,23 +8726,23 @@ aa
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
+ck
+mC
+mC
+Pr
+mC
+mC
+by
 et
-fB
-fh
 fh
 fh
+et
 eY
-eR
-fh
-eR
+DT
+et
+RE
 fc
-fh
+et
 fh
 fh
 et
@@ -8837,23 +8818,23 @@ aa
 aa
 aa
 aa
+by
+ck
+ck
+by
+CJ
+CJ
+by
 aa
 aa
 aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ew
+fh
 eC
-fF
-fB
-fF
+gH
+ng
+GV
 fl
-ew
+fh
 aa
 aa
 aa
@@ -8940,11 +8921,11 @@ aa
 aa
 aa
 fh
-eY
-eS
-fh
-eS
-fc
+eC
+An
+ya
+An
+fl
 fh
 aa
 aa
@@ -9031,13 +9012,13 @@ aa
 aa
 aa
 aa
-aa
-aa
-eJ
-aa
-aa
-aa
-aa
+et
+eY
+qg
+fB
+qg
+fc
+et
 aa
 aa
 aa
@@ -9125,7 +9106,7 @@ aa
 aa
 aa
 aa
-aa
+eJ
 aa
 aa
 aa
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 2346e028c49e9..1d1e21590b7e2 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -6978,9 +6978,8 @@
 /area/centcom/tdome/observation)
 "Ga" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/taperecorder,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/fax,
 /turf/open/floor/iron/dark,
 /area/centcom/central_command_areas/ferry)
 "Gb" = (
@@ -9594,7 +9593,7 @@
 /turf/open/floor/iron,
 /area/centcom/tdome/arena)
 "TO" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/structure/table/reinforced,
 /obj/item/stack/package_wrap{
 	pixel_y = 11;
@@ -10390,7 +10389,7 @@
 /turf/open/floor/wood,
 /area/centcom/central_command_areas/admin)
 "Xr" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
 /obj/machinery/button/door/indestructible{
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index f7d2f203ba1fa..469e5ec80fb3d 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -5316,7 +5316,7 @@
 	},
 /obj/machinery/light/warm/directional/north,
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "aMM" = (
@@ -6789,7 +6789,7 @@
 /area/station/command/bridge)
 "bpn" = (
 /mob/living/carbon/human/species/monkey,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "bpu" = (
 /obj/structure/cable,
@@ -7177,7 +7177,7 @@
 "bwU" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/flora/bush/fullgrass/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "bxd" = (
 /obj/structure/table,
@@ -8220,6 +8220,7 @@
 	},
 /obj/machinery/vending/modularpc,
 /obj/structure/table,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "bNI" = (
@@ -8386,6 +8387,10 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"bRl" = (
+/obj/structure/water_source/puddle,
+/turf/open/misc/asteroid,
+/area/station/security/prison/workout)
 "bRE" = (
 /obj/structure/lattice/catwalk,
 /turf/open/floor/plating/airless,
@@ -8609,7 +8614,7 @@
 /area/station/engineering/gravity_generator)
 "bWb" = (
 /obj/machinery/suit_storage_unit/hos,
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/hos)
 "bWi" = (
@@ -8748,7 +8753,7 @@
 /obj/effect/turf_decal/trimline/brown/filled/line{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/button/door/directional/east{
@@ -9748,6 +9753,7 @@
 	pixel_y = 11
 	},
 /obj/item/stock_parts/power_store/cell/high,
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,
 /area/station/commons/storage/primary)
 "cpl" = (
@@ -10192,7 +10198,7 @@
 	name = "The Monkey Pit";
 	req_access = list("science")
 	},
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "cxc" = (
 /obj/structure/chair,
@@ -10802,14 +10808,13 @@
 /turf/open/floor/iron,
 /area/station/security/brig)
 "cGm" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/watertank,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/trimline/neutral/line,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 4
 	},
-/turf/open/floor/iron,
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "cGy" = (
 /obj/structure/chair/stool/directional/north,
@@ -11262,12 +11267,6 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
-"cON" = (
-/obj/machinery/deepfryer,
-/turf/open/floor/iron/white/side{
-	dir = 8
-	},
-/area/station/service/kitchen)
 "cPg" = (
 /obj/machinery/power/smes/engineering,
 /obj/structure/sign/warning/electric_shock/directional/west,
@@ -12943,7 +12942,7 @@
 /obj/machinery/modular_computer/preset/id{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /obj/machinery/button/door/directional/north{
 	name = "CMO Privacy Shutters";
 	pixel_y = 38;
@@ -16425,6 +16424,7 @@
 	},
 /obj/structure/sign/clock/directional/east,
 /obj/effect/landmark/event_spawn,
+/obj/machinery/light/directional/east,
 /turf/open/floor/iron/smooth,
 /area/station/commons/storage/primary)
 "eHr" = (
@@ -18853,7 +18853,7 @@
 /area/station/engineering/storage/tech)
 "fEM" = (
 /obj/machinery/light/warm/directional/south,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "fEQ" = (
 /obj/structure/cable,
@@ -18985,7 +18985,7 @@
 "fGK" = (
 /mob/living/carbon/human/species/monkey,
 /obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "fHg" = (
 /obj/structure/chair{
@@ -20544,7 +20544,7 @@
 	name = "The Monkey Pit";
 	req_access = list("science")
 	},
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "gkQ" = (
 /obj/machinery/computer/atmos_control/mix_tank{
@@ -22572,7 +22572,7 @@
 /area/station/security/checkpoint/supply)
 "gXo" = (
 /obj/structure/flora/bush/fullgrass/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "gXA" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner,
@@ -25178,6 +25178,25 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"hZq" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 4
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig";
+	id_tag = "outerbrigleft"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig_left"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "hZr" = (
 /turf/closed/wall/r_wall,
 /area/station/engineering/atmos)
@@ -32262,24 +32281,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/commons/fitness/recreation)
-"ktX" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig";
-	id_tag = "outerbrigleft"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig_left"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "kul" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced/spawner/directional/south,
@@ -33571,7 +33572,7 @@
 	pixel_x = 5;
 	pixel_y = 16
 	},
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "kQX" = (
 /obj/machinery/computer/security{
@@ -33620,7 +33621,7 @@
 /turf/open/floor/wood,
 /area/station/service/bar/backroom)
 "kRR" = (
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "kRW" = (
 /obj/effect/decal/cleanable/dirt,
@@ -35621,6 +35622,25 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
+"lAx" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig";
+	id_tag = "outerbrigright"
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 4
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig_right"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "lAA" = (
 /obj/structure/chair/stool/bar/directional/west,
 /turf/open/floor/iron,
@@ -37882,7 +37902,7 @@
 /area/station/command/meeting_room)
 "mmy" = (
 /obj/structure/flora/bush/jungle/c/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "mmH" = (
 /obj/effect/turf_decal/delivery,
@@ -41329,7 +41349,7 @@
 "nzO" = (
 /mob/living/carbon/human/species/monkey,
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "nzR" = (
@@ -41994,7 +42014,7 @@
 /area/station/engineering/supermatter/room)
 "nNh" = (
 /obj/structure/flora/bush/sunny/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "nNi" = (
 /obj/structure/table/wood,
@@ -42224,7 +42244,7 @@
 "nRd" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/flora/bush/fullgrass/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "nRw" = (
 /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
@@ -43030,7 +43050,7 @@
 	id = "hopqueuestart";
 	req_access = list("kitchen")
 	},
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_x = 26
 	},
 /obj/machinery/button/door/directional/south{
@@ -44702,7 +44722,7 @@
 /area/station/ai_monitored/command/nuke_storage)
 "oQU" = (
 /obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "oQW" = (
 /obj/effect/turf_decal/siding/thinplating{
@@ -46702,7 +46722,6 @@
 /area/station/hallway/secondary/exit)
 "pzw" = (
 /obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/watertank,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 4
@@ -47364,28 +47383,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/service/chapel)
-"pLg" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 8
-	},
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig";
-	id_tag = "outerbrigright"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig_right"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/navigate_destination/sec,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "pLs" = (
 /obj/structure/transport/linear/tram,
 /obj/structure/tram/split,
@@ -47449,10 +47446,10 @@
 /turf/open/floor/iron/white,
 /area/station/science/lower)
 "pMz" = (
-/obj/structure/table/glass,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 5
 	},
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/iron,
 /area/station/service/hydroponics/garden)
 "pMG" = (
@@ -47798,7 +47795,7 @@
 "pTj" = (
 /obj/structure/flora/bush/fullgrass/style_random,
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "pTl" = (
@@ -50258,7 +50255,7 @@
 /area/station/science/server)
 "qKW" = (
 /obj/structure/table/reinforced,
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/item/rcl/pre_loaded,
 /obj/machinery/computer/security/telescreen/ce/directional/west,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -53586,24 +53583,6 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
-"rUd" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig";
-	id_tag = "outerbrigright"
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig_right"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "rUe" = (
 /obj/machinery/holopad,
 /obj/structure/cable,
@@ -55665,7 +55644,7 @@
 /area/station/cargo/miningdock)
 "sGF" = (
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "sGG" = (
@@ -55894,6 +55873,12 @@
 /obj/effect/turf_decal/tile/red,
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"sKD" = (
+/obj/machinery/smartfridge/drying,
+/turf/open/floor/iron/white/side{
+	dir = 8
+	},
+/area/station/service/kitchen)
 "sKN" = (
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
@@ -56580,7 +56565,7 @@
 /obj/machinery/computer/communications{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/north{
+/obj/machinery/keycard_auth/wall_mounted/directional/north{
 	pixel_x = 26
 	},
 /obj/machinery/status_display/ai/directional/north,
@@ -56791,6 +56776,29 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/station/cargo/miningdock/cafeteria)
+"taL" = (
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig";
+	id_tag = "outerbrigright"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig_right"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/landmark/navigate_destination/sec,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "taP" = (
 /obj/structure/lattice,
 /turf/open/openspace,
@@ -56951,7 +56959,7 @@
 "tdY" = (
 /obj/structure/flora/bush/jungle/c/style_random,
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "tdZ" = (
@@ -62532,7 +62540,7 @@
 "uVa" = (
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/flora/bush/jungle/c/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "uVb" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -64486,7 +64494,7 @@
 /area/station/engineering/atmos)
 "vCY" = (
 /obj/structure/flora/tree/palm/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "vCZ" = (
 /turf/closed/wall,
@@ -64526,7 +64534,7 @@
 /obj/structure/flora/bush/fullgrass/style_random,
 /obj/effect/landmark/event_spawn,
 /turf/open/misc/dirt/jungle{
-	baseturfs = /turf/open/misc/dirt
+	baseturfs = /turf/open/misc/dirt/station
 	},
 /area/station/science/explab)
 "vDu" = (
@@ -64576,7 +64584,7 @@
 /area/station/maintenance/central/greater)
 "vEl" = (
 /obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "vEq" = (
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer{
@@ -64807,6 +64815,26 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"vHT" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Brig";
+	id_tag = "outerbrigleft"
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 4
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+	cycle_id = "brig_left"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/scanner_gate/preset_guns,
+/turf/open/floor/iron,
+/area/station/security/brig)
 "vIa" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -66138,25 +66166,6 @@
 /obj/effect/turf_decal/trimline/white/warning,
 /turf/open/floor/iron,
 /area/station/maintenance/tram/right)
-"wiI" = (
-/obj/machinery/door/airlock/security/glass{
-	name = "Brig";
-	id_tag = "outerbrigleft"
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
-	cycle_id = "brig_left"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/security/brig)
 "wiU" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -66687,7 +66696,7 @@
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/structure/flora/tree/palm/style_random,
 /obj/structure/flora/coconuts,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "wtS" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -67992,7 +68001,7 @@
 /area/station/commons/dorms)
 "wSp" = (
 /obj/structure/flora/bush/jungle/b/style_random,
-/turf/open/misc/grass/jungle,
+/turf/open/misc/grass/jungle/station,
 /area/station/science/explab)
 "wSx" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -88119,7 +88128,7 @@ abM
 aal
 lPV
 kPC
-lFk
+bRl
 lFk
 lFk
 mAB
@@ -153423,7 +153432,7 @@ jGL
 jed
 oIz
 gnW
-wiI
+vHT
 mcD
 pDy
 tWn
@@ -153937,7 +153946,7 @@ iUE
 rxE
 jyR
 lMR
-ktX
+hZq
 pqd
 kdV
 acr
@@ -157021,7 +157030,7 @@ fph
 sHw
 kil
 axp
-rUd
+lAx
 njR
 joB
 lTV
@@ -157535,7 +157544,7 @@ aBN
 sDO
 jFh
 msW
-pLg
+taL
 nSV
 aPk
 sGG
@@ -170386,7 +170395,7 @@ eSx
 llj
 whs
 fEG
-cON
+sKD
 mkl
 fxS
 eSx
diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm
index 3ba9e257a7f63..fa4ea9e4b3263 100644
--- a/_maps/map_files/wawastation/wawastation.dmm
+++ b/_maps/map_files/wawastation/wawastation.dmm
@@ -174,6 +174,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"acN" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/holosign_creator/atmos,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "acY" = (
 /obj/structure/cable,
 /obj/structure/railing/corner{
@@ -254,14 +260,6 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron,
 /area/station/security/brig)
-"aek" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "aem" = (
 /obj/structure/table,
 /obj/effect/turf_decal/tile/blue/fourcorners,
@@ -972,11 +970,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"apD" = (
-/obj/structure/barricade/wooden,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
 "apH" = (
 /obj/structure/chair/comfy/beige{
 	dir = 1
@@ -1158,18 +1151,6 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/iron/white,
 /area/station/hallway/secondary/entry)
-"atb" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/red,
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "ath" = (
 /obj/machinery/door/window/left/directional/west,
 /turf/open/floor/grass,
@@ -1418,12 +1399,6 @@
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
 /area/station/maintenance/disposal/incinerator)
-"awS" = (
-/obj/machinery/air_sensor/oxygen_tank{
-	chamber_id = "o2ordance"
-	},
-/turf/open/floor/engine/o2,
-/area/station/science/ordnance)
 "awW" = (
 /obj/effect/decal/cleanable/glass,
 /obj/effect/decal/cleanable/dirt,
@@ -1638,16 +1613,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/engineering/gravity_generator)
-"azM" = (
-/obj/machinery/computer/camera_advanced/xenobio{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/item/storage/box/monkeycubes,
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "azQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -2463,6 +2428,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/scanner_gate/preset_guns,
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
 "aNR" = (
@@ -2553,15 +2519,6 @@
 /obj/effect/spawner/structure/window/plasma,
 /turf/open/floor/engine,
 /area/station/medical/chemistry)
-"aPG" = (
-/obj/machinery/door/poddoor/shutters/window/preopen{
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "aPI" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -3418,6 +3375,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"bhq" = (
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/catwalk_floor/iron_white,
+/area/station/science/ordnance/testlab)
 "bhv" = (
 /obj/structure/window/reinforced/plasma/spawner/directional/south,
 /obj/machinery/power/energy_accumulator/tesla_coil/anchored,
@@ -3505,14 +3466,6 @@
 "biS" = (
 /turf/closed/wall/r_wall/rust,
 /area/station/ai_monitored/turret_protected/ai_upload)
-"biT" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/red,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "bjb" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/kirbyplants/random/dead,
@@ -4506,7 +4459,7 @@
 /obj/machinery/computer/security/mining{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/effect/turf_decal/tile/dark_blue/half/contrasted{
 	dir = 4
 	},
@@ -4645,6 +4598,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
+"bEz" = (
+/obj/structure/closet/crate/science,
+/obj/item/wrench,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm/directional/west,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "bEW" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/random/decoration/microwave{
@@ -4667,7 +4629,7 @@
 /area/station/commons/toilet/restrooms)
 "bFe" = (
 /obj/machinery/suit_storage_unit/hos,
-/obj/machinery/keycard_auth/directional/east{
+/obj/machinery/keycard_auth/wall_mounted/directional/east{
 	pixel_y = -12
 	},
 /turf/open/floor/iron/dark,
@@ -5236,13 +5198,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/medical/morgue)
-"bQA" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "bQT" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/effect/turf_decal/trimline/blue/filled/line,
@@ -5777,13 +5732,6 @@
 /obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
-"cba" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/light_switch/directional/east,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/ordnance/storage)
 "cbc" = (
 /obj/machinery/door/airlock/highsecurity{
 	name = "AI Upload"
@@ -5866,12 +5814,6 @@
 	dir = 8
 	},
 /area/station/science/research)
-"ccz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
-	dir = 1
-	},
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/storage)
 "ccI" = (
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -6490,12 +6432,6 @@
 	dir = 4
 	},
 /area/station/hallway/secondary/exit/departure_lounge)
-"cqf" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "cqm" = (
 /obj/structure/cable,
 /obj/machinery/camera/autoname/directional/south{
@@ -6926,6 +6862,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
+"czC" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/button/door/directional/east{
+	name = "shutter control";
+	id = "ordauxgarage"
+	},
+/obj/structure/closet/firecloset,
+/turf/open/floor/plating,
+/area/station/science/ordnance)
 "czD" = (
 /obj/item/stack/tile/iron/white,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -7099,6 +7044,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark/small,
 /area/station/engineering/transit_tube)
+"cCr" = (
+/obj/machinery/light/directional/north,
+/obj/structure/table,
+/obj/item/pen{
+	pixel_x = 9;
+	pixel_y = 4
+	},
+/obj/item/hand_labeler{
+	pixel_y = 10;
+	pixel_x = -13
+	},
+/turf/open/floor/glass/reinforced,
+/area/station/science/xenobiology)
 "cCv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/siding/white{
@@ -7118,16 +7076,6 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/iron/dark/textured_large,
 /area/station/science/xenobiology)
-"cCM" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
-	pixel_y = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "cCP" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 1
@@ -7941,12 +7889,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/catwalk_floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"cSc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/oxygen_output{
-	chamber_id = "o2ordance"
-	},
-/turf/open/floor/engine/o2,
-/area/station/science/ordnance)
 "cSd" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -8371,6 +8313,12 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating/reinforced/airless,
 /area/space/nearstation)
+"cZs" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "cZE" = (
 /turf/open/openspace,
 /area/station/command/meeting_room)
@@ -9125,11 +9073,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/science/general,
 /turf/open/floor/iron/white,
 /area/station/science/research)
-"dmG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/tank/oxygen,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
 "dmH" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 4
@@ -9330,6 +9273,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/interrogation)
+"dpA" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/landmark/blobstart,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "dpH" = (
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	color = "#000000"
@@ -10318,16 +10268,28 @@
 /area/station/service/theater)
 "dGs" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/pill_bottle/epinephrine,
-/obj/item/stack/sheet/mineral/plasma{
-	pixel_y = 12
-	},
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{
 	dir = 4
 	},
+/obj/item/hand_labeler{
+	pixel_x = 3;
+	pixel_y = 5
+	},
+/obj/item/storage/pill_bottle/epinephrine{
+	pixel_x = -9;
+	pixel_y = 1
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	pixel_y = 14;
+	pixel_x = 3
+	},
+/obj/item/hand_labeler_refill{
+	pixel_x = 10;
+	pixel_y = -2
+	},
 /turf/open/floor/iron/white/smooth_edge{
 	dir = 4
 	},
@@ -10480,14 +10442,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"dIN" = (
-/obj/machinery/processor/slime,
-/obj/effect/turf_decal/bot_red,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "dIR" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -11061,7 +11015,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/iron/large,
 /area/station/engineering/atmos/upper)
 "dTA" = (
@@ -11715,6 +11669,14 @@
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron/kitchen,
 /area/station/service/kitchen)
+"efF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "efJ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
 	dir = 1
@@ -11743,6 +11705,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/courtroom)
+"egt" = (
+/obj/structure/barricade/wooden,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/flashlight/glowstick/blue{
+	start_on = 1;
+	light_range = 2
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "egv" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -11832,6 +11803,20 @@
 	},
 /turf/open/floor/iron/white/smooth_large,
 /area/station/science/xenobiology/hallway)
+"eih" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = -2;
+	pixel_y = 8
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = 3;
+	pixel_y = -2
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "ein" = (
 /obj/effect/turf_decal/tile/red/half/contrasted,
 /obj/structure/disposalpipe/segment{
@@ -12249,10 +12234,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"epZ" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/turf/open/floor/plating,
-/area/station/science/ordnance)
 "eqp" = (
 /obj/effect/spawner/random/vending/snackvend,
 /obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -12546,7 +12527,7 @@
 /obj/effect/turf_decal/trimline/dark_blue/filled/line{
 	dir = 6
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /obj/machinery/button/door/directional/east{
 	pixel_y = 12;
 	name = "privacy shutter control";
@@ -16630,14 +16611,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
-"fTf" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/light_switch/directional/east,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "fTj" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/door/airlock/hatch{
@@ -17315,6 +17288,7 @@
 /area/station/science/research)
 "ggl" = (
 /obj/machinery/camera/autoname/directional/west,
+/obj/structure/water_source/puddle,
 /turf/open/floor/grass,
 /area/station/service/hydroponics/garden)
 "ggu" = (
@@ -17341,17 +17315,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
-"ggN" = (
-/obj/machinery/camera/autoname/directional/north{
-	network = list("ss13","rd")
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/trinary/mixer{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "ggP" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/trimline/yellow/filled/corner{
@@ -17747,16 +17710,6 @@
 /obj/effect/spawner/random/structure/crate,
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/central)
-"gop" = (
-/obj/effect/landmark/blobstart,
-/obj/structure/closet/crate/science{
-	opened = 1;
-	icon_state = "scicrateopen"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "goB" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/tracks,
@@ -18433,14 +18386,6 @@
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
-"gzF" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "gzL" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
@@ -18478,6 +18423,13 @@
 /mob/living/basic/carp/pet/lia,
 /turf/open/floor/carpet/red,
 /area/station/command/heads_quarters/hos)
+"gAV" = (
+/obj/structure/tank_dispenser,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/radio/intercom/directional/north,
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "gAZ" = (
 /obj/machinery/atmospherics/components/binary/pump/off{
 	dir = 8;
@@ -19652,15 +19604,6 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"gWv" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/purple{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
 "gWG" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/security/glass{
@@ -19845,6 +19788,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/science)
+"gZF" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "gZI" = (
 /obj/structure/dresser,
 /obj/machinery/airalarm/directional/west,
@@ -20315,6 +20263,17 @@
 /obj/structure/lattice,
 /turf/open/misc/asteroid/airless,
 /area/space/nearstation)
+"hhd" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "ordauxgarage";
+	dir = 1
+	},
+/obj/effect/turf_decal/sand/plating,
+/obj/effect/turf_decal/stripes/asteroid/end{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/station/science/ordnance)
 "hhC" = (
 /obj/structure/railing{
 	dir = 5
@@ -20822,10 +20781,6 @@
 /obj/structure/sign/poster/official/random/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"hqA" = (
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/engine/o2,
-/area/station/science/ordnance)
 "hqF" = (
 /obj/machinery/conveyor/auto/inverted{
 	dir = 6;
@@ -21643,6 +21598,14 @@
 /obj/machinery/atmospherics/components/tank/plasma,
 /turf/open/misc/asteroid,
 /area/station/maintenance/disposal/incinerator)
+"hFz" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/machinery/light/directional/east,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "hFA" = (
 /obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/stripes/asteroid/line{
@@ -22531,6 +22494,15 @@
 "hVB" = (
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
+"hVC" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "hVL" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -22677,6 +22649,15 @@
 /obj/structure/cable,
 /turf/open/floor/iron/textured_large,
 /area/station/engineering/storage/tech)
+"hYG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "hYP" = (
 /obj/machinery/modular_computer/preset/id{
 	dir = 1
@@ -22923,6 +22904,11 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating,
 /area/station/cargo/miningoffice)
+"ief" = (
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/ordnance/storage)
 "iej" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 1
@@ -23006,6 +22992,18 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/medical/storage)
+"ifv" = (
+/obj/machinery/atmospherics/components/trinary/mixer{
+	dir = 4
+	},
+/obj/machinery/camera/autoname/directional/north{
+	network = list("ss13","rd")
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "ifE" = (
 /obj/machinery/vending/medical,
 /obj/effect/turf_decal/tile/blue/fourcorners,
@@ -23420,11 +23418,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
-"ioL" = (
-/obj/item/radio/intercom/directional/east,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "ioP" = (
 /obj/structure/cable/multilayer/multiz,
 /obj/effect/decal/cleanable/dirt,
@@ -24812,15 +24805,6 @@
 /obj/effect/turf_decal/trimline/yellow/filled/corner,
 /turf/open/floor/iron,
 /area/station/engineering/lobby)
-"iOZ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/south,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "iPd" = (
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/carpet/executive,
@@ -24915,13 +24899,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/station/engineering/main)
-"iQK" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{
-	dir = 4;
-	chamber_id = "o2ordance"
-	},
-/turf/open/floor/engine/o2,
-/area/station/science/ordnance)
 "iQS" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -24945,6 +24922,14 @@
 /obj/item/newspaper,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
+"iRy" = (
+/obj/machinery/door/airlock/command{
+	name = "Research Director's Observatory"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/science/rd,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/command/heads_quarters/rd)
 "iRB" = (
 /obj/effect/turf_decal/tile/dark_blue/half/contrasted{
 	dir = 1
@@ -25344,16 +25329,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"jbr" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "jbG" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 1
@@ -25544,12 +25519,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
-"jeR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "jeY" = (
 /obj/structure/railing/corner{
 	dir = 1
@@ -25784,14 +25753,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/service/theater)
-"jiI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/binary/valve/digital{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "jiN" = (
 /obj/docking_port/stationary/syndicate,
 /turf/open/space/openspace,
@@ -26604,14 +26565,6 @@
 /obj/structure/chair/stool/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/command/corporate_showroom)
-"jxn" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "jxq" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -27122,17 +27075,6 @@
 	},
 /turf/open/floor/engine,
 /area/station/medical/chemistry)
-"jEw" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/closet/crate/science{
-	opened = 1;
-	icon_state = "scicrateopen"
-	},
-/obj/item/tank,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "jED" = (
 /obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron/freezer,
@@ -27322,23 +27264,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
-"jHU" = (
-/obj/machinery/door/poddoor/shutters/window/preopen{
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/button/door/directional/east{
-	req_access = list("ordnance");
-	name = "Ordnance Storage Shutter Control";
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 4
-	},
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "jIc" = (
 /obj/machinery/light/warm/directional/east,
 /obj/effect/turf_decal/siding/wood/corner{
@@ -27588,6 +27513,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse/upper)
+"jLY" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
+	dir = 1
+	},
+/obj/machinery/meter,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "jMa" = (
 /obj/machinery/light/dim/directional/south,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
@@ -27607,11 +27539,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/service/cafeteria)
-"jMh" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
 "jMy" = (
 /obj/structure/railing/corner{
 	dir = 1
@@ -28280,16 +28207,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/maintenance/department/cargo)
-"jZu" = (
-/obj/machinery/light/directional/north,
-/obj/structure/table,
-/obj/item/hand_labeler{
-	pixel_y = 10;
-	pixel_x = -13
-	},
-/obj/item/folder,
-/turf/open/floor/glass/reinforced,
-/area/station/science/xenobiology)
+"jZv" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/ordnance/storage)
 "jZx" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/iron/textured,
@@ -28767,16 +28690,6 @@
 	dir = 1
 	},
 /area/station/cargo/bitrunning/den)
-"khj" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/purple{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
 "khA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/trunk{
@@ -28967,15 +28880,6 @@
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 /turf/open/floor/plating,
 /area/station/maintenance/department/cargo)
-"kkh" = (
-/obj/structure/window/spawner/directional/east,
-/obj/machinery/power/apc/auto_name/directional/south{
-	areastring = "/area/station/science/ordnance/burnchamber"
-	},
-/obj/structure/cable,
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "kki" = (
 /obj/machinery/fax{
 	fax_name = "Quartermaster's Office";
@@ -30038,14 +29942,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/maintenance/port/lesser)
-"kAI" = (
-/obj/machinery/door/airlock/maintenance_hatch,
-/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/station/science/ordnance/testlab)
 "kAW" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -30303,16 +30199,6 @@
 	},
 /turf/open/floor/iron/freezer,
 /area/station/commons/toilet/restrooms)
-"kEM" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "kFi" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -30413,15 +30299,6 @@
 	dir = 8
 	},
 /area/station/hallway/secondary/exit/departure_lounge)
-"kGK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
-	dir = 8
-	},
-/obj/machinery/meter,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "kGS" = (
 /turf/closed/wall/rust,
 /area/station/maintenance/department/medical)
@@ -30680,6 +30557,16 @@
 	luminosity = 2
 	},
 /area/station/science/ordnance/bomb)
+"kMl" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "kMr" = (
 /obj/structure/transport/linear/public,
 /obj/machinery/elevator_control_panel/directional/north{
@@ -30835,13 +30722,6 @@
 /obj/machinery/firealarm/directional/east,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
-"kPx" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/machinery/portable_atmospherics/scrubber/huge/movable,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "kQa" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -31292,16 +31172,6 @@
 /obj/machinery/computer/records/security,
 /turf/open/floor/iron,
 /area/station/command/bridge)
-"kXT" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/poddoor/shutters/window/preopen{
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "kXV" = (
 /obj/structure/cable,
 /obj/structure/plaque/static_plaque/golden/commission/wawa,
@@ -31346,10 +31216,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/chemistry/minisat)
-"kYt" = (
-/obj/structure/cable,
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "kYu" = (
 /turf/closed/wall/r_wall,
 /area/station/ai_monitored/turret_protected/aisat/teleporter)
@@ -31364,18 +31230,6 @@
 	},
 /turf/open/floor/iron/herringbone,
 /area/station/hallway/primary/central)
-"kYS" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
-	dir = 5
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/machinery/computer/atmos_control/oxygen_tank{
-	atmos_chambers = list(o2ordance="Oxygen                                                                Supply")
-	},
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "kYT" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/department/medical)
@@ -31471,6 +31325,16 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"kZW" = (
+/obj/machinery/door/airlock/research{
+	glass = 1;
+	name = "Slime Euthanization Chamber";
+	opacity = 0
+	},
+/obj/effect/turf_decal/tile/blue/fourcorners,
+/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
+/turf/open/floor/glass/reinforced,
+/area/station/science/xenobiology)
 "laf" = (
 /obj/effect/spawner/random/structure/chair_comfy{
 	dir = 4
@@ -31507,6 +31371,11 @@
 /obj/effect/landmark/start/lawyer,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
+"laD" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "laF" = (
 /obj/structure/closet{
 	name = "evidence closet 1"
@@ -32300,12 +32169,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/engineering/break_room)
-"lrA" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
-	dir = 5
-	},
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/storage)
 "lrF" = (
 /obj/effect/turf_decal/siding/red{
 	dir = 10
@@ -33252,16 +33115,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
-"lIF" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/pipe_dispenser{
-	pixel_x = 3;
-	pixel_y = 7
-	},
-/obj/item/pipe_dispenser,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "lIZ" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/machinery/vending/boozeomat/all_access,
@@ -33432,6 +33285,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/carpet/blue,
 /area/station/command/heads_quarters/cmo)
+"lMC" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "lMI" = (
 /obj/effect/spawner/random/structure/closet_maintenance,
 /turf/open/floor/plating,
@@ -34229,16 +34092,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/security/lockers)
-"mbQ" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "mbZ" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -34335,11 +34188,6 @@
 /obj/item/electronics/airlock,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/ai_monitored/turret_protected/aisat/uppersouth)
-"meI" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/closet/firecloset,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "meL" = (
 /obj/effect/landmark/event_spawn,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34738,6 +34586,11 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
 /area/station/command/gateway)
+"mkV" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/testlab)
 "mkX" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing{
@@ -35047,13 +34900,6 @@
 /obj/effect/spawner/random/structure/steam_vent,
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
-"mqb" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "mqc" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/food/icecreamsandwich,
@@ -35627,6 +35473,15 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+"mAC" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/camera/autoname/directional/north{
+	network = list("ss13","rd")
+	},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "mAF" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
@@ -36470,15 +36325,6 @@
 /obj/effect/spawner/random/trash/garbage,
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
-"mQd" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "mQk" = (
 /obj/effect/spawner/random/vending/colavend,
 /obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -36559,6 +36405,16 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/station/engineering/main)
+"mSe" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+	dir = 10
+	},
+/obj/structure/railing/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "mSf" = (
 /obj/machinery/mass_driver{
 	dir = 1;
@@ -36574,14 +36430,6 @@
 /obj/item/clothing/head/fedora,
 /turf/open/floor/wood,
 /area/station/commons/lounge)
-"mSG" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
-	dir = 1
-	},
-/obj/machinery/meter,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "mSK" = (
 /turf/open/floor/iron/white,
 /area/station/commons/fitness/recreation)
@@ -36597,6 +36445,18 @@
 	},
 /turf/open/floor/engine,
 /area/station/science/explab)
+"mTg" = (
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	id = "ordstorage"
+	},
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "mTs" = (
 /obj/machinery/holopad,
 /obj/effect/landmark/event_spawn,
@@ -37086,12 +36946,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/space/basic,
 /area/space/nearstation)
-"nbF" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "nbG" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 8
@@ -37129,13 +36983,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
-"ncB" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
 "ncM" = (
 /obj/structure/railing{
 	dir = 1
@@ -37213,6 +37060,11 @@
 	},
 /turf/closed/wall,
 /area/station/service/bar)
+"ndE" = (
+/obj/machinery/door/airlock/maintenance_hatch,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/plating,
+/area/station/science/ordnance/testlab)
 "ndI" = (
 /obj/structure/table,
 /obj/item/hand_labeler,
@@ -37258,6 +37110,20 @@
 /obj/machinery/digital_clock/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/paramedic)
+"neb" = (
+/obj/structure/table,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/item/pipe_dispenser{
+	pixel_x = 3;
+	pixel_y = 7
+	},
+/obj/item/pipe_dispenser,
+/obj/machinery/power/apc/auto_name/directional/south{
+	areastring = "/area/station/science/ordnance/burnchamber"
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "nee" = (
 /turf/open/floor/iron/dark/corner{
 	dir = 4
@@ -37789,7 +37655,7 @@
 	id = "qmprivacy";
 	name = "Privacy Shutters Control"
 	},
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_y = 12
 	},
 /turf/open/floor/wood,
@@ -37933,19 +37799,6 @@
 	},
 /turf/open/floor/iron/white/smooth_large,
 /area/station/medical/treatment_center)
-"npE" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -2;
-	pixel_y = 8
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 3;
-	pixel_y = -2
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "npH" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
@@ -37987,6 +37840,12 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/security/medical)
+"nqi" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "nql" = (
 /obj/effect/turf_decal/tile/red{
 	dir = 1
@@ -38710,17 +38569,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/cmo)
-"nFN" = (
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/poddoor/shutters/window/preopen{
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "nFS" = (
 /obj/structure/closet/wardrobe/white,
 /obj/item/restraints/handcuffs/cable/zipties,
@@ -38755,15 +38603,6 @@
 	},
 /turf/open/floor/engine/co2,
 /area/station/engineering/atmos)
-"nGt" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/button/door/directional/east{
-	name = "shutter control";
-	id = "ordauxgarage"
-	},
-/obj/structure/tank_dispenser,
-/turf/open/floor/plating,
-/area/station/science/ordnance)
 "nGv" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/effect/mapping_helpers/airlock/access/all/supply/general,
@@ -38778,6 +38617,16 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/prison)
+"nGV" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk/multiz{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "nHj" = (
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor/iron,
@@ -39079,15 +38928,6 @@
 /obj/machinery/light/directional/south,
 /turf/open/openspace,
 /area/station/science/xenobiology)
-"nMh" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8;
-	name = "Oxygen Chamber Injection Port"
-	},
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "nMj" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/mapping_helpers/broken_floor,
@@ -39220,6 +39060,10 @@
 /obj/effect/turf_decal/tile/dark_blue,
 /turf/open/floor/iron,
 /area/station/command/bridge)
+"nPw" = (
+/obj/structure/water_source/puddle,
+/turf/open/floor/grass,
+/area/station/security/prison/garden)
 "nPM" = (
 /obj/effect/turf_decal/trimline/yellow/filled/line{
 	dir = 4
@@ -39374,13 +39218,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"nTZ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "nUi" = (
 /obj/structure/table/reinforced/rglass,
 /obj/item/clipboard,
@@ -39416,6 +39253,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/station/science/xenobiology)
+"nVm" = (
+/obj/machinery/computer/camera_advanced/xenobio{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/item/storage/box/monkeycubes,
+/turf/open/floor/iron/white/textured_large,
+/area/station/science/xenobiology)
 "nVp" = (
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 8
@@ -39609,6 +39456,13 @@
 	dir = 8
 	},
 /area/station/engineering/atmos/storage/gas)
+"nZW" = (
+/obj/structure/barricade/wooden,
+/obj/machinery/atmospherics/components/binary/pump/on/green/visible{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "nZY" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/structure/reagent_dispensers/watertank,
@@ -39622,6 +39476,26 @@
 /obj/machinery/digital_clock/directional/south,
 /turf/open/floor/iron/dark/textured,
 /area/station/science/robotics/lab)
+"oag" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/item/pen{
+	pixel_x = -4;
+	pixel_y = 5
+	},
+/obj/item/storage/box/beakers{
+	pixel_x = 24;
+	pixel_y = 6
+	},
+/obj/item/storage/box/syringes{
+	pixel_x = 11;
+	pixel_y = 4
+	},
+/turf/open/floor/glass/reinforced,
+/area/station/science/xenobiology)
 "oas" = (
 /obj/structure/table,
 /obj/item/phone{
@@ -39800,6 +39674,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/access/all/security/entrance,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/scanner_gate/preset_guns,
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
 "odG" = (
@@ -39878,18 +39753,6 @@
 /obj/machinery/recharger,
 /turf/open/floor/iron,
 /area/station/security)
-"oeX" = (
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -5;
-	pixel_y = 6
-	},
-/obj/item/pen{
-	pixel_x = 9;
-	pixel_y = 4
-	},
-/turf/open/floor/glass/reinforced,
-/area/station/science/xenobiology)
 "ofc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
@@ -40076,6 +39939,22 @@
 	},
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
+"okf" = (
+/obj/machinery/light/directional/south,
+/obj/structure/table,
+/obj/item/clothing/mask/gas{
+	pixel_x = 8
+	},
+/obj/item/clothing/mask/gas{
+	pixel_y = 5;
+	pixel_x = 16
+	},
+/obj/item/clothing/mask/gas{
+	pixel_x = 12;
+	pixel_y = 2
+	},
+/turf/open/floor/glass/reinforced,
+/area/station/science/xenobiology)
 "okg" = (
 /obj/machinery/holopad,
 /obj/effect/landmark/event_spawn,
@@ -40552,6 +40431,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/station/maintenance/department/bridge)
+"otJ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "otY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/spawner/random/structure/closet_empty/crate,
@@ -40618,10 +40504,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/service/cafeteria)
-"ouM" = (
-/obj/structure/railing/corner,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "ouQ" = (
 /obj/structure/closet/crate/engineering,
 /obj/item/stack/sheet/mineral/plasma/five,
@@ -40889,11 +40771,6 @@
 	},
 /turf/open/openspace,
 /area/station/science/lobby)
-"oAt" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/structure/cable,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/ordnance/storage)
 "oAH" = (
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
@@ -41144,6 +41021,15 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
+"oEP" = (
+/obj/structure/window/spawner/directional/east,
+/obj/machinery/portable_atmospherics/pump,
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "oEZ" = (
 /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible,
 /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
@@ -42625,16 +42511,6 @@
 /obj/machinery/holopad,
 /turf/open/floor/iron,
 /area/station/engineering/main)
-"pfX" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8;
-	name = "Oxygen Chamber Injection Port"
-	},
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/ordnance/storage)
 "pgd" = (
 /obj/structure/chair{
 	dir = 1;
@@ -43389,6 +43265,13 @@
 	},
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"psQ" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/portable_atmospherics/pipe_scrubber,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "psT" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -44265,6 +44148,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/station/cargo/warehouse/upper)
+"pIk" = (
+/obj/structure/closet/crate/science{
+	opened = 1;
+	icon_state = "scicrateopen"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line,
+/obj/item/tank,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "pIp" = (
 /obj/structure/railing{
 	dir = 4
@@ -45808,6 +45701,12 @@
 /obj/structure/window/spawner/directional/north,
 /turf/open/misc/grass,
 /area/station/ai_monitored/turret_protected/aisat/foyer)
+"qjs" = (
+/obj/machinery/camera/autoname/directional/south{
+	network = list("ss13","rd")
+	},
+/turf/open/floor/catwalk_floor/iron_white,
+/area/station/science/ordnance/testlab)
 "qjw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
@@ -46140,11 +46039,6 @@
 /obj/effect/mapping_helpers/mob_buckler,
 /turf/open/floor/iron/checker,
 /area/station/maintenance/department/medical)
-"qqd" = (
-/obj/effect/turf_decal/sand/plating,
-/obj/structure/broken_flooring/pile,
-/turf/open/floor/plating,
-/area/station/science/ordnance)
 "qqh" = (
 /obj/machinery/computer/apc_control{
 	dir = 1
@@ -46298,6 +46192,13 @@
 /obj/machinery/air_sensor/nitrous_tank,
 /turf/open/floor/engine/n2o,
 /area/station/engineering/atmos)
+"qsj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/tank/oxygen{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "qsu" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/rnd/production/protolathe/department/engineering,
@@ -46779,6 +46680,18 @@
 	},
 /turf/open/floor/carpet,
 /area/station/medical/psychology)
+"qDM" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/machinery/portable_atmospherics/canister,
+/obj/effect/turf_decal/box/red,
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "qDP" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -46912,20 +46825,21 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/station/ai_monitored/command/storage/eva)
-"qGr" = (
-/obj/machinery/door/poddoor/shutters/window/preopen{
-	id = "ordstorage"
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/effect/turf_decal/caution/stand_clear/red,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
 "qGB" = (
 /obj/machinery/ticket_machine/directional/north,
 /obj/structure/chair/sofa/bench,
 /turf/open/floor/iron/white,
 /area/station/medical/exam_room)
+"qGD" = (
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/iron/white/textured_large,
+/area/station/science/xenobiology)
 "qGN" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/random/entertainment/deck,
@@ -47419,13 +47333,6 @@
 /obj/structure/flora/coconuts,
 /turf/open/floor/grass,
 /area/station/science/genetics)
-"qQG" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/trinary/mixer{
-	dir = 4
-	},
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "qQK" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -47595,6 +47502,14 @@
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/plating,
 /area/station/maintenance/department/engine)
+"qUi" = (
+/obj/machinery/processor/slime,
+/obj/effect/turf_decal/bot_red,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/iron/white/textured_large,
+/area/station/science/xenobiology)
 "qUl" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/structure/table,
@@ -47637,13 +47552,6 @@
 	dir = 1
 	},
 /area/station/engineering/atmos)
-"qVB" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "qVD" = (
 /obj/structure/railing,
 /obj/structure/table,
@@ -47762,14 +47670,6 @@
 /obj/effect/turf_decal/tile/brown/fourcorners,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
-"qWZ" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/portable_atmospherics/canister,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "qXa" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -47808,6 +47708,12 @@
 /obj/effect/spawner/random/techstorage/security_all,
 /turf/open/floor/iron/textured,
 /area/station/engineering/storage/tech)
+"qXE" = (
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/structure/sign/poster/official/wtf_is_co2/directional/north,
+/obj/machinery/light_switch/directional/east,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/ordnance/storage)
 "qXK" = (
 /obj/effect/turf_decal/tile/red,
 /obj/effect/landmark/event_spawn,
@@ -48132,6 +48038,11 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron,
 /area/station/security/mechbay)
+"rcH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/wrench,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "rcP" = (
 /obj/effect/turf_decal/stripes/asteroid/corner,
 /turf/open/misc/asteroid,
@@ -48269,16 +48180,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/exam_room)
-"reH" = (
-/obj/machinery/door/airlock/research{
-	glass = 1;
-	name = "Slime Euthanization Chamber";
-	opacity = 0
-	},
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/mapping_helpers/airlock/access/all/science/xenobio,
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "reI" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -48811,18 +48712,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/engineering/atmos/upper)
-"rlP" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "rlU" = (
 /obj/structure/railing/corner,
 /turf/open/floor/iron,
@@ -50215,11 +50104,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/security/detective,
 /turf/open/floor/carpet,
 /area/station/security/detectives_office)
-"rJQ" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/structure/sign/poster/official/wtf_is_co2/directional/north,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/ordnance/storage)
 "rJW" = (
 /obj/machinery/computer/shuttle/labor{
 	dir = 8
@@ -50312,11 +50196,6 @@
 	dir = 1
 	},
 /area/station/science/breakroom)
-"rLX" = (
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/command/heads_quarters/rd)
 "rMj" = (
 /obj/structure/closet/secure_closet/hydroponics,
 /obj/effect/turf_decal/stripes/line,
@@ -50398,6 +50277,12 @@
 /obj/item/holosign_creator/robot_seat/restaurant,
 /turf/open/floor/iron/kitchen,
 /area/station/service/kitchen)
+"rPh" = (
+/obj/effect/turf_decal/sand/plating,
+/obj/machinery/light/small/directional/south,
+/obj/structure/broken_flooring/pile,
+/turf/open/floor/plating,
+/area/station/science/ordnance)
 "rPi" = (
 /obj/structure/flora/bush/flowers_br/style_random,
 /obj/structure/window/spawner/directional/west,
@@ -50460,6 +50345,11 @@
 /obj/structure/sign/poster/contraband/random/directional/north,
 /turf/open/floor/iron/white,
 /area/station/maintenance/department/medical)
+"rPV" = (
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
 "rQb" = (
 /obj/effect/turf_decal/siding/thinplating_new/end,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -50616,14 +50506,6 @@
 	dir = 1
 	},
 /area/station/engineering/atmos)
-"rSB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "rSF" = (
 /obj/effect/turf_decal/siding,
 /obj/structure/table,
@@ -50921,7 +50803,7 @@
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "rWI" = (
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/turf_decal/bot{
 	dir = 1
 	},
@@ -50969,6 +50851,14 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/command/heads_quarters/qm)
+"rXf" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 6
+	},
+/turf/open/floor/glass/reinforced,
+/area/station/science/xenobiology)
 "rXg" = (
 /obj/structure/spirit_board,
 /obj/item/storage/box/bodybags{
@@ -51184,6 +51074,14 @@
 /obj/machinery/holopad,
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
+"rZE" = (
+/obj/machinery/portable_atmospherics/pump,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "rZJ" = (
 /obj/effect/turf_decal/siding/thinplating_new,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -51407,7 +51305,7 @@
 /turf/closed/wall,
 /area/station/cargo/storage)
 "sdn" = (
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/glass/reinforced/plasma,
 /area/station/command/heads_quarters/rd)
 "sdA" = (
@@ -51417,6 +51315,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/security/execution/transfer)
+"sdB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/broken/directional/north,
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "sdW" = (
 /obj/structure/railing{
 	dir = 9
@@ -51933,6 +51837,15 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"smH" = (
+/obj/machinery/atmospherics/components/binary/valve/digital{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "smM" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -52123,15 +52036,6 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
-"sqc" = (
-/obj/structure/window/spawner/directional/east,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/machinery/portable_atmospherics/pump,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "sqk" = (
 /obj/machinery/biogenerator,
 /obj/effect/turf_decal/siding/wood{
@@ -52387,6 +52291,14 @@
 	},
 /turf/open/floor/engine/xenobio,
 /area/station/science/xenobiology)
+"suo" = (
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	id = "ordstorage"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/caution/stand_clear/red,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "suq" = (
 /obj/effect/landmark/start/station_engineer,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -53623,14 +53535,6 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/science/xenobiology)
-"sQU" = (
-/obj/machinery/light/directional/south,
-/obj/structure/table,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/open/floor/glass/reinforced,
-/area/station/science/xenobiology)
 "sRj" = (
 /obj/structure/sign/poster/official/random/directional/east,
 /obj/effect/turf_decal/siding/purple{
@@ -54074,10 +53978,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/paramedic)
-"sZp" = (
-/obj/machinery/camera/autoname/directional/west,
-/turf/open/floor/catwalk_floor/iron_white,
-/area/station/science/ordnance/testlab)
 "sZs" = (
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/siding/wood,
@@ -54402,17 +54302,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/satellite)
-"tgS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
-	dir = 6
-	},
-/obj/item/flashlight/glowstick/blue{
-	start_on = 1;
-	light_range = 2
-	},
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
 "tgW" = (
 /obj/machinery/door/airlock/medical{
 	name = "Primary Surgical Theatre"
@@ -55317,11 +55206,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance)
-"tvQ" = (
-/obj/structure/chair/sofa/bench,
-/obj/effect/landmark/start/prisoner,
-/turf/open/floor/iron,
-/area/station/security/prison)
 "twf" = (
 /obj/machinery/door/poddoor/shutters/radiation/preopen{
 	id = "soup";
@@ -55441,17 +55325,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/station/service/cafeteria)
-"tzv" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/red,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "tzw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -56184,13 +56057,6 @@
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/station/commons/lounge)
-"tLL" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/item/holosign_creator/atmos,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "tLO" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/cable,
@@ -56616,6 +56482,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
+"tRZ" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "tSc" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
@@ -56736,7 +56609,7 @@
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp,
 /obj/machinery/camera/autoname/directional/north,
-/obj/machinery/keycard_auth/directional/north,
+/obj/machinery/keycard_auth/wall_mounted/directional/north,
 /turf/open/floor/carpet/green,
 /area/station/command/heads_quarters/hop)
 "tUG" = (
@@ -57055,6 +56928,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/station/maintenance/department/science)
+"uaw" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/purple{
+	dir = 4
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/command/heads_quarters/rd)
 "uay" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/white/line{
@@ -57991,7 +57875,7 @@
 	dir = 10
 	},
 /obj/structure/cable,
-/obj/machinery/keycard_auth/directional/west{
+/obj/machinery/keycard_auth/wall_mounted/directional/west{
 	pixel_y = -10
 	},
 /obj/item/pen/screwdriver,
@@ -58377,6 +58261,15 @@
 	},
 /turf/open/floor/iron/dark/corner,
 /area/station/engineering/atmos)
+"uya" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "uyc" = (
 /obj/machinery/light/cold/directional/west,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -58583,6 +58476,16 @@
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating/airless,
 /area/station/asteroid)
+"uBU" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "uCj" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/red/opposingcorners{
@@ -58698,16 +58601,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/research)
-"uDT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{
-	dir = 8
-	},
-/obj/structure/disposalpipe/trunk/multiz{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "uDZ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58863,12 +58756,6 @@
 /obj/machinery/camera/autoname/directional/north,
 /turf/open/floor/iron/white,
 /area/station/hallway/secondary/entry)
-"uHz" = (
-/obj/structure/lattice/catwalk,
-/turf/open/openspace{
-	initial_gas_mix = "n2=100;TEMP=80"
-	},
-/area/station/science/xenobiology)
 "uHA" = (
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 8
@@ -58974,9 +58861,7 @@
 "uJq" = (
 /obj/machinery/computer/records/medical,
 /obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/computer/security/telescreen/cmo/directional/north{
-	name = "Medbay Monitor"
-	},
+/obj/machinery/computer/security/telescreen/med_sec/directional/north,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/medical)
 "uJt" = (
@@ -60471,10 +60356,6 @@
 /obj/machinery/light/directional/south,
 /turf/open/openspace,
 /area/station/security/warden)
-"vlz" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance)
 "vlD" = (
 /obj/structure/table/wood,
 /obj/machinery/light_switch/directional/north,
@@ -60545,6 +60426,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
+"vmH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/broken_canister_frame,
+/obj/structure/sign/poster/random/directional/west,
+/turf/open/floor/plating,
+/area/station/maintenance/department/science)
 "vnb" = (
 /obj/machinery/door/poddoor/incinerator_atmos_aux,
 /turf/open/floor/engine/airless,
@@ -61231,6 +61118,15 @@
 	dir = 8
 	},
 /area/station/science/xenobiology)
+"vBN" = (
+/obj/structure/window/spawner/directional/east,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/science/ordnance)
 "vBV" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -61332,10 +61228,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output,
 /turf/open/floor/engine/plasma,
 /area/station/engineering/atmos)
-"vEA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/openspace/xenobio,
-/area/station/science/xenobiology)
 "vEE" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
@@ -61468,6 +61360,12 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/lobby)
+"vFL" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "vFM" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -61941,14 +61839,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/station/hallway/primary/central)
-"vOp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
 "vOs" = (
 /obj/machinery/airalarm/directional/south,
 /obj/structure/tank_holder/extinguisher,
@@ -62108,9 +61998,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/command/storage/eva)
-"vRp" = (
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
 "vRt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -62208,14 +62095,6 @@
 /obj/machinery/camera/autoname/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
-"vSF" = (
-/obj/machinery/door/airlock/command{
-	name = "Research Director's Observatory"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/science/rd,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/station/science/ordnance/testlab)
 "vSH" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	name = "Plasma to Pure"
@@ -62299,6 +62178,16 @@
 	},
 /turf/open/floor/iron/solarpanel/airless,
 /area/station/solars/port)
+"vUk" = (
+/obj/machinery/atmospherics/components/trinary/mixer{
+	dir = 4
+	},
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "vUn" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -63182,6 +63071,19 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/textured_large,
 /area/station/service/hydroponics/garden)
+"wlO" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 1
+	},
+/obj/effect/turf_decal/box/red,
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "wlR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /turf/open/floor/plating,
@@ -63664,6 +63566,12 @@
 /obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
 /turf/open/floor/wood/tile,
 /area/station/service/bar)
+"wvs" = (
+/obj/structure/chair/sofa/bench,
+/obj/effect/landmark/start/prisoner,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/security/prison)
 "wvt" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /obj/effect/mapping_helpers/airlock/access/any/supply/maintenance,
@@ -64538,6 +64446,10 @@
 "wKO" = (
 /turf/open/floor/glass,
 /area/station/maintenance/department/medical)
+"wKR" = (
+/obj/machinery/portable_atmospherics/canister,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/ordnance/storage)
 "wKT" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible{
@@ -64666,11 +64578,6 @@
 /obj/effect/turf_decal/siding,
 /turf/open/floor/iron/textured,
 /area/station/science/lobby)
-"wMC" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/command/heads_quarters/rd)
 "wME" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -64913,6 +64820,13 @@
 	},
 /turf/open/floor/iron,
 /area/station/security/brig/entrance)
+"wRL" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "wRN" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
@@ -66525,6 +66439,22 @@
 /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"xvo" = (
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	id = "ordstorage"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/button/door/directional/east{
+	req_access = list("ordnance");
+	name = "Ordnance Storage Shutter Control";
+	id = "ordstorage"
+	},
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "xvr" = (
 /obj/machinery/computer/prisoner/management{
 	dir = 1
@@ -66655,6 +66585,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
+"xxN" = (
+/obj/machinery/light/small/dim/directional/north,
+/obj/machinery/atmospherics/components/unary/passive_vent,
+/turf/open/floor/engine/o2,
+/area/station/science/ordnance)
 "xxO" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/structure/flora/bush/fullgrass/style_random,
@@ -66679,6 +66614,15 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/wood,
 /area/station/service/library)
+"xxY" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+	dir = 8
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "xyG" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/directional/south,
@@ -67183,10 +67127,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
-"xHo" = (
-/obj/item/radio/intercom/chapel/directional/west,
-/turf/open/floor/catwalk_floor/iron_white,
-/area/station/science/ordnance/testlab)
 "xHB" = (
 /obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2,
@@ -67279,6 +67219,15 @@
 	},
 /turf/open/floor/circuit,
 /area/station/ai_monitored/turret_protected/ai_upload)
+"xJK" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/poddoor/shutters/window/preopen{
+	id = "ordstorage"
+	},
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance/storage)
 "xJQ" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 4
@@ -67290,6 +67239,14 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/medical/exam_room)
+"xJR" = (
+/obj/machinery/portable_atmospherics/canister,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	dir = 8
+	},
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "xJT" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 8
@@ -67420,7 +67377,7 @@
 	name = "Captain's Fax Machine"
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/keycard_auth/directional/south{
+/obj/machinery/keycard_auth/wall_mounted/directional/south{
 	pixel_y = -24;
 	pixel_x = 8
 	},
@@ -67703,12 +67660,14 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark/textured_half,
 /area/station/cargo/storage)
-"xSO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/north,
-/obj/machinery/atmospherics/components/tank/oxygen,
-/turf/open/floor/plating,
-/area/station/maintenance/department/science)
+"xSW" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/iron/white/smooth_half{
+	dir = 8
+	},
+/area/station/science/xenobiology)
 "xTa" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/preopen{
@@ -68024,6 +67983,12 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/station/service/bar)
+"xYE" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
+	dir = 5
+	},
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
 "xYG" = (
 /obj/effect/turf_decal/trimline/blue/filled/line{
 	dir = 4
@@ -68116,17 +68081,11 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
-"yav" = (
-/obj/structure/table,
-/obj/item/storage/box/syringes{
-	pixel_x = -8;
-	pixel_y = 11
-	},
-/obj/item/storage/box/beakers{
-	pixel_x = 4
-	},
-/turf/open/floor/glass/reinforced,
-/area/station/science/xenobiology)
+"yaH" = (
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/iron/white/smooth_large,
+/area/station/science/ordnance/storage)
 "yaM" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
@@ -68186,14 +68145,6 @@
 /obj/machinery/shower/directional/north,
 /turf/open/floor/iron/showroomfloor,
 /area/station/engineering/main)
-"ybW" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/portable_atmospherics/scrubber,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/ordnance)
 "yca" = (
 /obj/machinery/door/airlock/research/glass{
 	name = "Chemistry Lab"
@@ -82515,7 +82466,7 @@ iUF
 dUc
 xrb
 xrb
-dEG
+nPw
 dEG
 iqf
 cKn
@@ -84319,7 +84270,7 @@ hME
 hME
 tSc
 wUe
-tvQ
+wvs
 imQ
 rhY
 tsk
@@ -105925,7 +105876,7 @@ fYe
 vxX
 vxX
 vfJ
-xAd
+gZF
 oBP
 xAd
 kHG
@@ -108502,7 +108453,7 @@ foX
 aku
 ouA
 jJe
-gOY
+ilp
 gOY
 gOY
 gOY
@@ -108759,15 +108710,15 @@ foX
 aku
 aku
 ilp
+ilp
 gOY
-hqA
-cSc
+xxN
 aam
-kYS
+xYE
 boy
 gql
 abh
-uDT
+nGV
 uPL
 sSN
 nal
@@ -109016,13 +108967,13 @@ rji
 foX
 ilp
 ilp
+jTB
+jTB
+jTB
 gOY
-iQK
-awS
-epZ
-qQG
-atb
-qVB
+vUk
+wlO
+nqi
 iOH
 fQr
 gOY
@@ -109272,14 +109223,14 @@ uOo
 aku
 aku
 ilp
-ilp
 jTB
-ccz
-lrA
+jTB
+ief
+jZv
 gOY
-ggN
-rlP
-nTZ
+ifv
+kMl
+cZs
 urY
 czh
 uPL
@@ -109530,15 +109481,15 @@ aku
 ilp
 ilp
 jTB
-jTB
-pfX
-nMh
-gOY
-rSB
+jGd
+eBH
+otJ
+mTg
+hYG
 bwj
-mSG
+jLY
 rSh
-biT
+xJR
 gOY
 wOn
 gOY
@@ -109787,13 +109738,13 @@ aku
 ilp
 ilp
 jTB
-jGd
-eBH
-jeR
-nFN
-jiI
+dkr
+hbH
+naU
+bmr
+smH
 lCw
-vlz
+fDz
 fDz
 fDz
 bPc
@@ -110044,13 +109995,13 @@ uro
 rji
 ilp
 jTB
-dkr
-hbH
-naU
-bmr
-kGK
+sqJ
+wiT
+rBt
+suo
+lMC
 aMG
-vlz
+fDz
 xTs
 fDz
 fDz
@@ -110301,13 +110252,13 @@ aku
 ilp
 ilp
 jTB
-sqJ
-wiT
-rBt
-aPG
-mQd
-mqb
-vlz
+dEn
+lIn
+tra
+suo
+xxY
+aMG
+fDz
 fDz
 mfC
 fDz
@@ -110558,19 +110509,19 @@ aku
 ilp
 ilp
 jTB
-dEn
-lIn
-tra
-qGr
-gzF
-kEM
+gbV
+jqY
+rus
+xJK
+hVC
+uya
 fDz
 fDz
 fDz
 oWy
 fDz
 dyd
-tzv
+qDM
 gOY
 cxg
 vxX
@@ -110815,11 +110766,11 @@ aku
 ilp
 ilp
 jTB
-gbV
-jqY
-rus
-kXT
-jxn
+wKR
+wKR
+vFL
+xvo
+mSe
 nCo
 tGW
 tGW
@@ -111072,14 +111023,14 @@ aku
 ieo
 ilp
 jTB
-rJQ
-oAt
-bQA
-jHU
-ouM
+jTB
+qXE
+yaH
+gOY
+aks
 tTK
 tvB
-kPx
+tRZ
 nkM
 vxZ
 dyS
@@ -111318,7 +111269,7 @@ cLf
 cLf
 cLf
 cLf
-fYe
+vxX
 vxX
 ilp
 pkw
@@ -111328,15 +111279,15 @@ uOo
 aku
 vfR
 ilp
+ilp
+jTB
 jTB
 jTB
-cba
-ioL
 gOY
-aks
+gOY
 tTK
-ybW
-aek
+oEP
+vBN
 xfQ
 cAG
 xXF
@@ -111585,15 +111536,15 @@ uOo
 aku
 aku
 fbN
-rji
-jTB
-jTB
-jTB
-gOY
+gsW
+gsW
+rZE
+rZE
 gOY
-tTK
-sqc
-kkh
+iJZ
+lcd
+eih
+neb
 nkM
 vxZ
 pZK
@@ -111842,15 +111793,15 @@ uOo
 aku
 aku
 pkw
-gsW
-meI
-qWZ
-iOZ
-gOY
-iJZ
+hhd
+bEz
+laD
+laD
+fVO
+cmn
 lcd
-npE
-lIF
+cmn
+acN
 efL
 cQu
 wgI
@@ -112100,12 +112051,12 @@ aku
 aku
 aku
 ajs
-gop
-cqf
-qqd
-fVO
-cmn
-mbQ
+pIk
+dpA
+rPh
+gOY
+mAC
+uBU
 cut
 rcR
 efL
@@ -112357,13 +112308,13 @@ aku
 aku
 aku
 vjB
-jEw
+psQ
 cmn
-nGt
+czC
 gOY
-fTf
-jbr
-tLL
+gAV
+hFz
+wRL
 icz
 efL
 nbS
@@ -112619,8 +112570,8 @@ grm
 gsW
 gOY
 gOY
-xOB
 gOY
+xOB
 gOY
 nkM
 nkM
@@ -112875,9 +112826,9 @@ aku
 xAd
 upd
 upd
-kAI
+ndE
+mkV
 dcc
-ncB
 uvx
 mna
 gXw
@@ -113130,8 +113081,8 @@ aku
 aku
 vfR
 vfJ
-apD
-vfJ
+upd
+efF
 moe
 jxe
 aaR
@@ -113387,8 +113338,8 @@ tsz
 lJq
 obA
 vfJ
-tgS
-vOp
+egt
+nZW
 moe
 tLh
 dlE
@@ -113643,9 +113594,9 @@ ouk
 uYH
 aQm
 obA
+vmH
 upd
 bnb
-upd
 moe
 rHG
 bpW
@@ -113900,9 +113851,9 @@ lJq
 jBM
 lJq
 obA
-xSO
-dmG
-dmG
+sdB
+rcH
+qsj
 moe
 mJU
 bpW
@@ -176613,7 +176564,7 @@ raz
 raz
 nzk
 fpY
-wMC
+clQ
 ssg
 vtN
 ylR
@@ -176869,8 +176820,8 @@ iSz
 uba
 vfJ
 nzk
-fpY
-clQ
+rPV
+wYI
 elT
 elT
 elT
@@ -177126,14 +177077,14 @@ vmk
 uba
 pBN
 nzk
-rLX
-wYI
-vRp
-vRp
-vRp
-vRp
-jMh
-jMh
+hEi
+hEi
+wFI
+mmU
+ibE
+wts
+uaw
+uaw
 tcx
 qJN
 uHQ
@@ -177384,13 +177335,13 @@ wtI
 vfJ
 vfJ
 hEi
-hEi
-wFI
-mmU
-ibE
-wts
-khj
-gWv
+myW
+myW
+fsZ
+jfB
+sab
+sab
+jzM
 iFN
 kHf
 xkL
@@ -177641,13 +177592,13 @@ bfp
 vfJ
 mNZ
 hEi
-myW
-myW
-fsZ
-jfB
+mlm
+rsI
+gmH
+iVp
 sab
 sab
-jzM
+sdn
 iFN
 aXl
 fyJ
@@ -177898,13 +177849,13 @@ lVB
 vfJ
 mNZ
 hEi
-mlm
-rsI
+hUH
+dfk
 gmH
-iVp
-sab
-sab
-sdn
+rXS
+tOL
+fPv
+iAM
 iFN
 mZn
 oND
@@ -178155,13 +178106,13 @@ mNZ
 mNZ
 mNZ
 hEi
-hUH
-dfk
-gmH
-rXS
-tOL
-fPv
-iAM
+hEi
+hEi
+hEi
+hEi
+hEi
+hEi
+iRy
 iFN
 rEv
 vjQ
@@ -178411,14 +178362,14 @@ mNZ
 mNZ
 mNZ
 mNZ
-kxB
-kxB
-kxB
-kxB
-kxB
-kxB
-moe
-vSF
+mNZ
+mNZ
+ivx
+ivx
+ivx
+ivx
+wkG
+bhq
 iFN
 iFN
 iFN
@@ -178671,11 +178622,11 @@ mNZ
 mNZ
 mNZ
 ivx
+moe
 wkG
-jYT
-xHo
-sZp
-rIJ
+wkG
+wkG
+qjs
 moe
 vxX
 vxX
@@ -178930,9 +178881,9 @@ mNZ
 gEA
 wkG
 jYT
-wkG
-wkG
-wkG
+jYT
+jYT
+rIJ
 moe
 vxX
 vxX
@@ -179188,9 +179139,9 @@ ivx
 wkG
 jYT
 wkG
-ivx
-ivx
-ivx
+wkG
+wkG
+moe
 vxX
 vxX
 vxX
@@ -186138,11 +186089,11 @@ cVs
 cUf
 qXj
 lKY
-dIN
-vEA
-kvd
-kvd
-uHz
+qUi
+wmO
+ybO
+ybO
+ybO
 wmO
 rmi
 lKY
@@ -186395,11 +186346,11 @@ jQS
 uVe
 qXj
 avA
-azM
-vEA
-kvd
-kvd
-uHz
+nVm
+wmO
+ybO
+ybO
+ybO
 wmO
 xGG
 uBm
@@ -186652,11 +186603,11 @@ jQS
 qZX
 qXj
 lKY
-cCM
-vEA
-kvd
-kvd
-uHz
+qGD
+wmO
+ybO
+ybO
+ybO
 wmO
 bLI
 lKY
@@ -186909,10 +186860,10 @@ jQS
 iXn
 mMe
 cWL
-vEA
-nCm
-vEA
-reH
+tMz
+jQS
+wmO
+kZW
 jgA
 jQS
 tMz
@@ -187162,21 +187113,21 @@ hhX
 hhX
 fZF
 jQS
-oeX
+rXf
 jEt
 aMf
 rdn
-nbF
-nCm
-nCm
-nCm
+xSW
+wnA
+wnA
+wnA
 wnA
 viT
 bUl
 cNh
 mjY
 jEt
-yav
+oag
 jQS
 fZF
 hhX
@@ -187419,21 +187370,21 @@ hhX
 hhX
 fZF
 jQS
-jZu
+cCr
 fXW
 xCs
 awy
-kYt
-kYt
-kYt
-kYt
+awy
+awy
+awy
+awy
 awy
 awy
 awy
 awy
 oVS
 mCT
-sQU
+okf
 jQS
 fZF
 hhX
diff --git a/_maps/safehouses/ice.dmm b/_maps/safehouses/ice.dmm
index f7faa99739652..96d689339ab87 100644
--- a/_maps/safehouses/ice.dmm
+++ b/_maps/safehouses/ice.dmm
@@ -148,7 +148,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/west,
-/obj/machinery/smartfridge/drying_rack,
+/obj/machinery/smartfridge/drying/rack,
 /turf/open/floor/iron,
 /area/virtual_domain/safehouse)
 "O" = (
diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm
index 4ebd7843239aa..1c8148a774a9e 100644
--- a/_maps/shuttles/emergency_kilo.dmm
+++ b/_maps/shuttles/emergency_kilo.dmm
@@ -325,7 +325,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/machinery/keycard_auth/directional/east,
+/obj/machinery/keycard_auth/wall_mounted/directional/east,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/escape)
 "bZ" = (
@@ -962,7 +962,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/west,
+/obj/machinery/keycard_auth/wall_mounted/directional/west,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm
index 3019f72a1d2da..4563d89631cd6 100644
--- a/_maps/shuttles/emergency_tranquility.dmm
+++ b/_maps/shuttles/emergency_tranquility.dmm
@@ -1696,7 +1696,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
 "Gh" = (
@@ -2129,7 +2129,7 @@
 /area/shuttle/escape)
 "NZ" = (
 /obj/machinery/status_display/evac/directional/west,
-/obj/machinery/keycard_auth/directional/south,
+/obj/machinery/keycard_auth/wall_mounted/directional/south,
 /obj/machinery/light/floor,
 /turf/open/floor/carpet/royalblue,
 /area/shuttle/escape)
diff --git a/_maps/templates/lazy_templates/voidwalker_void.dmm b/_maps/templates/lazy_templates/voidwalker_void.dmm
new file mode 100644
index 0000000000000..2f4dadf760098
--- /dev/null
+++ b/_maps/templates/lazy_templates/voidwalker_void.dmm
@@ -0,0 +1,1101 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/floor/black,
+/area/centcom/voidwalker_void)
+"z" = (
+/obj/effect/wisp_food,
+/turf/open/floor/black,
+/area/centcom/voidwalker_void)
+"W" = (
+/obj/effect/landmark/voidwalker_void,
+/turf/open/floor/black,
+/area/centcom/voidwalker_void)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+a
+W
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+z
+a
+W
+a
+a
+a
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(13,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(17,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(19,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+"}
+(22,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(23,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(24,1,1) = {"
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(25,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(26,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(27,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(28,1,1) = {"
+a
+a
+a
+W
+a
+a
+a
+z
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(29,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+W
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(31,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(32,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/_maps/virtual_domains/abductor_ship.dmm b/_maps/virtual_domains/abductor_ship.dmm
index 35bf563eb45c4..b182c50ed6683 100644
--- a/_maps/virtual_domains/abductor_ship.dmm
+++ b/_maps/virtual_domains/abductor_ship.dmm
@@ -1,7 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "bK" = (
 /turf/closed/wall/mineral/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cp" = (
 /obj/structure/table/abductor,
 /obj/item/food/soylentgreen{
@@ -9,7 +9,7 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cr" = (
 /obj/item/flashlight/lantern{
 	pixel_x = 4;
@@ -31,7 +31,7 @@
 "fk" = (
 /obj/effect/mob_spawn/corpse/human/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ge" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
@@ -40,7 +40,7 @@
 	desc = "A funky looking disc, built into the floor."
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "gO" = (
 /obj/structure/table/abductor,
 /obj/item/poster/random_abductor{
@@ -48,7 +48,7 @@
 	pixel_y = 3
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ih" = (
 /obj/structure/table/abductor,
 /obj/item/storage/belt/military/abductor{
@@ -60,7 +60,7 @@
 	pixel_y = -1
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kl" = (
 /obj/structure/table_frame/abductor,
 /obj/item/organ/internal/lungs{
@@ -72,7 +72,7 @@
 	pixel_y = 1
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kt" = (
 /obj/structure/table/abductor,
 /obj/item/multitool/abductor{
@@ -84,11 +84,11 @@
 	pixel_x = -1
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kN" = (
 /obj/machinery/fat_sucker,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lC" = (
 /obj/structure/table/abductor,
 /obj/item/clothing/head/helmet/abductor{
@@ -100,10 +100,10 @@
 	pixel_y = -4
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lN" = (
-/turf/open/floor/holofloor/hyperspace,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/closed/indestructible/binary,
+/area/virtual_domain/fullbright)
 "lR" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -111,11 +111,11 @@
 "lW" = (
 /obj/machinery/iv_drip,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mR" = (
 /obj/machinery/abductor/pad,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "nT" = (
 /obj/structure/table/abductor,
 /obj/item/food/soylentgreen{
@@ -123,19 +123,18 @@
 	pixel_y = -1
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "oL" = (
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pL" = (
-/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
-/turf/open/space/basic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/closed/indestructible/alien/nodiagonal,
+/area/virtual_domain)
 "pT" = (
 /obj/effect/decal/cleanable/blood/footprints,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rw" = (
 /obj/structure/table/abductor,
 /obj/item/toy/plush/abductor/agent{
@@ -143,7 +142,7 @@
 	pixel_y = 8
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rY" = (
 /obj/modular_map_root/safehouse{
 	key = "abductor"
@@ -158,14 +157,14 @@
 	pixel_y = -3
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "to" = (
 /obj/effect/decal/cleanable/molten_object{
 	pixel_x = 9;
 	pixel_y = 7
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "uk" = (
 /obj/structure/table/abductor,
 /obj/item/wrench/abductor{
@@ -177,35 +176,35 @@
 	pixel_y = 4
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "uw" = (
 /obj/structure/bed/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ux" = (
 /obj/machinery/door/airlock/abductor{
 	name = "Command Center";
 	locked = 1
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "uD" = (
 /obj/machinery/computer/camera_advanced/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vY" = (
 /obj/machinery/door/airlock/abductor{
 	name = "Repair Bay"
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vZ" = (
 /obj/machinery/abductor/gland_dispenser,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xB" = (
 /turf/closed/indestructible/opsglass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xM" = (
 /obj/effect/decal/cleanable/molten_object{
 	pixel_x = -6;
@@ -213,58 +212,62 @@
 	},
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yt" = (
 /obj/effect/decal/cleanable/blood/xtracks,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "zX" = (
 /obj/machinery/abductor/experiment,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "AG" = (
 /obj/item/shell/server,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
+"Bj" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/alien/nodiagonal,
+/area/virtual_domain)
 "Fy" = (
 /obj/effect/decal/cleanable/molten_object/large{
 	pixel_x = -5;
 	pixel_y = 14
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "GX" = (
 /obj/structure/chair/office{
 	dir = 4
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "IC" = (
 /obj/structure/table/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JC" = (
 /obj/item/organ/external/tail/cat,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JR" = (
 /obj/machinery/door/airlock/abductor{
 	name = "Experimentation Lab"
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JU" = (
 /obj/structure/closet/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "KK" = (
 /obj/structure/bed/abductor,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "KX" = (
-/turf/closed/indestructible/binary,
-/area/space)
+/turf/open/floor/holofloor/hyperspace,
+/area/space/virtual_domain)
 "Lz" = (
 /obj/structure/table/abductor,
 /obj/item/melee/baton/abductor{
@@ -277,40 +280,40 @@
 	pixel_y = 7
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Mr" = (
 /obj/machinery/chem_dispenser/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "MC" = (
 /obj/item/kirbyplants/photosynthetic,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ne" = (
 /obj/machinery/abductor/console,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "NW" = (
 /obj/structure/server,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "PB" = (
 /obj/item/organ/external/antennae,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Qp" = (
 /turf/template_noop,
-/area/space)
+/area/template_noop)
 "QC" = (
 /obj/structure/chair/comfy/teal{
 	dir = 8
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Rd" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Rg" = (
 /obj/structure/table/abductor,
 /obj/item/ammo_box/magazine/smgm45,
@@ -327,17 +330,17 @@
 "RI" = (
 /obj/machinery/door/airlock/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sd" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ub" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Uf" = (
 /obj/item/flashlight/seclite{
 	pixel_x = 9;
@@ -364,20 +367,20 @@
 	pixel_x = 3
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "UX" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Vl" = (
 /obj/machinery/harvester,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "VE" = (
 /obj/structure/table/abductor,
 /obj/item/storage/box/alienhandcuffs,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "VY" = (
 /obj/effect/mob_spawn/corpse/human/abductor{
 	pixel_x = 9;
@@ -385,7 +388,7 @@
 	},
 /obj/effect/decal/cleanable/xenoblood,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "We" = (
 /obj/structure/table/abductor,
 /obj/item/dualsaber/green{
@@ -402,27 +405,27 @@
 /obj/structure/table/abductor,
 /obj/item/weldingtool/abductor,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "WS" = (
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "XU" = (
 /obj/effect/decal/cleanable/xenoblood/xgibs/body,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yq" = (
 /obj/effect/decal/cleanable/xenoblood/xsplatter,
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "YV" = (
 /turf/closed/indestructible/alien,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZM" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/open/floor/plating/abductor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 Qp
@@ -440,18 +443,14 @@ Qp
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
 Qp
 Qp
 Qp
@@ -480,20 +479,16 @@ Qp
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+pL
+YV
+YV
+YV
+YV
+YV
+YV
+YV
+YV
+pL
 Qp
 Qp
 Qp
@@ -520,22 +515,18 @@ Qp
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+pL
+YV
+kN
+lW
+uw
+IC
+IC
+uw
+lW
+kN
+YV
+pL
 Qp
 Qp
 Qp
@@ -560,24 +551,20 @@ Qp
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+pL
+YV
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+YV
+pL
 Qp
 Qp
 Qp
@@ -600,26 +587,22 @@ Qp
 Qp
 Qp
 Qp
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-Qp
-Qp
-Qp
-Qp
+pL
+YV
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+oL
+WS
+WS
+YV
+pL
 Qp
 Qp
 Qp
@@ -640,28 +623,24 @@ Qp
 Qp
 Qp
 Qp
-KX
-KX
-YV
-YV
-YV
-YV
-YV
-YV
-YV
-YV
-YV
-YV
-YV
-YV
+pL
 YV
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
+WS
 YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
+pL
 Qp
 Qp
 Qp
@@ -672,38 +651,34 @@ Qp
 "}
 (7,1,1) = {"
 Qp
+lN
+lN
+lN
+lN
 Qp
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-KX
-KX
+pL
 YV
+WS
+WS
+WS
+MC
 YV
 YV
 YV
-kN
-lW
-uw
-IC
-IC
-uw
-lW
-kN
+WS
+WS
 YV
 YV
 YV
+MC
+WS
+WS
+WS
 YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
+pL
 Qp
 Qp
 Qp
@@ -712,40 +687,36 @@ Qp
 Qp
 "}
 (8,1,1) = {"
+lN
+lN
+KX
+KX
+lN
 Qp
 Qp
 Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-KX
-KX
+pL
 YV
+lW
+WS
+WS
 YV
 YV
 YV
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
+bK
+YV
 WS
 WS
 YV
 YV
 YV
 YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
+YV
+WS
+WS
+lW
+YV
+pL
 Qp
 Qp
 Qp
@@ -753,178 +724,14 @@ Qp
 Qp
 "}
 (9,1,1) = {"
-Qp
-Qp
-Qp
-KX
-KX
-KX
-KX
-KX
-KX
-YV
-YV
-YV
-YV
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-oL
-WS
-WS
-YV
-YV
-YV
-YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(10,1,1) = {"
-Qp
-Qp
-KX
-KX
-lN
-lN
-lN
-lN
-YV
-YV
-YV
-YV
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-WS
-YV
-YV
-YV
-YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(11,1,1) = {"
-Qp
-KX
-KX
-lN
-lN
-lN
 lN
-YV
-YV
-YV
-YV
-WS
-WS
-WS
-MC
-YV
-YV
-YV
-WS
-WS
-YV
-YV
-YV
-MC
-WS
-WS
-WS
-YV
-YV
-YV
-YV
 KX
 KX
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(12,1,1) = {"
 KX
-KX
-lN
-lN
-lN
 lN
-YV
-YV
-YV
-YV
-lW
-WS
-WS
-YV
-YV
-YV
-bK
-YV
-WS
-WS
-YV
-YV
-YV
-YV
-YV
-WS
-WS
-lW
-YV
-YV
-YV
-YV
-KX
-KX
 Qp
 Qp
-Qp
-Qp
-Qp
-"}
-(13,1,1) = {"
-KX
-lN
-lN
-lN
-lN
-YV
-YV
-YV
+pL
 YV
 WS
 WS
@@ -947,24 +754,20 @@ WS
 WS
 WS
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
 Qp
 "}
-(14,1,1) = {"
-KX
-lN
+(10,1,1) = {"
 lN
+KX
+KX
+KX
 lN
-YV
-YV
-YV
+Qp
+pL
 YV
 WS
 WS
@@ -989,22 +792,18 @@ UX
 WS
 WS
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
 "}
-(15,1,1) = {"
-KX
-lN
+(11,1,1) = {"
 lN
+KX
+KX
+KX
 lN
-YV
-bK
+pL
 YV
 UX
 WS
@@ -1031,20 +830,16 @@ Vl
 WS
 MC
 YV
-bK
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 "}
-(16,1,1) = {"
-KX
-lN
-lN
+(12,1,1) = {"
 lN
-YV
+KX
+KX
+KX
+pL
 bK
 YV
 WS
@@ -1073,18 +868,14 @@ YV
 YV
 YV
 YV
-bK
-YV
-YV
-KX
-Qp
+Bj
 Qp
 "}
-(17,1,1) = {"
-KX
-lN
-lN
+(13,1,1) = {"
 lN
+KX
+KX
+KX
 YV
 bK
 YV
@@ -1115,18 +906,14 @@ YV
 AG
 YV
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(18,1,1) = {"
-KX
-lN
-lN
+(14,1,1) = {"
 lN
-YV
+KX
+KX
+KX
+pL
 YV
 YV
 MC
@@ -1156,17 +943,14 @@ NW
 WS
 NW
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(19,1,1) = {"
-KX
-lN
-lN
+(15,1,1) = {"
 lN
+KX
+KX
+KX
+xB
 pL
 YV
 YV
@@ -1175,7 +959,6 @@ YV
 YV
 YV
 YV
-YV
 MC
 WS
 WS
@@ -1197,18 +980,14 @@ NW
 WS
 NW
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(20,1,1) = {"
-KX
-lN
+(16,1,1) = {"
 lN
-pL
-pL
+KX
+KX
+xB
+xB
 uD
 ZM
 ZM
@@ -1238,17 +1017,13 @@ xB
 xB
 xB
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(21,1,1) = {"
-KX
-lN
+(17,1,1) = {"
 lN
-pL
+KX
+KX
+xB
 Ne
 WS
 WS
@@ -1279,17 +1054,13 @@ WS
 WS
 WS
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(22,1,1) = {"
-KX
-lN
+(18,1,1) = {"
 lN
-pL
+KX
+KX
+xB
 Lz
 WS
 WS
@@ -1320,17 +1091,13 @@ WS
 oL
 WS
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(23,1,1) = {"
-KX
-lN
+(19,1,1) = {"
 lN
-pL
+KX
+KX
+xB
 Ne
 WS
 WS
@@ -1361,18 +1128,14 @@ WS
 WS
 WS
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(24,1,1) = {"
-KX
-lN
+(20,1,1) = {"
 lN
-pL
-pL
+KX
+KX
+xB
+xB
 uD
 Ub
 Ub
@@ -1402,17 +1165,14 @@ xB
 xB
 xB
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(25,1,1) = {"
-KX
-lN
-lN
+(21,1,1) = {"
 lN
+KX
+KX
+KX
+xB
 pL
 YV
 YV
@@ -1421,7 +1181,6 @@ YV
 YV
 YV
 YV
-YV
 MC
 WS
 WS
@@ -1443,18 +1202,14 @@ NW
 WS
 NW
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(26,1,1) = {"
-KX
-lN
-lN
+(22,1,1) = {"
 lN
-YV
+KX
+KX
+KX
+pL
 YV
 YV
 MC
@@ -1484,17 +1239,13 @@ NW
 WS
 NW
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(27,1,1) = {"
-KX
-lN
-lN
+(23,1,1) = {"
 lN
+KX
+KX
+KX
 YV
 bK
 YV
@@ -1525,18 +1276,14 @@ bK
 AG
 YV
 YV
-bK
-YV
-KX
-Qp
-Qp
+pL
 "}
-(28,1,1) = {"
-KX
-lN
-lN
+(24,1,1) = {"
 lN
-YV
+KX
+KX
+KX
+pL
 bK
 YV
 WS
@@ -1565,20 +1312,16 @@ YV
 YV
 YV
 YV
-bK
-YV
-YV
-KX
-Qp
+pL
 Qp
 "}
-(29,1,1) = {"
-KX
-lN
+(25,1,1) = {"
 lN
+KX
+KX
+KX
 lN
-YV
-bK
+pL
 YV
 WS
 WS
@@ -1605,22 +1348,18 @@ UX
 WS
 MC
 YV
-bK
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 "}
-(30,1,1) = {"
-KX
-lN
+(26,1,1) = {"
 lN
+KX
+KX
+KX
 lN
-YV
-YV
-YV
+Qp
+pL
 YV
 WS
 WS
@@ -1645,24 +1384,20 @@ WS
 WS
 WS
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
 "}
-(31,1,1) = {"
-KX
-lN
-lN
+(27,1,1) = {"
 lN
+KX
+KX
+KX
 lN
-YV
-YV
-YV
+Qp
+Qp
+pL
 YV
 gF
 WS
@@ -1685,26 +1420,22 @@ WS
 WS
 gF
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
 Qp
 "}
-(32,1,1) = {"
-KX
-KX
-lN
+(28,1,1) = {"
 lN
 lN
+KX
+KX
 lN
-YV
-YV
-YV
+Qp
+Qp
+Qp
+pL
 YV
 lW
 oL
@@ -1725,28 +1456,24 @@ WS
 WS
 lW
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
 Qp
 Qp
 "}
-(33,1,1) = {"
+(29,1,1) = {"
 Qp
-KX
-KX
 lN
 lN
 lN
 lN
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 WS
 WS
@@ -1765,11 +1492,7 @@ WS
 WS
 oL
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
@@ -1777,18 +1500,18 @@ Qp
 Qp
 Qp
 "}
-(34,1,1) = {"
+(30,1,1) = {"
 Qp
 Qp
-KX
-KX
-lN
-lN
-lN
-lN
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 WS
 WS
@@ -1805,11 +1528,7 @@ WS
 WS
 WS
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
@@ -1818,19 +1537,19 @@ Qp
 Qp
 Qp
 "}
-(35,1,1) = {"
+(31,1,1) = {"
 Qp
 Qp
 Qp
-KX
-KX
-KX
-KX
-KX
-KX
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 WS
 WS
@@ -1845,11 +1564,7 @@ WS
 WS
 WS
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
@@ -1859,7 +1574,7 @@ Qp
 Qp
 Qp
 "}
-(36,1,1) = {"
+(32,1,1) = {"
 Qp
 Qp
 Qp
@@ -1868,11 +1583,11 @@ Qp
 Qp
 Qp
 Qp
-KX
-KX
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 zX
 WS
@@ -1885,11 +1600,7 @@ GX
 WS
 zX
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
@@ -1900,7 +1611,7 @@ Qp
 Qp
 Qp
 "}
-(37,1,1) = {"
+(33,1,1) = {"
 Qp
 Qp
 Qp
@@ -1910,11 +1621,11 @@ Qp
 Qp
 Qp
 Qp
-KX
-KX
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 Sd
 sv
@@ -1925,11 +1636,7 @@ Sd
 kt
 Sd
 YV
-YV
-YV
-YV
-KX
-KX
+pL
 Qp
 Qp
 Qp
@@ -1941,7 +1648,7 @@ Qp
 Qp
 Qp
 "}
-(38,1,1) = {"
+(34,1,1) = {"
 Qp
 Qp
 Qp
@@ -1952,14 +1659,11 @@ Qp
 Qp
 Qp
 Qp
-KX
-KX
-YV
-YV
-YV
-YV
-YV
-YV
+Qp
+Qp
+Qp
+Qp
+pL
 YV
 YV
 YV
@@ -1968,213 +1672,7 @@ YV
 YV
 YV
 YV
-KX
-KX
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(39,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(40,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(41,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(42,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-"}
-(43,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+pL
 Qp
 Qp
 Qp
@@ -2187,19 +1685,7 @@ Qp
 Qp
 Qp
 "}
-(44,1,1) = {"
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
+(35,1,1) = {"
 Qp
 Qp
 Qp
@@ -2215,6 +1701,14 @@ Qp
 Qp
 Qp
 Qp
+pL
+pL
+pL
+pL
+pL
+pL
+pL
+pL
 Qp
 Qp
 Qp
diff --git a/_maps/virtual_domains/ash_drake.dmm b/_maps/virtual_domains/ash_drake.dmm
index f789e44fbc69f..e4189071fbba0 100644
--- a/_maps/virtual_domains/ash_drake.dmm
+++ b/_maps/virtual_domains/ash_drake.dmm
@@ -34,6 +34,10 @@
 /obj/structure/marker_beacon/bronze,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
+"p" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
 "q" = (
 /mob/living/simple_animal/hostile/megafauna/dragon,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
@@ -42,12 +46,8 @@
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors/virtual_domain)
 "u" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
-"v" = (
 /turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
+/area/virtual_domain/fullbright)
 "G" = (
 /obj/structure/marker_beacon/purple,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
@@ -71,56 +71,55 @@
 /area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
 u
 "}
 (2,1,1) = {"
-v
-s
+u
 s
 s
 s
@@ -164,10 +163,11 @@ s
 s
 s
 s
-v
+p
+u
 "}
 (3,1,1) = {"
-v
+u
 s
 s
 s
@@ -212,10 +212,10 @@ s
 J
 J
 s
-v
+u
 "}
 (4,1,1) = {"
-v
+u
 s
 s
 J
@@ -260,10 +260,10 @@ J
 J
 J
 s
-v
+u
 "}
 (5,1,1) = {"
-v
+u
 s
 s
 J
@@ -308,10 +308,10 @@ J
 J
 s
 s
-v
+u
 "}
 (6,1,1) = {"
-v
+u
 s
 s
 J
@@ -356,10 +356,10 @@ J
 J
 s
 s
-v
+u
 "}
 (7,1,1) = {"
-v
+u
 s
 s
 J
@@ -404,10 +404,10 @@ J
 J
 J
 s
-v
+u
 "}
 (8,1,1) = {"
-v
+u
 s
 s
 J
@@ -452,10 +452,10 @@ J
 J
 s
 s
-v
+u
 "}
 (9,1,1) = {"
-v
+u
 s
 J
 J
@@ -500,10 +500,10 @@ a
 J
 J
 s
-v
+u
 "}
 (10,1,1) = {"
-v
+u
 s
 J
 J
@@ -548,10 +548,10 @@ a
 J
 J
 s
-v
+u
 "}
 (11,1,1) = {"
-v
+u
 s
 s
 J
@@ -596,10 +596,10 @@ a
 J
 J
 s
-v
+u
 "}
 (12,1,1) = {"
-v
+u
 s
 s
 J
@@ -644,10 +644,10 @@ J
 J
 J
 s
-v
+u
 "}
 (13,1,1) = {"
-v
+u
 s
 s
 J
@@ -692,10 +692,10 @@ a
 J
 J
 s
-v
+u
 "}
 (14,1,1) = {"
-v
+u
 s
 s
 J
@@ -740,10 +740,10 @@ a
 J
 J
 s
-v
+u
 "}
 (15,1,1) = {"
-v
+u
 s
 J
 J
@@ -788,10 +788,10 @@ a
 J
 J
 s
-v
+u
 "}
 (16,1,1) = {"
-v
+u
 s
 J
 J
@@ -836,10 +836,10 @@ a
 J
 J
 s
-v
+u
 "}
 (17,1,1) = {"
-v
+u
 s
 s
 J
@@ -884,10 +884,10 @@ a
 J
 J
 s
-v
+u
 "}
 (18,1,1) = {"
-v
+u
 s
 s
 J
@@ -932,10 +932,10 @@ J
 J
 s
 s
-v
+u
 "}
 (19,1,1) = {"
-v
+u
 s
 J
 J
@@ -980,10 +980,10 @@ a
 J
 J
 s
-v
+u
 "}
 (20,1,1) = {"
-v
+u
 s
 J
 J
@@ -1028,10 +1028,10 @@ a
 J
 J
 s
-v
+u
 "}
 (21,1,1) = {"
-v
+u
 s
 s
 J
@@ -1076,10 +1076,10 @@ a
 J
 s
 s
-v
+u
 "}
 (22,1,1) = {"
-v
+u
 s
 s
 J
@@ -1124,10 +1124,10 @@ a
 J
 s
 s
-v
+u
 "}
 (23,1,1) = {"
-v
+u
 s
 J
 J
@@ -1172,10 +1172,10 @@ a
 J
 s
 s
-v
+u
 "}
 (24,1,1) = {"
-v
+u
 s
 J
 J
@@ -1220,10 +1220,10 @@ a
 J
 J
 s
-v
+u
 "}
 (25,1,1) = {"
-v
+u
 s
 s
 J
@@ -1268,10 +1268,10 @@ J
 J
 J
 s
-v
+u
 "}
 (26,1,1) = {"
-v
+u
 s
 s
 J
@@ -1316,10 +1316,10 @@ a
 J
 J
 s
-v
+u
 "}
 (27,1,1) = {"
-v
+u
 s
 s
 J
@@ -1364,10 +1364,10 @@ a
 J
 J
 s
-v
+u
 "}
 (28,1,1) = {"
-v
+u
 s
 J
 J
@@ -1412,10 +1412,10 @@ J
 J
 J
 s
-v
+u
 "}
 (29,1,1) = {"
-v
+u
 s
 J
 J
@@ -1460,10 +1460,10 @@ J
 J
 s
 s
-v
+u
 "}
 (30,1,1) = {"
-v
+u
 s
 s
 J
@@ -1508,10 +1508,10 @@ J
 J
 s
 s
-v
+u
 "}
 (31,1,1) = {"
-v
+u
 s
 s
 a
@@ -1556,10 +1556,10 @@ J
 J
 J
 s
-v
+u
 "}
 (32,1,1) = {"
-v
+u
 s
 s
 a
@@ -1604,10 +1604,10 @@ J
 J
 J
 s
-v
+u
 "}
 (33,1,1) = {"
-v
+u
 s
 s
 s
@@ -1652,10 +1652,10 @@ J
 J
 J
 s
-v
+u
 "}
 (34,1,1) = {"
-v
+u
 s
 s
 s
@@ -1700,53 +1700,53 @@ s
 s
 s
 s
-v
+u
 "}
 (35,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
+u
 "}
diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm
index 5e1c6f753b8ac..0b3a037c463f1 100644
--- a/_maps/virtual_domains/beach_bar.dmm
+++ b/_maps/virtual_domains/beach_bar.dmm
@@ -169,9 +169,6 @@
 	},
 /turf/open/floor/wood,
 /area/virtual_domain/fullbright)
-"iz" = (
-/turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
 "iR" = (
 /obj/structure/table,
 /obj/item/book/manual/wiki/barman_recipes,
@@ -213,9 +210,8 @@
 /turf/open/floor/sepia,
 /area/virtual_domain/fullbright)
 "kv" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
+/area/virtual_domain/fullbright)
 "kG" = (
 /obj/structure/table,
 /obj/machinery/reagentgrinder,
@@ -498,9 +494,6 @@
 /obj/item/clothing/glasses/sunglasses,
 /turf/open/floor/wood,
 /area/virtual_domain/fullbright)
-"xW" = (
-/turf/open/space/basic,
-/area/space)
 "ya" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/pill/zoom,
@@ -1015,6 +1008,10 @@
 /obj/machinery/computer/slot_machine,
 /turf/open/floor/wood,
 /area/virtual_domain/fullbright)
+"VE" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/mineral/random/volcanic,
+/area/lavaland/surface/outdoors/virtual_domain)
 "VH" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/wood,
@@ -1129,42 +1126,42 @@ pr
 pr
 pr
 pr
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
 kv
 "}
 (2,1,1) = {"
@@ -1172,8 +1169,7 @@ pr
 pr
 pr
 pr
-iz
-Al
+kv
 Al
 Al
 Al
@@ -1208,14 +1204,15 @@ Al
 Al
 Al
 Al
-iz
+VE
+kv
 "}
 (3,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1251,14 +1248,14 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (4,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1294,14 +1291,14 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (5,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1337,14 +1334,14 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (6,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1380,14 +1377,14 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (7,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1423,14 +1420,14 @@ ml
 FM
 gl
 Al
-iz
+kv
 "}
 (8,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1466,14 +1463,14 @@ ml
 ml
 gl
 Al
-iz
+kv
 "}
 (9,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 gl
 gl
@@ -1509,14 +1506,14 @@ ml
 ml
 gl
 Al
-iz
+kv
 "}
 (10,1,1) = {"
 pr
 pr
 pr
 pr
-iz
+kv
 Al
 Al
 Al
@@ -1552,14 +1549,14 @@ ml
 ml
 gl
 Al
-iz
+kv
 "}
 (11,1,1) = {"
-iz
-iz
-iz
-iz
-iz
+kv
+kv
+kv
+kv
+kv
 Al
 Al
 Al
@@ -1595,10 +1592,10 @@ ml
 ml
 gl
 Al
-iz
+kv
 "}
 (12,1,1) = {"
-iz
+kv
 Al
 Al
 Al
@@ -1638,10 +1635,10 @@ ml
 ml
 gl
 Al
-iz
+kv
 "}
 (13,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -1681,10 +1678,10 @@ ml
 sT
 gl
 Al
-iz
+kv
 "}
 (14,1,1) = {"
-iz
+kv
 Al
 Fn
 VA
@@ -1724,10 +1721,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (15,1,1) = {"
-iz
+kv
 Al
 Fn
 VA
@@ -1767,10 +1764,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (16,1,1) = {"
-iz
+kv
 Al
 Fn
 pC
@@ -1810,10 +1807,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (17,1,1) = {"
-iz
+kv
 Al
 Fn
 Mw
@@ -1853,10 +1850,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (18,1,1) = {"
-iz
+kv
 Al
 Fn
 Mz
@@ -1896,10 +1893,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (19,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -1939,10 +1936,10 @@ gl
 gl
 gl
 Al
-iz
+kv
 "}
 (20,1,1) = {"
-iz
+kv
 Al
 Fn
 zU
@@ -1982,10 +1979,10 @@ gl
 Al
 gl
 Al
-iz
+kv
 "}
 (21,1,1) = {"
-iz
+kv
 Al
 Fn
 wD
@@ -2025,10 +2022,10 @@ Al
 Al
 Al
 Al
-iz
+kv
 "}
 (22,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -2060,18 +2057,18 @@ Ww
 dj
 Fn
 Al
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
 "}
 (23,1,1) = {"
-iz
+kv
 Al
 xb
 Fn
@@ -2103,7 +2100,8 @@ Ww
 dj
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2111,10 +2109,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (24,1,1) = {"
-iz
+kv
 Al
 xb
 Fn
@@ -2146,7 +2143,8 @@ Ww
 pZ
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2154,10 +2152,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (25,1,1) = {"
-iz
+kv
 Al
 xb
 Fn
@@ -2189,7 +2186,8 @@ Ww
 dj
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2197,10 +2195,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (26,1,1) = {"
-iz
+kv
 Al
 xb
 Fn
@@ -2232,7 +2229,8 @@ Ww
 dj
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2240,10 +2238,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (27,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -2275,7 +2272,8 @@ KZ
 dj
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2283,10 +2281,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (28,1,1) = {"
-iz
+kv
 Al
 Fn
 Nr
@@ -2318,7 +2315,8 @@ Ww
 pZ
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2326,10 +2324,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (29,1,1) = {"
-iz
+kv
 Al
 Fn
 wD
@@ -2361,7 +2358,8 @@ Bu
 Xt
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2369,10 +2367,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (30,1,1) = {"
-iz
+kv
 Al
 Fn
 Ds
@@ -2404,7 +2401,8 @@ Fn
 Fn
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2412,10 +2410,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (31,1,1) = {"
-iz
+kv
 Al
 Fn
 TG
@@ -2447,7 +2444,8 @@ Fn
 Al
 Al
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2455,10 +2453,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (32,1,1) = {"
-iz
+kv
 Al
 Fn
 TG
@@ -2490,7 +2487,8 @@ Fn
 Fn
 Al
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2498,10 +2496,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (33,1,1) = {"
-iz
+kv
 Al
 Fn
 EP
@@ -2533,7 +2530,8 @@ OW
 Fn
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2541,10 +2539,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (34,1,1) = {"
-iz
+kv
 Al
 Fn
 Xv
@@ -2576,7 +2573,8 @@ aE
 jg
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2584,10 +2582,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (35,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -2619,7 +2616,8 @@ aE
 NM
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2627,10 +2625,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (36,1,1) = {"
-iz
+kv
 Al
 Fn
 kK
@@ -2662,7 +2659,8 @@ aE
 uk
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2670,10 +2668,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (37,1,1) = {"
-iz
+kv
 Al
 Fn
 Ia
@@ -2705,7 +2702,8 @@ Cv
 Fn
 Fn
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2713,10 +2711,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (38,1,1) = {"
-iz
+kv
 Al
 Fn
 tZ
@@ -2748,7 +2745,8 @@ Fn
 Fn
 Al
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2756,10 +2754,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (39,1,1) = {"
-iz
+kv
 Al
 Fn
 Fn
@@ -2791,7 +2788,8 @@ Al
 Al
 Al
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2799,10 +2797,9 @@ pr
 pr
 pr
 pr
-xW
 "}
 (40,1,1) = {"
-iz
+kv
 Al
 Al
 Al
@@ -2834,7 +2831,8 @@ Al
 Al
 Al
 Al
-iz
+kv
+pr
 pr
 pr
 pr
@@ -2842,48 +2840,47 @@ pr
 pr
 pr
 pr
-xW
 "}
 (41,1,1) = {"
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-iz
-pr
-pr
-pr
-pr
-pr
-pr
-pr
-xW
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+kv
+pr
+pr
+pr
+pr
+pr
+pr
+pr
+pr
 "}
diff --git a/_maps/virtual_domains/blood_drunk_miner.dmm b/_maps/virtual_domains/blood_drunk_miner.dmm
index 7fffbabfc0b62..e8f55523670fa 100644
--- a/_maps/virtual_domains/blood_drunk_miner.dmm
+++ b/_maps/virtual_domains/blood_drunk_miner.dmm
@@ -13,9 +13,8 @@
 /turf/template_noop,
 /area/virtual_domain/safehouse)
 "d" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
+/area/virtual_domain/fullbright)
 "f" = (
 /obj/structure/stone_tile{
 	dir = 1
@@ -85,9 +84,6 @@
 /obj/structure/stone_tile/cracked,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
-"v" = (
-/turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
 "w" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 4
@@ -117,6 +113,10 @@
 /obj/effect/mob_spawn/corpse/human/miner,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
+"D" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
 "G" = (
 /obj/structure/stone_tile{
 	dir = 4
@@ -208,56 +208,55 @@
 /area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
 d
 "}
 (2,1,1) = {"
-v
-s
+d
 s
 s
 s
@@ -301,10 +300,11 @@ s
 s
 s
 s
-v
+D
+d
 "}
 (3,1,1) = {"
-v
+d
 s
 s
 s
@@ -349,10 +349,10 @@ s
 J
 J
 s
-v
+d
 "}
 (4,1,1) = {"
-v
+d
 s
 s
 J
@@ -397,10 +397,10 @@ J
 J
 J
 s
-v
+d
 "}
 (5,1,1) = {"
-v
+d
 s
 s
 J
@@ -445,10 +445,10 @@ J
 J
 s
 s
-v
+d
 "}
 (6,1,1) = {"
-v
+d
 s
 s
 J
@@ -493,10 +493,10 @@ J
 J
 s
 s
-v
+d
 "}
 (7,1,1) = {"
-v
+d
 s
 s
 J
@@ -541,10 +541,10 @@ J
 J
 J
 s
-v
+d
 "}
 (8,1,1) = {"
-v
+d
 s
 s
 J
@@ -589,10 +589,10 @@ J
 J
 s
 s
-v
+d
 "}
 (9,1,1) = {"
-v
+d
 s
 J
 J
@@ -637,10 +637,10 @@ a
 J
 J
 s
-v
+d
 "}
 (10,1,1) = {"
-v
+d
 s
 J
 J
@@ -685,10 +685,10 @@ a
 J
 J
 s
-v
+d
 "}
 (11,1,1) = {"
-v
+d
 s
 s
 J
@@ -733,10 +733,10 @@ a
 J
 J
 s
-v
+d
 "}
 (12,1,1) = {"
-v
+d
 s
 s
 J
@@ -781,10 +781,10 @@ J
 J
 J
 s
-v
+d
 "}
 (13,1,1) = {"
-v
+d
 s
 s
 J
@@ -829,10 +829,10 @@ a
 J
 J
 s
-v
+d
 "}
 (14,1,1) = {"
-v
+d
 s
 s
 J
@@ -877,10 +877,10 @@ a
 J
 J
 s
-v
+d
 "}
 (15,1,1) = {"
-v
+d
 s
 J
 J
@@ -925,10 +925,10 @@ a
 J
 J
 s
-v
+d
 "}
 (16,1,1) = {"
-v
+d
 s
 J
 J
@@ -973,10 +973,10 @@ a
 J
 J
 s
-v
+d
 "}
 (17,1,1) = {"
-v
+d
 s
 s
 J
@@ -1021,10 +1021,10 @@ a
 J
 J
 s
-v
+d
 "}
 (18,1,1) = {"
-v
+d
 s
 s
 J
@@ -1069,10 +1069,10 @@ J
 J
 s
 s
-v
+d
 "}
 (19,1,1) = {"
-v
+d
 s
 J
 J
@@ -1117,10 +1117,10 @@ a
 J
 J
 s
-v
+d
 "}
 (20,1,1) = {"
-v
+d
 s
 J
 J
@@ -1165,10 +1165,10 @@ a
 J
 J
 s
-v
+d
 "}
 (21,1,1) = {"
-v
+d
 s
 s
 J
@@ -1213,10 +1213,10 @@ a
 J
 s
 s
-v
+d
 "}
 (22,1,1) = {"
-v
+d
 s
 s
 J
@@ -1261,10 +1261,10 @@ a
 J
 s
 s
-v
+d
 "}
 (23,1,1) = {"
-v
+d
 s
 J
 J
@@ -1309,10 +1309,10 @@ a
 J
 s
 s
-v
+d
 "}
 (24,1,1) = {"
-v
+d
 s
 J
 J
@@ -1357,10 +1357,10 @@ a
 J
 J
 s
-v
+d
 "}
 (25,1,1) = {"
-v
+d
 s
 s
 J
@@ -1405,10 +1405,10 @@ J
 J
 J
 s
-v
+d
 "}
 (26,1,1) = {"
-v
+d
 s
 s
 J
@@ -1453,10 +1453,10 @@ a
 J
 J
 s
-v
+d
 "}
 (27,1,1) = {"
-v
+d
 s
 s
 J
@@ -1501,10 +1501,10 @@ a
 J
 J
 s
-v
+d
 "}
 (28,1,1) = {"
-v
+d
 s
 J
 J
@@ -1549,10 +1549,10 @@ J
 J
 J
 s
-v
+d
 "}
 (29,1,1) = {"
-v
+d
 s
 J
 J
@@ -1597,10 +1597,10 @@ J
 J
 s
 s
-v
+d
 "}
 (30,1,1) = {"
-v
+d
 s
 s
 J
@@ -1645,10 +1645,10 @@ J
 J
 s
 s
-v
+d
 "}
 (31,1,1) = {"
-v
+d
 s
 s
 a
@@ -1693,10 +1693,10 @@ J
 J
 J
 s
-v
+d
 "}
 (32,1,1) = {"
-v
+d
 s
 s
 a
@@ -1741,10 +1741,10 @@ J
 J
 J
 s
-v
+d
 "}
 (33,1,1) = {"
-v
+d
 s
 s
 s
@@ -1789,10 +1789,10 @@ J
 J
 J
 s
-v
+d
 "}
 (34,1,1) = {"
-v
+d
 s
 s
 s
@@ -1837,53 +1837,53 @@ s
 s
 s
 s
-v
+d
 "}
 (35,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
+d
 "}
diff --git a/_maps/virtual_domains/breeze_bay.dmm b/_maps/virtual_domains/breeze_bay.dmm
index a0b8a7b036a63..5fa537bccdecb 100644
--- a/_maps/virtual_domains/breeze_bay.dmm
+++ b/_maps/virtual_domains/breeze_bay.dmm
@@ -13,6 +13,10 @@
 "e" = (
 /turf/open/floor/carpet/red,
 /area/virtual_domain/fullbright)
+"f" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/water/beach,
+/area/virtual_domain/fullbright)
 "g" = (
 /obj/item/toy/beach_ball/branded,
 /turf/open/misc/beach/sand,
@@ -174,10 +178,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/misc/beach/sand,
 /area/virtual_domain/fullbright)
-"Z" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/virtual_domain/fullbright)
 
 (1,1,1) = {"
 a
@@ -204,7 +204,7 @@ a
 a
 a
 a
-Z
+a
 "}
 (2,1,1) = {"
 a
@@ -230,7 +230,7 @@ i
 Q
 i
 i
-i
+f
 a
 "}
 (3,1,1) = {"
diff --git a/_maps/virtual_domains/bubblegum.dmm b/_maps/virtual_domains/bubblegum.dmm
index ef6957448925a..5343fe7d17b77 100644
--- a/_maps/virtual_domains/bubblegum.dmm
+++ b/_maps/virtual_domains/bubblegum.dmm
@@ -46,9 +46,6 @@
 /mob/living/simple_animal/hostile/megafauna/bubblegum,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
-"F" = (
-/turf/open/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
 "G" = (
 /obj/structure/marker_beacon/violet,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
@@ -61,10 +58,13 @@
 /obj/structure/marker_beacon/indigo,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
-"R" = (
+"N" = (
 /obj/effect/baseturf_helper/virtual_domain,
-/turf/open/indestructible/binary,
+/turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors/virtual_domain)
+"R" = (
+/turf/open/indestructible/binary,
+/area/virtual_domain)
 "S" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
@@ -91,66 +91,65 @@
 /area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
 R
 "}
 (2,1,1) = {"
-F
-Z
+R
 Z
 Z
 Z
@@ -204,10 +203,11 @@ Z
 Z
 Z
 Z
-F
+N
+R
 "}
 (3,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -262,10 +262,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (4,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -287,7 +287,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -303,7 +303,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -320,10 +320,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (5,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -378,10 +378,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (6,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -436,13 +436,13 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (7,1,1) = {"
-F
+R
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -494,13 +494,13 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (8,1,1) = {"
-F
+R
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -552,13 +552,13 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (9,1,1) = {"
-F
+R
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -610,10 +610,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (10,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -666,12 +666,12 @@ Z
 Z
 Z
 Z
-F
+R
 Z
-F
+R
 "}
 (11,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -724,12 +724,12 @@ Z
 Z
 Z
 Z
-F
+R
 Z
-F
+R
 "}
 (12,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -784,10 +784,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (13,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -842,10 +842,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (14,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -900,10 +900,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (15,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -958,10 +958,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (16,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1016,10 +1016,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (17,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1074,10 +1074,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (18,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1132,10 +1132,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (19,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1190,10 +1190,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (20,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1248,10 +1248,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (21,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1306,10 +1306,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (22,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1364,10 +1364,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (23,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1422,10 +1422,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (24,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1480,13 +1480,13 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (25,1,1) = {"
-F
+R
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -1538,10 +1538,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (26,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1595,11 +1595,11 @@ Z
 Z
 Z
 Z
-F
-F
+R
+R
 "}
 (27,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1654,10 +1654,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (28,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1712,10 +1712,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (29,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1770,10 +1770,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (30,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1828,10 +1828,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (31,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1886,10 +1886,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (32,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -1944,10 +1944,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (33,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2002,10 +2002,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (34,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2060,10 +2060,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (35,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2118,10 +2118,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (36,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2176,10 +2176,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (37,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2234,10 +2234,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (38,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2292,10 +2292,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (39,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2350,10 +2350,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (40,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2408,10 +2408,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (41,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2466,13 +2466,13 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (42,1,1) = {"
-F
+R
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -2524,10 +2524,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (43,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2582,10 +2582,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (44,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2640,10 +2640,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (45,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2698,10 +2698,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (46,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2756,10 +2756,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (47,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2814,10 +2814,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (48,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2872,10 +2872,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (49,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2925,15 +2925,15 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
 Z
-F
+R
 "}
 (50,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -2988,10 +2988,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (51,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -3046,18 +3046,18 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (52,1,1) = {"
-F
+R
 Z
 Z
 Z
 Z
 Z
 Z
-F
-F
+R
+R
 Z
 Z
 Z
@@ -3070,7 +3070,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -3093,7 +3093,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -3104,10 +3104,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (53,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -3143,7 +3143,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -3162,10 +3162,10 @@ Z
 Z
 Z
 Z
-F
+R
 "}
 (54,1,1) = {"
-F
+R
 Z
 Z
 Z
@@ -3203,7 +3203,7 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
@@ -3215,68 +3215,68 @@ Z
 Z
 Z
 Z
-F
+R
 Z
 Z
 Z
 Z
-F
+R
 "}
 (55,1,1) = {"
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
-F
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
+R
 "}
diff --git a/_maps/virtual_domains/clown_planet.dmm b/_maps/virtual_domains/clown_planet.dmm
index 72cc1280b63cc..37e00bd45fcbf 100644
--- a/_maps/virtual_domains/clown_planet.dmm
+++ b/_maps/virtual_domains/clown_planet.dmm
@@ -7,15 +7,15 @@
 /obj/machinery/light/small/directional/west,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "aI" = (
 /obj/item/bikehorn/airhorn,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "aM" = (
 /obj/item/bikehorn,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "aP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -23,7 +23,7 @@
 /obj/effect/decal/cleanable/food/pie_smudge,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ba" = (
 /obj/structure/mecha_wreckage/honker,
 /obj/structure/disposalpipe/segment{
@@ -31,7 +31,7 @@
 	invisibility = 101
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bi" = (
 /obj/item/bikehorn,
 /obj/structure/disposalpipe/segment{
@@ -39,19 +39,20 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bp" = (
 /turf/open/indestructible/light,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bq" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "by" = (
+/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -59,26 +60,26 @@
 	},
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bR" = (
 /obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/hope,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "bU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "cw" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "cM" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 8
@@ -87,7 +88,7 @@
 	dir = 1
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "cW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
@@ -95,21 +96,21 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ed" = (
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "eE" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "fh" = (
 /obj/effect/mob_spawn/corpse/human/damaged,
 /obj/effect/decal/cleanable/blood/old,
@@ -118,7 +119,13 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
+"gd" = (
+/obj/structure/disposalpipe/segment{
+	dir = 6
+	},
+/turf/closed/indestructible/binary,
+/area/virtual_domain/fullbright)
 "gr" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -127,25 +134,24 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "gH" = (
 /obj/item/bikehorn,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "gK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "hK" = (
 /obj/item/clothing/head/cone,
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "hY" = (
 /turf/template_noop,
 /area/template_noop)
@@ -157,24 +163,24 @@
 	dir = 4
 	},
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ik" = (
 /turf/open/lava/smooth,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "iR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	invisibility = 101
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ki" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	invisibility = 101
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "kn" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -182,7 +188,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "lj" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -191,14 +197,14 @@
 	dir = 8
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "lm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /obj/machinery/light/small/directional/east,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "lr" = (
 /obj/item/bikehorn,
 /obj/effect/decal/cleanable/dirt,
@@ -207,60 +213,63 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "lx" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ly" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "lP" = (
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "mD" = (
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "mE" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "mF" = (
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "nE" = (
 /obj/effect/mapping_helpers/no_lava,
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "oA" = (
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "oI" = (
 /obj/structure/table/glass,
 /obj/item/grown/bananapeel/bluespace,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "pl" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ps" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
+"qg" = (
+/turf/closed/wall/r_wall,
+/area/lavaland/surface/outdoors/virtual_domain)
 "qM" = (
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
@@ -268,7 +277,7 @@
 /obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "rg" = (
 /obj/item/coin/bananium,
 /obj/item/coin/bananium,
@@ -276,19 +285,13 @@
 /obj/item/coin/bananium,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "rh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
 /turf/open/indestructible/white,
-/area/virtual_domain)
-"rr" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "rH" = (
 /obj/structure/disposalpipe/junction/yjunction{
 	dir = 1;
@@ -297,46 +300,39 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
-"rT" = (
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
-/turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "sq" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "sT" = (
 /obj/structure/disposalpipe/sorting/mail/flip{
 	dir = 1
 	},
 /obj/effect/mapping_helpers/mail_sorting/supply/qm_office,
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "tq" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "tt" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	invisibility = 101
 	},
 /turf/open/indestructible/light,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "tv" = (
 /obj/effect/mob_spawn/corpse/human/damaged,
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "tF" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "tI" = (
 /obj/item/coin/bananium,
 /obj/item/coin/bananium,
@@ -344,15 +340,15 @@
 /obj/item/coin/bananium,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "uX" = (
 /obj/effect/mapping_helpers/no_lava,
 /mob/living/basic/clown,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "uY" = (
 /turf/closed/mineral/bananium,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "uZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -362,13 +358,13 @@
 /obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/escape,
 /obj/item/pen/fourcolor,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "wz" = (
 /obj/machinery/light/small/directional/south,
 /obj/effect/mapping_helpers/no_lava,
 /mob/living/basic/clown,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "xt" = (
 /obj/modular_map_root/safehouse{
 	key = "mine"
@@ -379,17 +375,17 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "yz" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "yS" = (
 /obj/structure/marker_beacon/yellow,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "yZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
@@ -397,16 +393,16 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "zm" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "zA" = (
 /obj/structure/statue/bananium/clown,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "zF" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -415,14 +411,14 @@
 	dir = 8
 	},
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Aa" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
 /obj/effect/turf_decal/tile/red/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Bi" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -431,7 +427,7 @@
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Cp" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -439,7 +435,7 @@
 	},
 /obj/machinery/light/small/directional/west,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Cs" = (
 /obj/item/bikehorn,
 /obj/structure/disposalpipe/segment{
@@ -448,7 +444,7 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Do" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -456,7 +452,7 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "DL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -464,35 +460,42 @@
 /obj/item/bikehorn,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ex" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
+"Fb" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	invisibility = 101
+	},
+/turf/closed/indestructible/binary,
+/area/virtual_domain/fullbright)
 "FI" = (
 /obj/item/reagent_containers/cup/glass/trophy/gold_cup,
 /obj/structure/table/glass,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Gg" = (
 /obj/structure/table/glass,
 /obj/item/gun/magic/staff/honk,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Hq" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Hr" = (
 /obj/structure/table/glass,
 /obj/item/clothing/shoes/clown_shoes/banana_shoes,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "HQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -500,10 +503,13 @@
 /obj/machinery/light/small/directional/east,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ie" = (
+/obj/structure/disposalpipe/segment{
+	invisibility = 101
+	},
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "Iz" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
@@ -511,20 +517,20 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "IN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "IY" = (
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Jv" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "JB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -533,28 +539,28 @@
 /obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ka" = (
 /obj/effect/decal/cleanable/food/pie_smudge,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Kh" = (
 /obj/effect/mob_spawn/corpse/human/damaged,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "KG" = (
 /obj/item/pickaxe,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "KI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	invisibility = 101
 	},
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Lv" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -562,18 +568,18 @@
 	},
 /obj/machinery/light/small/directional/east,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Nv" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "NB" = (
 /obj/machinery/disposal/delivery_chute,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "NL" = (
 /obj/machinery/disposal/delivery_chute{
 	desc = "The following is engraved upon the chute: A FATE WORSE THAN DEATH LIES WITHIN";
@@ -583,12 +589,12 @@
 /obj/structure/disposalpipe/trunk,
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "NW" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/spray/waterflower/superlube,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ok" = (
 /obj/item/bikehorn,
 /obj/structure/disposalpipe/segment{
@@ -596,7 +602,7 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ov" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -604,7 +610,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "PJ" = (
 /obj/structure/disposalpipe/trunk,
 /obj/structure/disposaloutlet{
@@ -612,10 +618,10 @@
 	},
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "PM" = (
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "PQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -623,20 +629,20 @@
 	},
 /obj/item/pickaxe,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "QP" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
 "QX" = (
 /obj/structure/closet/crate/secure/bitrunning/encrypted,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Rh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Rx" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -645,13 +651,7 @@
 /obj/structure/table,
 /obj/item/flashlight/lamp/bananalamp,
 /turf/open/indestructible/white,
-/area/virtual_domain)
-"RU" = (
-/obj/structure/disposalpipe/segment{
-	invisibility = 101
-	},
-/turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Sg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -660,13 +660,13 @@
 /obj/effect/decal/cleanable/food/pie_smudge,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Sm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Tm" = (
 /obj/effect/decal/cleanable/food/pie_smudge,
 /obj/structure/disposalpipe/segment{
@@ -674,13 +674,13 @@
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Tx" = (
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "TH" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -689,60 +689,59 @@
 	dir = 8
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "TK" = (
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
 /turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ug" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "UL" = (
 /obj/effect/decal/cleanable/oil,
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "UN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /turf/open/floor/plating,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "UQ" = (
 /obj/structure/disposalpipe/segment{
 	invisibility = 101
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "UY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Vx" = (
 /obj/structure/disposalpipe/segment{
-	dir = 4;
-	invisibility = 101
+	dir = 5
 	},
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "VI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 10
 	},
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "VQ" = (
 /turf/open/floor/noslip,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Ww" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -751,40 +750,42 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/yellow/fourcorners,
 /turf/open/indestructible/permalube,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "WB" = (
 /obj/machinery/disposal/delivery_chute{
 	dir = 1
 	},
 /obj/structure/disposalpipe/trunk,
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "WT" = (
-/obj/machinery/door/airlock/bananium,
+/obj/machinery/door/airlock/bananium{
+	use_power = 0
+	},
 /turf/open/floor/carpet,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "WX" = (
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Xp" = (
 /obj/machinery/light/directional/south,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "XB" = (
 /obj/machinery/light/directional/north,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "Yb" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/indestructible/honk,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "YP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	invisibility = 101
 	},
 /turf/open/indestructible/white,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 "ZR" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 8
@@ -793,44 +794,44 @@
 	dir = 4
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/virtual_domain)
+/area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-Ie
-Ie
-rT
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-rr
 hY
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
 hY
 hY
 hY
@@ -842,9 +843,9 @@ hY
 hY
 "}
 (2,1,1) = {"
-Ie
-Ie
-Vx
+hY
+tF
+gd
 Ie
 Ie
 Ie
@@ -876,7 +877,7 @@ Ie
 Ie
 Ie
 Vx
-hY
+tF
 hY
 hY
 hY
@@ -888,41 +889,41 @@ hY
 hY
 "}
 (3,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
-by
-by
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Vx
 hY
+tF
+Fb
+tF
+tF
+tF
+tF
+tF
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+qg
+qg
+qg
+qg
+qg
+tF
+tF
+tF
+tF
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -934,41 +935,41 @@ hY
 hY
 "}
 (4,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-Ie
-by
-by
-by
+hY
+tF
+Fb
+tF
+tF
+tF
+qg
+qg
+qg
 ik
 ik
 ik
 ik
 ik
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
+qg
+qg
+tF
+tF
+hY
+tF
+tF
+qg
+qg
 ik
 ik
 ik
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Vx
+qg
+qg
+qg
+tF
+tF
 hY
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -980,13 +981,13 @@ hY
 hY
 "}
 (5,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-by
-by
+hY
+tF
+Fb
+tF
+tF
+qg
+qg
 ik
 ik
 ik
@@ -995,26 +996,26 @@ Sm
 Hq
 Sm
 ik
-by
-by
-Ie
-Ie
-Ie
-by
-by
+qg
+qg
+tF
+tF
+tF
+qg
+qg
 ik
 ik
 tq
 mD
 ik
 ik
-by
-by
-Ie
-Ie
-Ie
-Vx
-hY
+qg
+qg
+tF
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -1026,12 +1027,12 @@ hY
 hY
 "}
 (6,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-by
-by
+hY
+tF
+Fb
+tF
+qg
+qg
 ik
 ik
 IN
@@ -1042,11 +1043,11 @@ yZ
 aP
 Sm
 ik
-by
-by
-by
-by
-by
+qg
+qg
+qg
+qg
+qg
 Nv
 IY
 tq
@@ -1055,12 +1056,12 @@ ik
 ik
 ik
 ik
-by
-by
-Ie
-Ie
-Vx
-hY
+qg
+qg
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -1072,14 +1073,14 @@ hY
 hY
 "}
 (7,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-by
+hY
+tF
+Fb
+tF
+qg
 ik
 ik
-by
+qg
 Bi
 cw
 UQ
@@ -1088,11 +1089,11 @@ UQ
 UY
 KI
 ik
-by
+qg
 IY
 Jv
 IY
-by
+qg
 IY
 Jv
 Kh
@@ -1102,11 +1103,11 @@ ik
 tq
 ik
 ik
-by
-Ie
-Ie
-Vx
-hY
+qg
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -1118,11 +1119,11 @@ hY
 hY
 "}
 (8,1,1) = {"
-Ie
-Ie
-Vx
-by
-by
+hY
+tF
+Fb
+qg
+qg
 ik
 IN
 Tm
@@ -1133,7 +1134,7 @@ UQ
 Sm
 KI
 KI
-by
+qg
 zm
 oA
 IY
@@ -1144,15 +1145,15 @@ Jv
 IY
 IY
 IY
-by
+qg
 ik
 mD
 ik
-by
-by
-Ie
-Vx
-hY
+qg
+qg
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -1164,10 +1165,10 @@ hY
 hY
 "}
 (9,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 ik
 UN
@@ -1180,14 +1181,14 @@ KI
 YP
 Cp
 uY
-by
+qg
 sq
 oA
 IY
-by
-by
+qg
+qg
 Jv
-by
+qg
 IY
 IY
 IY
@@ -1195,25 +1196,25 @@ tq
 ik
 ik
 ik
-by
-Ie
-Vx
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
+qg
+tF
+Fb
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
 tF
 "}
 (10,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 IN
 UQ
@@ -1227,8 +1228,8 @@ YP
 YP
 KG
 uY
-by
-by
+qg
+qg
 oA
 IY
 IY
@@ -1238,28 +1239,28 @@ IY
 gH
 Jv
 Xp
-by
+qg
 ik
 ik
-by
-by
+qg
+qg
 KI
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+qg
 by
-by
-by
-by
-by
-by
-by
-by
-by
-Ie
+tF
 "}
 (11,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 yz
 fh
@@ -1277,7 +1278,7 @@ oA
 oA
 oA
 IY
-by
+qg
 IY
 IY
 Jv
@@ -1287,8 +1288,8 @@ IY
 ik
 tq
 ik
-by
-by
+qg
+qg
 iR
 PM
 PM
@@ -1298,14 +1299,14 @@ PM
 PM
 PM
 PM
-by
-Ie
+qg
+tF
 "}
 (12,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 Hq
 TK
@@ -1319,12 +1320,12 @@ PQ
 tt
 bp
 uY
-by
+qg
 oA
 oA
 IY
 IY
-by
+qg
 IY
 IY
 IY
@@ -1334,7 +1335,7 @@ ik
 tq
 ik
 ik
-by
+qg
 iR
 yS
 PM
@@ -1344,14 +1345,14 @@ PM
 PM
 yS
 PM
-by
-Ie
+qg
+tF
 "}
 (13,1,1) = {"
-Ie
-Ie
-Vx
-by
+tF
+tF
+Fb
+qg
 ik
 UN
 UQ
@@ -1364,23 +1365,23 @@ KI
 YP
 Lv
 WX
-by
-by
+qg
+qg
 oA
 IY
 IY
-by
-by
+qg
+qg
 IY
 IY
-by
+qg
 IY
 Jv
 ik
 mD
 tq
 ik
-by
+qg
 iR
 PM
 PM
@@ -1390,12 +1391,12 @@ PM
 PM
 PM
 PM
-by
-Ie
+qg
+tF
 "}
 (14,1,1) = {"
-Ie
-by
+tF
+qg
 KI
 nE
 nE
@@ -1412,12 +1413,12 @@ KI
 ps
 TK
 Sm
-by
-by
-by
+qg
+qg
+qg
 zA
 rg
-by
+qg
 XB
 IY
 Jv
@@ -1426,7 +1427,7 @@ IY
 ik
 tq
 ik
-by
+qg
 iR
 PM
 QP
@@ -1436,16 +1437,16 @@ QP
 QP
 xt
 PM
-by
-Ie
+qg
+tF
 "}
 (15,1,1) = {"
-Ie
-by
+tF
+qg
 ij
 hK
 nE
-by
+qg
 yz
 UQ
 UQ
@@ -1458,13 +1459,13 @@ Do
 Iz
 kn
 Ww
-by
-by
+qg
+qg
 FI
 mF
 mF
 mF
-by
+qg
 IY
 Jv
 Jv
@@ -1472,7 +1473,7 @@ IY
 ik
 tq
 ik
-by
+qg
 ZR
 PM
 QP
@@ -1482,12 +1483,12 @@ QP
 QP
 QP
 PM
-by
-Ie
+qg
+tF
 "}
 (16,1,1) = {"
-Ie
-by
+tF
+qg
 VQ
 uX
 NL
@@ -1505,20 +1506,20 @@ pl
 Do
 Ex
 UY
-by
+qg
 Ug
 oI
 NW
 mF
-by
-by
+qg
+qg
 Jv
 IY
 IY
 ik
 tq
 ik
-by
+qg
 PM
 PM
 QP
@@ -1528,16 +1529,16 @@ QP
 QP
 QP
 PM
-by
-Ie
+qg
+tF
 "}
 (17,1,1) = {"
-Ie
-by
+tF
+qg
 VQ
 bR
 wz
-by
+qg
 Hq
 UQ
 Sm
@@ -1560,11 +1561,11 @@ WT
 IY
 Jv
 IY
-by
+qg
 ik
 tq
 ik
-by
+qg
 PM
 PM
 QP
@@ -1574,12 +1575,12 @@ QP
 QP
 QP
 PM
-by
-Ie
+qg
+tF
 "}
 (18,1,1) = {"
-Ie
-by
+tF
+qg
 VQ
 uX
 PJ
@@ -1597,12 +1598,12 @@ Ok
 mE
 rH
 pl
-by
+qg
 mF
 Hr
 Gg
 mF
-by
+qg
 IY
 IY
 IY
@@ -1610,7 +1611,7 @@ IY
 ik
 tq
 ik
-by
+qg
 PM
 PM
 QP
@@ -1620,17 +1621,17 @@ QP
 QP
 QP
 PM
-by
-Ie
+qg
+tF
 "}
 (19,1,1) = {"
-Ie
-by
+tF
+qg
 zF
 uX
 nE
-by
-by
+qg
+qg
 Ww
 Ww
 Ww
@@ -1643,12 +1644,12 @@ UY
 Ka
 KI
 tv
-by
+qg
 FI
 mF
 mF
 QX
-by
+qg
 IY
 IY
 IY
@@ -1656,7 +1657,7 @@ IY
 ik
 tq
 ik
-by
+qg
 lj
 PM
 QP
@@ -1666,34 +1667,34 @@ QP
 QP
 QP
 PM
-by
-Ie
+qg
+tF
 "}
 (20,1,1) = {"
-Ie
-by
+tF
+qg
 KI
 nE
 nE
 ik
-by
+qg
 Ww
 Ww
 Cs
 Do
 Do
 KI
-by
-by
+qg
+qg
 bQ
-by
+qg
 ba
-by
+qg
 IY
-by
+qg
 zA
 tI
-by
+qg
 XB
 IY
 Jv
@@ -1702,7 +1703,7 @@ IY
 ik
 tq
 ik
-by
+qg
 iR
 PM
 QP
@@ -1712,17 +1713,17 @@ QP
 QP
 gr
 PM
-by
-Ie
+qg
+tF
 "}
 (21,1,1) = {"
-Ie
-Ie
-Vx
-by
+tF
+tF
+Fb
+qg
 ik
-by
-by
+qg
+qg
 Do
 Do
 Do
@@ -1732,13 +1733,13 @@ KI
 rh
 ed
 gK
-by
+qg
 UL
 Sm
 IY
 IY
-by
-by
+qg
+qg
 Kh
 IY
 IY
@@ -1748,7 +1749,7 @@ ik
 tq
 mD
 ik
-by
+qg
 iR
 PM
 PM
@@ -1758,17 +1759,17 @@ PM
 PM
 PM
 PM
-by
-Ie
+qg
+tF
 "}
 (22,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
-by
-by
+qg
+qg
 JB
 Sg
 KI
@@ -1779,12 +1780,12 @@ YP
 bp
 bp
 uY
-by
+qg
 bQ
 oA
 IY
 IY
-by
+qg
 IY
 Jv
 IY
@@ -1794,7 +1795,7 @@ ik
 tq
 ik
 ik
-by
+qg
 iR
 PM
 PM
@@ -1804,14 +1805,14 @@ PM
 PM
 PM
 PM
-by
-Ie
+qg
+tF
 "}
 (23,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 cM
 eE
@@ -1827,7 +1828,7 @@ bp
 WB
 TK
 Aa
-by
+qg
 IY
 IY
 Jv
@@ -1836,11 +1837,11 @@ Jv
 IY
 aM
 Xp
-by
+qg
 tq
 ik
-by
-by
+qg
+qg
 iR
 PM
 PM
@@ -1850,17 +1851,17 @@ PM
 PM
 PM
 PM
-by
-Ie
+qg
+tF
 "}
 (24,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
-by
-by
+qg
+qg
 lP
 Do
 Do
@@ -1871,7 +1872,7 @@ bq
 Rh
 WX
 uY
-by
+qg
 oA
 oA
 IY
@@ -1880,33 +1881,33 @@ Jv
 Jv
 IY
 IY
-by
-by
+qg
+qg
 ik
 mD
 ik
-by
-by
+qg
+qg
 KI
-by
-by
-by
-by
-by
-by
-by
-by
-by
-Ie
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+tF
 "}
 (25,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
-by
-by
+qg
+qg
 pl
 Do
 KI
@@ -1916,7 +1917,7 @@ KI
 rh
 lm
 uY
-by
+qg
 sq
 oA
 IY
@@ -1924,35 +1925,35 @@ IY
 IY
 IY
 IY
-by
+qg
 IY
 IY
 ik
 mD
 ik
 ik
-by
-Ie
-Vx
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
+qg
+tF
+Fb
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
 "}
 (26,1,1) = {"
-Ie
-Ie
-Vx
-by
+hY
+tF
+Fb
+qg
 ik
 ik
-by
+qg
 yd
 Do
 Do
@@ -1960,8 +1961,8 @@ Do
 Ex
 lx
 KI
-by
-by
+qg
+qg
 oA
 oA
 IY
@@ -1972,15 +1973,15 @@ aM
 IY
 IY
 IY
-by
+qg
 ik
 tq
 ik
-by
-by
-Ie
-Vx
-hY
+qg
+qg
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -1992,41 +1993,41 @@ hY
 hY
 "}
 (27,1,1) = {"
-Ie
-Ie
-Vx
-by
-by
+hY
+tF
+Fb
+qg
+qg
 ik
-by
-by
+qg
+qg
 Ex
 lx
 HQ
 UQ
 UQ
 bU
-by
+qg
 ik
-by
+qg
 Yb
 IY
 IY
-by
+qg
 IY
 IY
-by
+qg
 IY
 IY
 ik
 mD
 ik
 ik
-by
-Ie
-Ie
-Vx
-hY
+qg
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -2038,27 +2039,27 @@ hY
 hY
 "}
 (28,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-by
-by
+hY
+tF
+Fb
+tF
+qg
+qg
 ik
 ik
-by
+qg
 mD
-by
+qg
 Ka
 lP
 mD
-by
+qg
 ik
-by
-by
-by
-by
-by
+qg
+qg
+qg
+qg
+qg
 IY
 IY
 IY
@@ -2067,12 +2068,12 @@ ik
 ik
 ik
 ik
-by
-by
-Ie
-Ie
-Vx
-hY
+qg
+qg
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -2084,41 +2085,41 @@ hY
 hY
 "}
 (29,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-by
-by
+hY
+tF
+Fb
+tF
+tF
+qg
+qg
 ik
 ik
 ik
 tq
 tq
 tq
-by
+qg
 ik
-by
-by
-Ie
-Ie
-Ie
-by
-by
+qg
+qg
+tF
+tF
+tF
+qg
+qg
 ik
 ik
 mD
 tq
 ik
 ik
-by
-by
-Ie
-Ie
-Ie
-Vx
-hY
+qg
+qg
+tF
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -2130,41 +2131,41 @@ hY
 hY
 "}
 (30,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-Ie
-by
-by
-by
+hY
+tF
+Fb
+tF
+tF
+tF
+qg
+qg
+qg
 ik
 ik
 ik
 ik
 ik
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
+qg
+qg
+tF
+tF
+hY
+tF
+tF
+qg
+qg
 ik
 ik
 ik
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Vx
+qg
+qg
+qg
+tF
+tF
 hY
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -2176,41 +2177,41 @@ hY
 hY
 "}
 (31,1,1) = {"
-Ie
-Ie
-Vx
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
-by
-by
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-by
-by
-by
-by
-by
-Ie
-Ie
-Ie
-Ie
-Ie
-Ie
-Vx
 hY
+tF
+Fb
+tF
+tF
+tF
+tF
+tF
+qg
+qg
+qg
+qg
+qg
+qg
+qg
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+qg
+qg
+qg
+qg
+qg
+tF
+tF
+tF
+tF
+tF
+tF
+Fb
+tF
 hY
 hY
 hY
@@ -2222,56 +2223,9 @@ hY
 hY
 "}
 (32,1,1) = {"
-Ie
-Ie
-VI
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-ly
-hY
-hY
-hY
-hY
-hY
 hY
-hY
-hY
-hY
-hY
-"}
-(33,1,1) = {"
-Ie
-Ie
-Ie
-Ie
+tF
+VI
 Ie
 Ie
 Ie
@@ -2302,7 +2256,54 @@ Ie
 Ie
 Ie
 Ie
+ly
+tF
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+hY
+"}
+(33,1,1) = {"
 hY
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
+tF
 hY
 hY
 hY
diff --git a/_maps/virtual_domains/colossus.dmm b/_maps/virtual_domains/colossus.dmm
index 19570e13daf81..d246ad52fa1e7 100644
--- a/_maps/virtual_domains/colossus.dmm
+++ b/_maps/virtual_domains/colossus.dmm
@@ -34,9 +34,8 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
 "q" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/open/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
+/area/virtual_domain/fullbright)
 "r" = (
 /obj/machinery/light/small/blacklight/directional/south,
 /obj/effect/baseturf_helper/virtual_domain,
@@ -45,13 +44,14 @@
 "s" = (
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors/virtual_domain)
+"t" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors/virtual_domain)
 "u" = (
 /obj/structure/marker_beacon/indigo,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
-"v" = (
-/turf/open/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
 "x" = (
 /obj/structure/marker_beacon/purple,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
@@ -91,56 +91,55 @@
 /area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
 q
 "}
 (2,1,1) = {"
-v
-k
+q
 k
 k
 k
@@ -184,10 +183,11 @@ k
 k
 k
 k
-v
+t
+q
 "}
 (3,1,1) = {"
-v
+q
 k
 a
 a
@@ -232,10 +232,10 @@ a
 k
 k
 k
-v
+q
 "}
 (4,1,1) = {"
-v
+q
 k
 a
 a
@@ -280,10 +280,10 @@ a
 a
 a
 k
-v
+q
 "}
 (5,1,1) = {"
-v
+q
 k
 a
 a
@@ -328,10 +328,10 @@ a
 a
 s
 k
-v
+q
 "}
 (6,1,1) = {"
-v
+q
 k
 a
 a
@@ -376,10 +376,10 @@ a
 s
 s
 k
-v
+q
 "}
 (7,1,1) = {"
-v
+q
 k
 a
 a
@@ -424,10 +424,10 @@ a
 a
 s
 k
-v
+q
 "}
 (8,1,1) = {"
-v
+q
 k
 a
 a
@@ -472,10 +472,10 @@ a
 a
 k
 k
-v
+q
 "}
 (9,1,1) = {"
-v
+q
 k
 a
 a
@@ -520,10 +520,10 @@ a
 a
 k
 k
-v
+q
 "}
 (10,1,1) = {"
-v
+q
 k
 k
 a
@@ -568,10 +568,10 @@ a
 a
 k
 k
-v
+q
 "}
 (11,1,1) = {"
-v
+q
 k
 k
 a
@@ -616,10 +616,10 @@ a
 a
 a
 k
-v
+q
 "}
 (12,1,1) = {"
-v
+q
 k
 k
 a
@@ -664,10 +664,10 @@ a
 a
 a
 k
-v
+q
 "}
 (13,1,1) = {"
-v
+q
 k
 k
 a
@@ -712,10 +712,10 @@ a
 a
 a
 k
-v
+q
 "}
 (14,1,1) = {"
-v
+q
 k
 a
 a
@@ -760,10 +760,10 @@ a
 a
 a
 k
-v
+q
 "}
 (15,1,1) = {"
-v
+q
 k
 a
 a
@@ -808,10 +808,10 @@ a
 a
 a
 k
-v
+q
 "}
 (16,1,1) = {"
-v
+q
 k
 a
 a
@@ -856,10 +856,10 @@ a
 a
 a
 k
-v
+q
 "}
 (17,1,1) = {"
-v
+q
 k
 a
 a
@@ -904,10 +904,10 @@ a
 a
 a
 k
-v
+q
 "}
 (18,1,1) = {"
-v
+q
 k
 a
 a
@@ -952,10 +952,10 @@ a
 a
 a
 k
-v
+q
 "}
 (19,1,1) = {"
-v
+q
 k
 a
 a
@@ -1000,10 +1000,10 @@ a
 a
 a
 k
-v
+q
 "}
 (20,1,1) = {"
-v
+q
 k
 a
 a
@@ -1048,10 +1048,10 @@ a
 a
 a
 k
-v
+q
 "}
 (21,1,1) = {"
-v
+q
 k
 a
 a
@@ -1096,10 +1096,10 @@ U
 N
 a
 k
-v
+q
 "}
 (22,1,1) = {"
-v
+q
 k
 a
 a
@@ -1144,10 +1144,10 @@ U
 U
 a
 k
-v
+q
 "}
 (23,1,1) = {"
-v
+q
 k
 a
 a
@@ -1192,10 +1192,10 @@ U
 U
 a
 k
-v
+q
 "}
 (24,1,1) = {"
-v
+q
 k
 a
 a
@@ -1240,10 +1240,10 @@ U
 U
 a
 k
-v
+q
 "}
 (25,1,1) = {"
-v
+q
 k
 a
 a
@@ -1288,10 +1288,10 @@ U
 U
 a
 k
-v
+q
 "}
 (26,1,1) = {"
-v
+q
 k
 a
 a
@@ -1336,10 +1336,10 @@ U
 U
 a
 k
-v
+q
 "}
 (27,1,1) = {"
-v
+q
 k
 a
 a
@@ -1384,10 +1384,10 @@ U
 D
 a
 k
-v
+q
 "}
 (28,1,1) = {"
-v
+q
 k
 a
 a
@@ -1432,10 +1432,10 @@ a
 a
 a
 k
-v
+q
 "}
 (29,1,1) = {"
-v
+q
 k
 a
 a
@@ -1480,10 +1480,10 @@ a
 a
 a
 k
-v
+q
 "}
 (30,1,1) = {"
-v
+q
 k
 a
 a
@@ -1528,10 +1528,10 @@ a
 a
 a
 k
-v
+q
 "}
 (31,1,1) = {"
-v
+q
 k
 a
 a
@@ -1576,10 +1576,10 @@ a
 a
 a
 k
-v
+q
 "}
 (32,1,1) = {"
-v
+q
 k
 a
 a
@@ -1624,10 +1624,10 @@ a
 a
 a
 k
-v
+q
 "}
 (33,1,1) = {"
-v
+q
 k
 a
 a
@@ -1672,10 +1672,10 @@ a
 a
 a
 k
-v
+q
 "}
 (34,1,1) = {"
-v
+q
 k
 k
 a
@@ -1720,10 +1720,10 @@ a
 a
 a
 k
-v
+q
 "}
 (35,1,1) = {"
-v
+q
 k
 k
 a
@@ -1768,10 +1768,10 @@ a
 a
 a
 k
-v
+q
 "}
 (36,1,1) = {"
-v
+q
 k
 k
 a
@@ -1816,10 +1816,10 @@ a
 a
 a
 k
-v
+q
 "}
 (37,1,1) = {"
-v
+q
 k
 k
 a
@@ -1864,10 +1864,10 @@ a
 a
 k
 k
-v
+q
 "}
 (38,1,1) = {"
-v
+q
 k
 a
 a
@@ -1912,10 +1912,10 @@ a
 a
 k
 k
-v
+q
 "}
 (39,1,1) = {"
-v
+q
 k
 a
 a
@@ -1960,10 +1960,10 @@ a
 a
 a
 k
-v
+q
 "}
 (40,1,1) = {"
-v
+q
 k
 a
 a
@@ -2008,10 +2008,10 @@ a
 a
 a
 k
-v
+q
 "}
 (41,1,1) = {"
-v
+q
 k
 a
 a
@@ -2056,10 +2056,10 @@ a
 a
 a
 k
-v
+q
 "}
 (42,1,1) = {"
-v
+q
 k
 a
 a
@@ -2104,10 +2104,10 @@ a
 a
 a
 k
-v
+q
 "}
 (43,1,1) = {"
-v
+q
 k
 a
 k
@@ -2152,10 +2152,10 @@ k
 a
 a
 k
-v
+q
 "}
 (44,1,1) = {"
-v
+q
 k
 k
 k
@@ -2200,53 +2200,53 @@ k
 k
 k
 k
-v
+q
 "}
 (45,1,1) = {"
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
-v
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
 "}
diff --git a/_maps/virtual_domains/fredingtonfastingbear.dmm b/_maps/virtual_domains/fredingtonfastingbear.dmm
index 4da8210c90e1a..422395c72bc97 100644
--- a/_maps/virtual_domains/fredingtonfastingbear.dmm
+++ b/_maps/virtual_domains/fredingtonfastingbear.dmm
@@ -1,11 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aV" = (
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bu" = (
 /obj/machinery/oven/range,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bL" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -14,7 +14,7 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/greenglow,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bP" = (
 /obj/structure/sign/poster/official/report_crimes,
 /turf/closed/indestructible/reinforced,
@@ -23,7 +23,7 @@
 /obj/machinery/chem_dispenser/drinks/beer,
 /obj/structure/table/wood,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bW" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -32,7 +32,7 @@
 	pixel_y = 6
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cn" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -41,40 +41,41 @@
 	pixel_y = 2
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cp" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /mob/living/basic/bear/snow,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cY" = (
 /obj/structure/sign/poster/official/no_erp/directional/north,
 /obj/structure/sign/poster/official/no_erp/directional/north,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dl" = (
 /obj/structure/sign/poster/contraband/blood_geometer/directional/south,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dz" = (
 /obj/structure/table/wood,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dN" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/blood/xtracks,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dV" = (
 /obj/structure/table/glass,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ex" = (
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/obj/structure/sign/poster/contraband/bountyhunters/directional/south,
+/turf/template_noop,
+/area/virtual_domain)
 "eE" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -83,28 +84,28 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "eW" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fd" = (
 /obj/structure/table/wood/poker,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fo" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/cup/glass/shaker{
 	pixel_x = 5
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fy" = (
 /obj/machinery/stove,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fz" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -114,15 +115,15 @@
 	pixel_y = 6
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fU" = (
 /obj/effect/decal/cleanable/blood/footprints,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "gl" = (
 /obj/structure/sign/poster/contraband/blasto_detergent,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "gL" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -132,7 +133,7 @@
 	},
 /obj/machinery/light/built/directional/east,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hq" = (
 /obj/structure/table/reinforced,
 /obj/item/flashlight/seclite{
@@ -147,11 +148,11 @@
 "hI" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hK" = (
 /obj/item/trash/popcorn,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hR" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -160,7 +161,7 @@
 /obj/effect/decal/cleanable/confetti,
 /obj/effect/decal/cleanable/insectguts,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "jE" = (
 /obj/structure/sign/poster/abductor/ayy_over_tizira,
 /obj/structure/sign/poster/official/the_owl,
@@ -174,71 +175,71 @@
 	dir = 4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kf" = (
 /obj/structure/chair/stool/bar/directional/east,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "km" = (
 /obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kL" = (
 /obj/machinery/light/built/directional/west,
 /obj/item/light/tube/broken,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lc" = (
 /obj/machinery/vending/boozeomat,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lL" = (
 /obj/structure/table,
 /obj/item/kitchen/rollingpin/illegal,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lP" = (
 /obj/machinery/vending/sovietsoda,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lS" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ma" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/structure/table,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ms" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mC" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/structure/table,
 /obj/item/food/pizza,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mX" = (
 /obj/machinery/computer/arcade/amputation{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ng" = (
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "nF" = (
 /obj/effect/spawner/structure/window/reinforced/indestructible,
 /turf/open/floor/iron,
@@ -251,11 +252,11 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/item/clothing/mask/animal/small/bear/cursed,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "nX" = (
 /obj/structure/chair/sofa/corp/left,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ob" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -263,12 +264,12 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/greenglow,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "of" = (
 /obj/structure/railing,
 /obj/effect/decal/cleanable/fuel_pool/hivis,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "oO" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -276,23 +277,23 @@
 	dir = 4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pr" = (
 /obj/machinery/light/built/directional/east,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pK" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pX" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/item/restraints/legcuffs/beartrap/prearmed,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ql" = (
 /obj/structure/table/reinforced,
 /obj/item/toy/plush/nukeplushie{
@@ -307,20 +308,20 @@
 /area/virtual_domain/protected_space/fullbright)
 "qK" = (
 /turf/closed/indestructible/fakedoor,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rc" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "re" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ri" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -329,14 +330,14 @@
 	},
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rB" = (
 /obj/item/trash/boritos/green{
 	pixel_x = 4;
 	pixel_y = 11
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rD" = (
 /obj/machinery/door/poddoor{
 	id = "door2"
@@ -350,21 +351,20 @@
 	dir = 4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sg" = (
-/obj/structure/sign/poster/contraband/bountyhunters/directional/south,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/template_noop,
+/area/virtual_domain)
 "si" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/structure/table,
 /obj/item/balloon_mallet,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sk" = (
 /obj/machinery/computer/slot_machine,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sl" = (
 /obj/effect/spawner/structure/window/reinforced/indestructible,
 /obj/structure/sign/poster/contraband/space_cola/directional/north,
@@ -375,28 +375,28 @@
 	dir = 1
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "td" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/decal/chempuff,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "to" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "tC" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/structure/table,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "tI" = (
 /obj/item/trash/can,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "tN" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -405,7 +405,7 @@
 /obj/structure/table/wood/poker,
 /obj/item/trash/ready_donk,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ud" = (
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/cafeteria,
@@ -415,40 +415,40 @@
 	dir = 1
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "uZ" = (
 /obj/effect/decal/cleanable/food/salt,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ve" = (
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vk" = (
 /obj/structure/railing,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vm" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vs" = (
 /obj/structure/closet/secure_closet/freezer/cream_pie,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vw" = (
 /mob/living/basic/bear/butter,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vy" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/decal/cleanable/blood/gibs/down,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vz" = (
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/iron,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vF" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -458,18 +458,18 @@
 	id = "door2"
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vG" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vR" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/structure/table,
 /obj/item/trash/tray,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vT" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -478,7 +478,7 @@
 	},
 /obj/effect/decal/cleanable/insectguts,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "wM" = (
 /obj/item/toy/balloon/heart,
 /obj/machinery/light/built/directional/west,
@@ -486,47 +486,47 @@
 	dir = 1
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xa" = (
 /obj/structure/railing,
 /obj/structure/curtain/cloth/fancy/mechanical/start_closed,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xk" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/structure/table,
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xv" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/structure/sign/poster/official/moth_hardhat/directional/west,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xY" = (
 /obj/effect/decal/cleanable/insectguts,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yz" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yB" = (
 /obj/structure/railing,
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "zU" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ag" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -534,11 +534,11 @@
 	dir = 4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ak" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "AF" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/cup/glass/bottle/goldschlager{
@@ -549,23 +549,23 @@
 	pixel_x = -4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Bc" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
 "Bf" = (
 /obj/effect/spawner/random/trash/graffiti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Bj" = (
 /obj/machinery/computer/arcade/amputation,
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Bo" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "BU" = (
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/cafeteria,
@@ -578,16 +578,16 @@
 	},
 /obj/effect/decal/cleanable/blood/gibs/up,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Cm" = (
 /turf/template_noop,
-/area/space)
+/area/template_noop)
 "Ct" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/machinery/light/built/directional/east,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Dx" = (
 /obj/effect/decal/cleanable/fuel_pool,
 /obj/effect/decal/cleanable/confetti,
@@ -596,7 +596,7 @@
 "Dz" = (
 /mob/living/basic/bear/fightpit,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "DV" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/iron/cafeteria,
@@ -609,14 +609,14 @@
 	},
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "EP" = (
 /obj/structure/railing{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/leaper_sludge,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Fc" = (
 /turf/closed/indestructible/reinforced,
 /area/virtual_domain/protected_space/fullbright)
@@ -625,29 +625,29 @@
 /obj/machinery/light/built/directional/west,
 /obj/structure/fake_stairs/wood,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "FA" = (
 /obj/effect/decal/cleanable/food/flour,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Gb" = (
 /obj/item/trash/peanuts,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Gn" = (
 /obj/machinery/light/built/directional/east,
 /obj/effect/decal/cleanable/food/tomato_smudge,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "GD" = (
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "GK" = (
 /obj/structure/closet/crate/trashcart/filled,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Hi" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -655,12 +655,12 @@
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ho" = (
 /obj/effect/decal/cleanable/fuel_pool/hivis,
 /mob/living/basic/bear/fightpit,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "HE" = (
 /obj/structure/table/reinforced,
 /obj/item/gun/energy/laser{
@@ -685,11 +685,11 @@
 "HG" = (
 /obj/structure/curtain/cloth/fancy/mechanical,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "If" = (
 /mob/living/basic/bear/russian,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Io" = (
 /obj/structure/closet/crate/trashcart/filled,
 /turf/open/misc/dirt/jungle,
@@ -697,12 +697,12 @@
 "IX" = (
 /obj/machinery/computer/arcade/amputation,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "IY" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck/syndicate,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Jh" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -712,13 +712,13 @@
 	pixel_y = 8
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JD" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JF" = (
 /obj/modular_map_root/safehouse{
 	key = "wood"
@@ -735,11 +735,11 @@
 	},
 /obj/item/trash/pistachios,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "KJ" = (
 /mob/living/basic/bear/fightpit,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ln" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -748,11 +748,11 @@
 	},
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "LP" = (
 /obj/item/trash/shrimp_chips,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "LU" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
@@ -762,7 +762,7 @@
 	id = "door1"
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Mc" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -774,24 +774,24 @@
 	dir = 8
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Mm" = (
 /obj/structure/chair/stool/bar/directional/north,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Mq" = (
 /obj/structure/sign/poster/contraband/ambrosia_vulgaris/directional/west,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ML" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "MO" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "MS" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -800,84 +800,84 @@
 	pixel_y = 2
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ne" = (
 /turf/closed/indestructible/binary,
-/area/space)
+/area/virtual_domain/fullbright)
 "Nz" = (
 /obj/structure/sign/poster/official/pda_ad/directional/north,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "NA" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "NE" = (
 /obj/structure/sign/poster/abductor/ayy_cops/directional/north,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Od" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ox" = (
 /obj/structure/sign/poster/official/the_owl,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "OB" = (
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "OD" = (
 /mob/living/basic/bear/russian,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "OM" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/food/salt,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Pm" = (
 /obj/structure/chair/sofa/corp/right,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "PK" = (
 /obj/structure/curtain/cloth/fancy/mechanical,
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Qg" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/item/toy/balloon/heart,
 /obj/machinery/light/built/directional/west,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "RB" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/built/directional/west,
 /obj/effect/decal/cleanable/glass/plastitanium,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sp" = (
 /obj/structure/chair/sofa/corp,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sr" = (
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "SE" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/built/directional/east,
 /obj/effect/decal/cleanable/glass/plastitanium,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "SW" = (
 /obj/machinery/door/poddoor{
 	id = "door1"
@@ -891,11 +891,11 @@
 	pixel_y = 6
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Tp" = (
 /obj/structure/sign/poster/official/soft_cap_pop_art,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Tq" = (
 /turf/open/misc/dirt/jungle,
 /area/virtual_domain/fullbright)
@@ -907,34 +907,34 @@
 	},
 /obj/effect/decal/cleanable/insectguts,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "TR" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/effect/decal/cleanable/ants/fire,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "TW" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /mob/living/basic/bear/snow,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Uj" = (
 /obj/structure/curtain/bounty/start_closed,
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "Ux" = (
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "UR" = (
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "UW" = (
 /obj/structure/sign/poster/official/no_erp/directional/north,
 /turf/closed/indestructible/reinforced,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Vd" = (
 /turf/open/floor/iron/cafeteria,
 /area/virtual_domain/protected_space/fullbright)
@@ -942,14 +942,14 @@
 /obj/structure/table,
 /obj/item/kitchen/tongs,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Vs" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/decal/cleanable/blood/gibs/old,
 /obj/machinery/light/built/directional/west,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "VS" = (
 /obj/structure/table/reinforced,
 /obj/item/modular_computer/laptop/preset/civilian,
@@ -958,7 +958,7 @@
 "VW" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Wj" = (
 /obj/structure/sign/poster/contraband/free_key/directional,
 /turf/closed/indestructible/reinforced,
@@ -966,7 +966,7 @@
 "Wy" = (
 /obj/effect/decal/cleanable/molten_object/large,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "WG" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -975,11 +975,11 @@
 	},
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "XG" = (
 /obj/machinery/roulette,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yd" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
@@ -987,26 +987,26 @@
 	dir = 8
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ye" = (
 /obj/structure/table/glass,
 /obj/item/reagent_containers/cup/soda_cans/grey_bull,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yy" = (
 /obj/machinery/computer/arcade/amputation{
 	dir = 1
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "YK" = (
 /obj/effect/spawner/random/trash,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "YL" = (
 /obj/item/trash/raisins,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "YT" = (
 /obj/machinery/button/door/directional/west{
 	id = "door1"
@@ -1016,30 +1016,30 @@
 "Zf" = (
 /obj/machinery/deepfryer,
 /turf/open/floor/iron/kitchen/small,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Zj" = (
 /mob/living/basic/bear/fightpit,
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Zp" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZL" = (
 /obj/structure/railing{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZU" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/decal/cleanable/confetti,
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZZ" = (
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
@@ -1047,7 +1047,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron/kitchen,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 Cm
@@ -1095,9 +1095,6 @@ Cm
 Cm
 Cm
 Cm
-Cm
-Cm
-Cm
 "}
 (2,1,1) = {"
 Cm
@@ -1115,6 +1112,13 @@ Cm
 Cm
 Cm
 Cm
+Uj
+Uj
+Uj
+Uj
+Uj
+Uj
+Uj
 Cm
 Cm
 Cm
@@ -1138,6 +1142,8 @@ Cm
 Cm
 Cm
 Cm
+"}
+(3,1,1) = {"
 Cm
 Cm
 Cm
@@ -1148,13 +1154,18 @@ Cm
 Cm
 Cm
 Cm
-"}
-(3,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+Uj
+MO
+OB
+OB
+OB
+OB
+Uj
 Cm
 Cm
 Cm
@@ -1178,6 +1189,8 @@ Cm
 Cm
 Cm
 Cm
+"}
+(4,1,1) = {"
 Cm
 Cm
 Cm
@@ -1193,13 +1206,18 @@ Cm
 Cm
 Cm
 Cm
+Uj
+OB
+OB
+OB
+OB
+Zj
+Uj
 Cm
 Cm
 Cm
 Cm
 Cm
-"}
-(4,1,1) = {"
 Cm
 Cm
 Cm
@@ -1218,12 +1236,10 @@ Cm
 Cm
 Cm
 Cm
+"}
+(5,1,1) = {"
 Cm
 Cm
-Ne
-Ne
-Ne
-Ne
 Cm
 Cm
 Cm
@@ -1237,6 +1253,13 @@ Cm
 Cm
 Cm
 Cm
+Uj
+vm
+OB
+OB
+OB
+vm
+Uj
 Cm
 Cm
 Cm
@@ -1248,8 +1271,6 @@ Cm
 Cm
 Cm
 Cm
-"}
-(5,1,1) = {"
 Cm
 Cm
 Cm
@@ -1262,19 +1283,30 @@ Cm
 Cm
 Cm
 Cm
+"}
+(6,1,1) = {"
 Cm
 Cm
 Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
+Cm
+Cm
+ve
+ve
+ve
+ve
+ve
+ve
+Ox
+ve
+ve
+ve
+ve
+ve
+OB
+OB
+OB
+ve
+ve
 Cm
 Cm
 Cm
@@ -1299,12 +1331,29 @@ Cm
 Cm
 Cm
 "}
-(6,1,1) = {"
+(7,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+sk
+Ux
+Ux
+kL
+Ux
+Ux
+UR
+Ux
+Ux
+Ux
+Fy
+EP
+ZL
+ZL
+wM
+ve
 Cm
 Cm
 Cm
@@ -1315,16 +1364,6 @@ Cm
 Cm
 Cm
 Cm
-Ne
-Uj
-Uj
-Uj
-Uj
-Uj
-Uj
-Uj
-Ne
-Ne
 Cm
 Cm
 Cm
@@ -1338,18 +1377,41 @@ Cm
 Cm
 Cm
 Cm
+"}
+(8,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+GK
+Gb
+Ux
+IX
+rB
+YL
+mX
+UR
+Ux
+Ux
+Ux
+UR
+UR
+Ux
+Ux
+ve
 Cm
 Cm
+ve
+ve
+ve
+ve
+ve
+ve
 Cm
 Cm
 Cm
-"}
-(7,1,1) = {"
 Cm
 Cm
 Cm
@@ -1362,23 +1424,38 @@ Cm
 Cm
 Cm
 Cm
+"}
+(9,1,1) = {"
 Cm
 Cm
-Ne
-Ne
-Uj
-MO
-OB
-OB
-OB
-OB
-Uj
-Ne
 Cm
 Cm
 Cm
+gl
+GK
+Ux
+Ux
+Bj
+Ux
+Ux
+Yy
+Bf
+Ux
+Ux
+Ux
+Zp
+rc
+re
+Ux
+ve
 Cm
 Cm
+ve
+Ux
+Ux
+Ux
+Ux
+ve
 Cm
 Cm
 Cm
@@ -1394,15 +1471,38 @@ Cm
 Cm
 Cm
 Cm
+"}
+(10,1,1) = {"
 Cm
 Cm
 Cm
 Cm
-"}
-(8,1,1) = {"
 Cm
+ve
+GK
+Ux
+Ux
+Bj
+UR
+Ux
+Yy
+Ux
+Ux
+Ux
+Ux
+Ke
+re
+re
+Ux
+Tp
 Cm
 Cm
+ve
+Ux
+vw
+Ux
+Ux
+ve
 Cm
 Cm
 Cm
@@ -1414,29 +1514,42 @@ Cm
 Cm
 Cm
 Cm
-Ne
-Ne
-Uj
-OB
-OB
-OB
-OB
-Zj
-Uj
-Ne
-Ne
-Ne
 Cm
 Cm
 Cm
 Cm
+"}
+(11,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+sk
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+re
+re
+re
+Ux
+ve
 Cm
 Cm
+ve
+Ux
+Ux
+Ux
+Ux
+ve
 Cm
 Cm
 Cm
@@ -1448,98 +1561,49 @@ Cm
 Cm
 Cm
 Cm
-"}
-(9,1,1) = {"
 Cm
 Cm
 Cm
 Cm
+"}
+(12,1,1) = {"
 Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
 Uj
-vm
-OB
-OB
-OB
-vm
 Uj
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(10,1,1) = {"
-Cm
-Cm
-Cm
-Cm
-Cm
-Ne
+Uj
+Uj
 ve
 ve
 ve
 ve
+Ux
+Ux
+Ux
+Wy
 ve
 ve
-Ox
+NE
+Ux
+Ux
+Ux
+Ux
+Ho
 ve
 ve
 ve
 ve
 ve
-OB
-OB
-OB
 ve
 ve
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
+ve
+ve
+ve
+UW
+UW
+cY
+UW
+ve
+ve
 Cm
 Cm
 Cm
@@ -1549,29 +1613,43 @@ Cm
 Cm
 Cm
 "}
-(11,1,1) = {"
-Cm
-Cm
-Cm
-Cm
+(13,1,1) = {"
 Cm
-Ne
+Uj
+OB
+OB
+dl
+hI
+to
+Vs
+dN
+vT
+oO
+ML
+EO
+WG
+Qg
 ve
-sk
-Ux
-Ux
-kL
-Ux
-Ux
-UR
 Ux
+xY
 Ux
 Ux
-Fy
-EP
-ZL
-ZL
-wM
+NA
+NA
+NA
+NA
+RB
+NA
+NA
+zU
+NA
+NA
+NA
+yz
+yz
+yz
+yz
+nP
 ve
 Ne
 Ne
@@ -1581,1092 +1659,373 @@ Ne
 Ne
 Ne
 Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 "}
-(12,1,1) = {"
-Cm
-Cm
-Cm
-Cm
+(14,1,1) = {"
 Cm
-Ne
+Uj
+OB
+OB
+OB
+xa
+jZ
+to
+eW
+bW
+ma
+to
+hR
+tC
+MS
 ve
-GK
-Gb
-Ux
-IX
-rB
-YL
-mX
-UR
 Ux
+XG
+XG
 Ux
+NA
+pX
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+td
+yz
+LU
+yz
+ob
+bL
+ve
+Ne
+Bc
+Bc
+Bc
+Bc
+Bc
+JF
+Ne
+"}
+(15,1,1) = {"
+Cm
+Uj
+OB
+OB
+OB
+HG
+of
+ML
+ZU
+mC
+vR
+ML
+tC
+Jh
+to
 Ux
-UR
-UR
 Ux
+Od
+tZ
 Ux
+TR
+ve
 ve
-Ne
-Ne
 ve
 ve
 ve
 ve
 ve
+Fc
+Fc
+sl
+SW
+Fc
+Wj
+Fc
+ve
+ve
 ve
+Bc
+Bc
+Bc
+Bc
+Bc
+Bc
 Ne
+"}
+(16,1,1) = {"
 Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(13,1,1) = {"
-Cm
-Cm
-Cm
-Cm
-Cm
-Ne
-gl
-GK
-Ux
-Ux
-Bj
-Ux
-Ux
-Yy
-Bf
-Ux
-Ux
-Ux
-Zp
-rc
-re
-Ux
-ve
-Ne
-Ne
-ve
-Ux
-Ux
-Ux
-Ux
-ve
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(14,1,1) = {"
-Cm
-Cm
-Cm
-Ne
-Ne
-Ne
-ve
-GK
-Ux
-Ux
-Bj
-UR
-Ux
-Yy
-Ux
-Ux
-Ux
-Ux
-Ke
-re
-re
-Ux
-Tp
-Ne
-Ne
-ve
-Ux
-vw
-Ux
-Ux
-ve
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(15,1,1) = {"
-Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-ve
-sk
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-re
-re
-re
-Ux
-ve
-Ne
-Ne
-ve
-Ux
-Ux
-Ux
-Ux
-ve
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(16,1,1) = {"
-Cm
-Ne
-Uj
-Uj
-Uj
-Uj
-ve
-ve
-ve
-ve
-Ux
-Ux
-Ux
-Wy
-ve
-ve
-NE
-Ux
-Ux
-Ux
-Ux
-Ho
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-UW
-UW
-cY
-UW
-ve
-ve
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Ne
-Ne
-Cm
-Cm
-"}
-(17,1,1) = {"
-Cm
-Ne
 Uj
 OB
 OB
-dl
-hI
+OB
+HG
+vk
 to
-Vs
-dN
-vT
-oO
 ML
-EO
-WG
-Qg
-ve
+Ln
+ZZ
+to
+ZZ
+Yd
+eW
 Ux
-xY
+hK
+fd
 Ux
 Ux
 NA
-NA
-NA
-NA
-RB
-NA
-NA
-zU
-NA
-NA
-NA
-yz
-yz
-yz
-yz
-nP
+vz
+tI
+VW
 ve
+sg
+sg
+sg
+Fc
+hq
+ud
+Dx
+YT
+Vd
+Fc
+Tq
+Tq
+Tq
+Bc
+Bc
+Bc
+Bc
+Bc
+Bc
 Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Cm
-"}
-(18,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-OB
-xa
-jZ
-to
-eW
-bW
-ma
-to
-hR
-tC
-MS
-ve
-Ux
-XG
-XG
-Ux
-NA
-pX
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-td
-yz
-LU
-yz
-ob
-bL
-ve
-Ne
-Bc
-Bc
-Bc
-Bc
-Bc
-JF
-Ne
-Cm
-Cm
-"}
-(19,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-OB
-HG
-of
-ML
-ZU
-mC
-vR
-ML
-tC
-Jh
-to
-Ux
-Ux
-Od
-tZ
-Ux
-TR
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-Fc
-Fc
-sl
-SW
-Fc
-Wj
-Fc
-ve
-ve
-ve
-Bc
-Bc
-Bc
-Bc
-Bc
-Bc
-Ne
-Cm
-Cm
-"}
-(20,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-OB
-HG
-vk
-to
-ML
-Ln
-ZZ
-to
-ZZ
-Yd
-eW
-Ux
-hK
-fd
-Ux
-Ux
-NA
-vz
-tI
-VW
-ve
-ex
-ex
-ex
-Fc
-hq
-ud
-Dx
-YT
-Vd
-Fc
-Tq
-Tq
-Tq
-Bc
-Bc
-Bc
-Bc
-Bc
-Bc
-Ne
-Cm
-Cm
-"}
-(21,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-OB
-HG
-vk
-ML
-to
-ML
-cn
-ML
-to
-ML
-ZU
-Ux
-Ux
-fd
-Ux
-Ux
-NA
-Ux
-Ux
-lP
-qK
-ex
-ex
-sg
-jE
-VS
-Vd
-Vd
-Vd
-Vd
-DV
-Tq
-Tq
-Tq
-Bc
-Bc
-Bc
-Bc
-Bc
-Bc
-Ne
-Cm
-Cm
-"}
-(22,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-pK
-PK
-yB
-to
-ML
-EO
-Ag
-to
-Ag
-EO
-eW
-Ux
-Ux
-fd
-Ux
-Ux
-NA
-vz
-LP
-lc
-ve
-ex
-ex
-ex
-JW
-ql
-BU
-ud
-HE
-Vd
-Fc
-Io
-Tq
-Tq
-Bc
-Bc
-Bc
-Bc
-Bc
-Bc
-Ne
-Cm
-Cm
-"}
-(23,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-pK
-xa
-Mc
-JD
-ZU
-xk
-tC
-ML
-si
-ma
-ZU
-YK
-Ux
-fd
-IY
-Ux
-NA
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-Fc
-Fc
-nF
-rD
-Fc
-bP
-Fc
-ve
-ve
-ve
-Bc
-Bc
-Bc
-Bc
-Bc
-Bc
-Ne
-Cm
-Cm
-"}
-(24,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-If
-ve
-ML
-rY
-ML
-tC
-Jh
-to
-ma
-fz
-TW
-ve
-Ux
-XG
-XG
-Ux
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-xv
-NA
-NA
-NA
-yz
-vF
-yz
-yz
-Hi
-ve
-Ne
-Bc
-Bc
-Bc
-Bc
-Bc
-tN
-Ne
-Cm
-Cm
-"}
-(25,1,1) = {"
-Cm
-Ne
-Uj
-OB
-OB
-vm
-ve
-lS
-gL
-ms
-ri
-TG
-eW
-Yd
-Ce
-Ct
-ve
-Ux
-Ux
-Ux
-Ux
-cp
-NA
-NA
-NA
-SE
-NA
-NA
-vy
-NA
-NA
-NA
-yz
-yz
-yz
-yz
-eE
-ve
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-"}
-(26,1,1) = {"
-Cm
-Ne
-Uj
-Uj
-Uj
-Uj
-ve
-ve
-ve
-ve
-GD
-Ux
-Ux
-Ux
-ve
-ve
-ve
-Ux
-Ux
-Ux
-Ux
-Ux
-ve
-ve
-ve
-ve
-ve
-ve
-qK
-ve
-ve
-Nz
-ve
-ve
-ve
-ve
-ve
-ve
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Ne
-Cm
-Cm
-Cm
-"}
-(27,1,1) = {"
-Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-ve
-OD
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-ve
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(28,1,1) = {"
-Cm
-Cm
-Ne
-Ne
-Ne
-Ne
-ve
-kf
-kf
-kf
-kf
-kf
-kf
-Ux
-Ux
-Ux
-Ux
-Ux
-Pm
-Ye
-km
-Ux
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(29,1,1) = {"
-Cm
-Cm
-Cm
-Cm
-Ne
-Ne
-ve
-dz
-dz
-dz
-dz
-dz
-dz
-Mm
-Ux
-Ux
-Ux
-Ux
-Sp
-dV
-ur
-Ux
-Bo
-aV
-uZ
-KJ
-Ve
-lL
-ve
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 "}
-(30,1,1) = {"
-Cm
-Cm
-Cm
-Cm
+(17,1,1) = {"
 Cm
-Ne
-Mq
-bR
-Ux
-Ux
+Uj
+OB
+OB
+OB
+HG
+vk
+ML
+to
+ML
+cn
+ML
+to
+ML
+ZU
 Ux
 Ux
-dz
-Mm
+fd
 Ux
 Ux
+NA
 Ux
-Dz
-nX
-Ti
-sR
 Ux
-Bo
-aV
-aV
-FA
-aV
-OM
-ve
-Ne
+lP
+qK
+sg
+sg
+ex
+jE
+VS
+Vd
+Vd
+Vd
+Vd
+DV
+Tq
+Tq
+Tq
+Bc
+Bc
+Bc
+Bc
+Bc
+Bc
 Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 "}
-(31,1,1) = {"
-Cm
-Cm
-Cm
-Cm
+(18,1,1) = {"
 Cm
-Ne
-ve
-lc
-Ux
-fo
-AF
-pr
-dz
-Mm
+Uj
+OB
+OB
+pK
+PK
+yB
+to
+ML
+EO
+Ag
+to
+Ag
+EO
+eW
 Ux
 Ux
-ng
-fU
-fU
-pr
+fd
 Ux
 Ux
+NA
+vz
+LP
+lc
 ve
-ve
-ve
-vG
-aV
-Zf
-ve
-Ne
+sg
+sg
+sg
+JW
+ql
+BU
+ud
+HE
+Vd
+Fc
+Io
+Tq
+Tq
+Bc
+Bc
+Bc
+Bc
+Bc
+Bc
 Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 "}
-(32,1,1) = {"
-Cm
-Cm
-Cm
-Cm
+(19,1,1) = {"
 Cm
-Ne
-ve
-ve
-qK
-ve
-ve
+Uj
+OB
+OB
+pK
+xa
+Mc
+JD
+ZU
+xk
+tC
+ML
+si
+ma
+ZU
+YK
+Ux
+fd
+IY
+Ux
+NA
 ve
 ve
 ve
 ve
-Ux
-Sr
 ve
 ve
 ve
+Fc
+Fc
+nF
+rD
+Fc
+bP
+Fc
 ve
 ve
 ve
+Bc
+Bc
+Bc
+Bc
+Bc
+Bc
 Ne
+"}
+(20,1,1) = {"
+Cm
+Uj
+OB
+OB
+If
 ve
-vG
-aV
-fy
+ML
+rY
+ML
+tC
+Jh
+to
+ma
+fz
+TW
+ve
+Ux
+XG
+XG
+Ux
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+xv
+NA
+NA
+NA
+yz
+vF
+yz
+yz
+Hi
 ve
 Ne
+Bc
+Bc
+Bc
+Bc
+Bc
+tN
 Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 "}
-(33,1,1) = {"
-Cm
-Cm
-Cm
+(21,1,1) = {"
 Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
+Uj
+OB
+OB
+vm
+ve
+lS
+gL
+ms
+ri
+TG
+eW
+Yd
+Ce
+Ct
 ve
 Ux
-Sr
+Ux
+Ux
+Ux
+cp
+NA
+NA
+NA
+SE
+NA
+NA
+vy
+NA
+NA
+NA
+yz
+yz
+yz
+yz
+eE
 ve
 Ne
 Ne
@@ -2674,122 +2033,47 @@ Ne
 Ne
 Ne
 Ne
-ve
-vs
-Gn
-bu
-ve
 Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
+Ne
 "}
-(34,1,1) = {"
-Cm
-Cm
-Cm
+(22,1,1) = {"
 Cm
-Ne
-Ne
-ve
-ve
+Uj
+Uj
+Uj
+Uj
 ve
 ve
 ve
 ve
+GD
+Ux
+Ux
+Ux
 ve
 ve
 ve
 Ux
 Ux
+Ux
+Ux
+Ux
 ve
 ve
 ve
 ve
 ve
 ve
-Ne
+qK
 ve
 ve
+Nz
+ve
 ve
 ve
 ve
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(35,1,1) = {"
-Cm
-Cm
-Cm
-Cm
-Ne
-Ne
 ve
-Ux
-Ux
-Ux
-Ux
-Ux
-Dz
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
-Ux
 ve
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
 Cm
 Cm
 Cm
@@ -2799,19 +2083,18 @@ Cm
 Cm
 Cm
 "}
-(36,1,1) = {"
+(23,1,1) = {"
+Cm
 Cm
 Cm
 Cm
 Cm
-Ne
-Ne
 ve
-Ak
-Ux
-Ux
-Ux
-Ux
+OD
+Ux
+Ux
+Ux
+Ux
 Ux
 Ux
 Ux
@@ -2823,58 +2106,6 @@ Ux
 Ux
 Ux
 ve
-Ne
-Ne
-Ne
-Ne
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-Cm
-"}
-(37,1,1) = {"
-Cm
-Cm
-Cm
-Cm
-Ne
-Ne
-ve
-ve
-ve
-qK
-qK
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-ve
-qK
-qK
-ve
-ve
-Ne
-Ne
 Cm
 Cm
 Cm
@@ -2899,36 +2130,35 @@ Cm
 Cm
 Cm
 "}
-(38,1,1) = {"
-Cm
-Cm
-Cm
+(24,1,1) = {"
 Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
 Cm
 Cm
 Cm
 Cm
+ve
+kf
+kf
+kf
+kf
+kf
+kf
+Ux
+Ux
+Ux
+Ux
+Ux
+Pm
+Ye
+km
+Ux
+ve
+ve
+ve
+ve
+ve
+ve
+ve
 Cm
 Cm
 Cm
@@ -2946,19 +2176,36 @@ Cm
 Cm
 Cm
 Cm
+"}
+(25,1,1) = {"
 Cm
 Cm
-"}
-(39,1,1) = {"
 Cm
 Cm
 Cm
-Ne
-Ne
-Ne
-Ne
-Ne
-Ne
+ve
+dz
+dz
+dz
+dz
+dz
+dz
+Mm
+Ux
+Ux
+Ux
+Ux
+Sp
+dV
+ur
+Ux
+Bo
+aV
+uZ
+KJ
+Ve
+lL
+ve
 Cm
 Cm
 Cm
@@ -2976,11 +2223,36 @@ Cm
 Cm
 Cm
 Cm
+"}
+(26,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+Mq
+bR
+Ux
+Ux
+Ux
+Ux
+dz
+Mm
+Ux
+Ux
+Ux
+Dz
+nX
+Ti
+sR
+Ux
+Bo
+aV
+aV
+FA
+aV
+OM
+ve
 Cm
 Cm
 Cm
@@ -2999,15 +2271,35 @@ Cm
 Cm
 Cm
 "}
-(40,1,1) = {"
+(27,1,1) = {"
 Cm
 Cm
 Cm
 Cm
-Ne
-Ne
-Ne
 Cm
+ve
+lc
+Ux
+fo
+AF
+pr
+dz
+Mm
+Ux
+Ux
+ng
+fU
+fU
+pr
+Ux
+Ux
+ve
+ve
+ve
+vG
+aV
+Zf
+ve
 Cm
 Cm
 Cm
@@ -3025,12 +2317,36 @@ Cm
 Cm
 Cm
 Cm
+"}
+(28,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+ve
+qK
+ve
+ve
+ve
+ve
+ve
+ve
+Ux
+Sr
+ve
+ve
+ve
+ve
+ve
+ve
 Cm
+ve
+vG
+aV
+fy
+ve
 Cm
 Cm
 Cm
@@ -3049,13 +2365,12 @@ Cm
 Cm
 Cm
 "}
-(41,1,1) = {"
+(29,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
-Ne
 Cm
 Cm
 Cm
@@ -3064,12 +2379,21 @@ Cm
 Cm
 Cm
 Cm
+ve
+Ux
+Sr
+ve
 Cm
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+vs
+Gn
+bu
+ve
 Cm
 Cm
 Cm
@@ -3087,19 +2411,41 @@ Cm
 Cm
 Cm
 Cm
+"}
+(30,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+ve
+ve
+ve
+ve
+ve
+ve
+ve
+ve
+Ux
+Ux
+ve
+ve
+ve
+ve
+ve
+ve
 Cm
+ve
+ve
+ve
+ve
+ve
 Cm
 Cm
 Cm
 Cm
 Cm
-"}
-(42,1,1) = {"
 Cm
 Cm
 Cm
@@ -3112,11 +2458,30 @@ Cm
 Cm
 Cm
 Cm
+"}
+(31,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+Ux
+Ux
+Ux
+Ux
+Ux
+Dz
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+ve
 Cm
 Cm
 Cm
@@ -3140,16 +2505,33 @@ Cm
 Cm
 Cm
 Cm
+"}
+(32,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+Ak
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+Ux
+ve
 Cm
 Cm
 Cm
-"}
-(43,1,1) = {"
 Cm
 Cm
 Cm
@@ -3170,11 +2552,30 @@ Cm
 Cm
 Cm
 Cm
+"}
+(33,1,1) = {"
 Cm
 Cm
 Cm
 Cm
 Cm
+ve
+ve
+ve
+qK
+qK
+ve
+ve
+ve
+ve
+ve
+ve
+ve
+ve
+qK
+qK
+ve
+ve
 Cm
 Cm
 Cm
diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm
index 6ed8763f9a6f5..d01ab29e14032 100644
--- a/_maps/virtual_domains/gondola_asteroid.dmm
+++ b/_maps/virtual_domains/gondola_asteroid.dmm
@@ -1,38 +1,39 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "c" = (
 /turf/open/space/basic,
-/area/space)
+/area/space/virtual_domain)
 "e" = (
-/turf/open/misc/asteroid/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/mineral/random,
+/area/virtual_domain)
 "g" = (
 /obj/structure/marker_beacon{
 	light_color = "#FFE8AA";
 	light_range = 20
 	},
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "h" = (
 /turf/closed/mineral/random,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "m" = (
 /obj/structure/closet/crate/secure/bitrunning/encrypted/gondola,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "n" = (
 /obj/structure/flora/bush/fullgrass/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "o" = (
 /turf/template_noop,
 /area/template_noop)
 "q" = (
 /obj/structure/flora/tree/palm,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "r" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -40,22 +41,25 @@
 "s" = (
 /obj/structure/flora/bush/sparsegrass/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "t" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
+"v" = (
+/turf/open/misc/asteroid/airless,
+/area/virtual_domain)
 "w" = (
 /obj/structure/water_source/puddle,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "y" = (
 /obj/structure/flora/bush/stalky/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "z" = (
 /mob/living/basic/pet/gondola/virtual_domain,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "A" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -64,27 +68,23 @@
 /area/virtual_domain/safehouse)
 "C" = (
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "D" = (
 /obj/structure/flora/bush/flowers_br/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "F" = (
 /obj/structure/flora/bush/grassy/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "I" = (
 /obj/structure/flora/bush/reed/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "J" = (
 /obj/structure/flora/bush/flowers_yw/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
-"K" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "M" = (
 /obj/structure/table/wood,
 /obj/item/storage/bag/tray,
@@ -95,7 +95,7 @@
 "N" = (
 /obj/structure/flora/bush/large/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "O" = (
 /obj/modular_map_root/safehouse{
 	key = "shuttle_space"
@@ -105,19 +105,19 @@
 "Q" = (
 /obj/structure/flora/bush/lavendergrass/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "T" = (
 /obj/structure/flora/bush/sunny/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "V" = (
 /obj/structure/flora/coconuts,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "W" = (
 /obj/structure/flora/bush/ferny/style_random,
 /turf/open/floor/grass,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 o
@@ -245,7 +245,7 @@ h
 h
 a
 a
-K
+a
 o
 o
 o
@@ -469,7 +469,7 @@ h
 h
 h
 h
-e
+v
 a
 a
 a
@@ -514,7 +514,7 @@ C
 h
 h
 h
-e
+v
 c
 c
 c
@@ -559,7 +559,7 @@ C
 h
 h
 h
-e
+v
 c
 c
 c
@@ -604,7 +604,7 @@ C
 h
 h
 h
-e
+v
 c
 c
 c
@@ -649,7 +649,7 @@ C
 h
 h
 h
-e
+v
 c
 c
 c
@@ -694,7 +694,7 @@ C
 h
 h
 h
-e
+v
 c
 c
 c
@@ -739,7 +739,7 @@ h
 h
 h
 h
-e
+v
 c
 c
 c
@@ -784,7 +784,7 @@ h
 h
 h
 h
-e
+v
 c
 c
 c
@@ -829,7 +829,7 @@ h
 h
 h
 h
-e
+v
 c
 c
 c
@@ -1021,7 +1021,7 @@ a
 "}
 (21,1,1) = {"
 a
-e
+v
 h
 h
 h
@@ -1066,8 +1066,8 @@ a
 "}
 (22,1,1) = {"
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1111,8 +1111,8 @@ a
 "}
 (23,1,1) = {"
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1156,8 +1156,8 @@ a
 "}
 (24,1,1) = {"
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1202,8 +1202,8 @@ a
 (25,1,1) = {"
 a
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1247,8 +1247,8 @@ a
 (26,1,1) = {"
 o
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1292,8 +1292,8 @@ a
 (27,1,1) = {"
 o
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1337,8 +1337,8 @@ a
 (28,1,1) = {"
 o
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1383,8 +1383,8 @@ a
 o
 a
 a
-e
-e
+v
+v
 h
 h
 h
@@ -1428,8 +1428,8 @@ a
 o
 o
 a
-e
-e
+v
+v
 h
 h
 C
@@ -1457,8 +1457,8 @@ C
 h
 h
 h
-e
-e
+v
+v
 c
 c
 c
@@ -1473,7 +1473,7 @@ a
 o
 o
 a
-e
+v
 h
 h
 C
@@ -1501,9 +1501,9 @@ C
 h
 h
 h
-e
-e
-e
+v
+v
+v
 c
 c
 c
@@ -1545,9 +1545,9 @@ h
 h
 h
 h
-e
-e
-e
+v
+v
+v
 h
 h
 a
@@ -1590,8 +1590,8 @@ h
 h
 h
 h
-e
-e
+v
+v
 h
 h
 h
@@ -1664,11 +1664,11 @@ h
 h
 h
 h
-e
-e
-e
-e
-e
+v
+v
+v
+v
+v
 h
 h
 h
diff --git a/_maps/virtual_domains/hierophant.dmm b/_maps/virtual_domains/hierophant.dmm
index 997dfa74faceb..89035dc714910 100644
--- a/_maps/virtual_domains/hierophant.dmm
+++ b/_maps/virtual_domains/hierophant.dmm
@@ -9,6 +9,10 @@
 	},
 /turf/open/indestructible/hierophant/two,
 /area/lavaland/surface/outdoors/virtual_domain)
+"g" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/lavaland/surface/outdoors/virtual_domain)
 "h" = (
 /obj/effect/light_emitter{
 	set_cap = 3;
@@ -33,9 +37,6 @@
 "w" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
-"y" = (
-/turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
 "E" = (
 /mob/living/simple_animal/hostile/megafauna/hierophant,
 /turf/open/indestructible/hierophant/two,
@@ -59,55 +60,54 @@
 /turf/open/indestructible/hierophant,
 /area/lavaland/surface/outdoors/virtual_domain)
 "W" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/lavaland/surface/outdoors/virtual_domain)
+/area/virtual_domain/fullbright)
 "Y" = (
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
 /area/lavaland/surface/outdoors/virtual_domain)
 
 (1,1,1) = {"
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 o
 o
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 W
 "}
 (2,1,1) = {"
-y
+W
 r
 r
 r
@@ -131,11 +131,10 @@ r
 r
 r
 r
-y
+W
 o
 o
-y
-Y
+W
 Y
 Y
 Y
@@ -144,10 +143,11 @@ Y
 Y
 Y
 Y
-y
+g
+W
 "}
 (3,1,1) = {"
-y
+W
 r
 a
 a
@@ -171,10 +171,10 @@ a
 a
 a
 r
-y
+W
 o
 o
-y
+W
 Y
 Y
 Y
@@ -184,10 +184,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (4,1,1) = {"
-y
+W
 r
 a
 a
@@ -211,10 +211,10 @@ a
 a
 a
 r
-y
-y
-y
-y
+W
+W
+W
+W
 Y
 Y
 Y
@@ -224,10 +224,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (5,1,1) = {"
-y
+W
 r
 a
 a
@@ -253,8 +253,8 @@ a
 a
 r
 r
-y
-y
+W
+W
 Y
 Y
 Y
@@ -264,10 +264,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (6,1,1) = {"
-y
+W
 r
 a
 h
@@ -294,7 +294,7 @@ a
 a
 a
 r
-y
+W
 Y
 Y
 Y
@@ -304,10 +304,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (7,1,1) = {"
-y
+W
 r
 a
 h
@@ -344,10 +344,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (8,1,1) = {"
-y
+W
 r
 a
 a
@@ -384,10 +384,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (9,1,1) = {"
-y
+W
 r
 a
 a
@@ -411,7 +411,7 @@ a
 a
 a
 r
-y
+W
 r
 S
 a
@@ -424,10 +424,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (10,1,1) = {"
-y
+W
 r
 a
 a
@@ -451,8 +451,8 @@ a
 a
 a
 r
-y
-y
+W
+W
 r
 a
 a
@@ -464,10 +464,10 @@ w
 w
 H
 Y
-y
+W
 "}
 (11,1,1) = {"
-y
+W
 r
 a
 r
@@ -491,9 +491,9 @@ a
 r
 a
 r
-y
-y
-y
+W
+W
+W
 r
 a
 a
@@ -504,10 +504,10 @@ w
 w
 w
 Y
-y
+W
 "}
 (12,1,1) = {"
-y
+W
 r
 a
 a
@@ -531,9 +531,9 @@ a
 a
 a
 r
-y
-y
-y
+W
+W
+W
 r
 a
 a
@@ -544,10 +544,10 @@ w
 w
 w
 Y
-y
+W
 "}
 (13,1,1) = {"
-y
+W
 r
 h
 a
@@ -571,9 +571,9 @@ a
 a
 h
 r
-y
-y
-y
+W
+W
+W
 r
 a
 a
@@ -584,10 +584,10 @@ w
 w
 w
 Y
-y
+W
 "}
 (14,1,1) = {"
-y
+W
 r
 a
 a
@@ -611,9 +611,9 @@ a
 a
 a
 r
-y
-y
-y
+W
+W
+W
 r
 a
 a
@@ -624,10 +624,10 @@ w
 w
 w
 Y
-y
+W
 "}
 (15,1,1) = {"
-y
+W
 r
 a
 r
@@ -651,9 +651,9 @@ a
 r
 a
 r
-y
-y
-y
+W
+W
+W
 r
 a
 a
@@ -664,10 +664,10 @@ w
 w
 w
 Y
-y
+W
 "}
 (16,1,1) = {"
-y
+W
 r
 a
 a
@@ -691,8 +691,8 @@ a
 a
 a
 r
-y
-y
+W
+W
 r
 a
 a
@@ -704,10 +704,10 @@ w
 w
 u
 Y
-y
+W
 "}
 (17,1,1) = {"
-y
+W
 r
 a
 a
@@ -731,7 +731,7 @@ a
 a
 a
 r
-y
+W
 r
 a
 a
@@ -744,10 +744,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (18,1,1) = {"
-y
+W
 r
 a
 a
@@ -784,10 +784,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (19,1,1) = {"
-y
+W
 r
 a
 h
@@ -824,10 +824,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (20,1,1) = {"
-y
+W
 r
 a
 h
@@ -854,7 +854,7 @@ a
 a
 a
 r
-y
+W
 Y
 Y
 Y
@@ -864,10 +864,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (21,1,1) = {"
-y
+W
 r
 a
 a
@@ -893,8 +893,8 @@ a
 a
 r
 r
-y
-y
+W
+W
 Y
 Y
 Y
@@ -904,10 +904,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (22,1,1) = {"
-y
+W
 r
 a
 a
@@ -931,10 +931,10 @@ a
 a
 a
 r
-y
-y
-y
-y
+W
+W
+W
+W
 Y
 Y
 Y
@@ -944,10 +944,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (23,1,1) = {"
-y
+W
 r
 a
 a
@@ -971,10 +971,10 @@ a
 a
 a
 r
-y
+W
 o
 o
-y
+W
 Y
 Y
 Y
@@ -984,10 +984,10 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (24,1,1) = {"
-y
+W
 r
 r
 r
@@ -1011,10 +1011,10 @@ r
 r
 r
 r
-y
+W
 o
 o
-y
+W
 Y
 Y
 Y
@@ -1024,45 +1024,45 @@ Y
 Y
 Y
 Y
-y
+W
 "}
 (25,1,1) = {"
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 o
 o
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
-y
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
+W
 "}
diff --git a/_maps/virtual_domains/island_brawl.dmm b/_maps/virtual_domains/island_brawl.dmm
index 2c8a12c6c5793..fa04316b9b626 100644
--- a/_maps/virtual_domains/island_brawl.dmm
+++ b/_maps/virtual_domains/island_brawl.dmm
@@ -442,6 +442,10 @@
 /obj/machinery/food_cart,
 /turf/open/floor/plating,
 /area/virtual_domain)
+"eZ" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/water/beach,
+/area/virtual_domain/fullbright)
 "fe" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -1145,10 +1149,6 @@
 	},
 /turf/open/floor/wood/large,
 /area/virtual_domain)
-"oX" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/virtual_domain/fullbright)
 "oZ" = (
 /obj/effect/turf_decal/sand,
 /obj/effect/turf_decal/siding/wood{
@@ -3466,12 +3466,7 @@
 /area/virtual_domain/fullbright)
 "Rk" = (
 /obj/structure/table/glass,
-/obj/machinery/fax{
-	fax_name = "Beach Hotel Fax";
-	name = "Beach Hotel's Fax Machine";
-	pixel_y = 8;
-	visible_to_network = 0
-	},
+/obj/item/storage/box/donkpockets,
 /turf/open/floor/iron/dark/diagonal,
 /area/virtual_domain)
 "Rs" = (
@@ -5695,7 +5690,7 @@ SR
 SR
 SR
 SR
-oX
+SR
 "}
 (19,1,1) = {"
 SR
@@ -5776,7 +5771,7 @@ cO
 cO
 cO
 cO
-cO
+eZ
 SR
 "}
 (20,1,1) = {"
diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm
index 5ad31be02be2e..a455ee49aa534 100644
--- a/_maps/virtual_domains/pipedream.dmm
+++ b/_maps/virtual_domains/pipedream.dmm
@@ -24,7 +24,7 @@
 /area/virtual_domain)
 "aK" = (
 /turf/open/space/basic,
-/area/virtual_domain)
+/area/space/virtual_domain)
 "aL" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted,
 /turf/open/floor/iron,
@@ -744,7 +744,7 @@
 "wl" = (
 /obj/item/shard,
 /turf/open/space/basic,
-/area/virtual_domain)
+/area/space/virtual_domain)
 "wm" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 1
@@ -831,7 +831,7 @@
 "xF" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "xM" = (
 /obj/effect/turf_decal/trimline/yellow/line{
 	dir = 4
@@ -897,7 +897,7 @@
 "Av" = (
 /obj/item/stack/rods/two,
 /turf/open/space/basic,
-/area/virtual_domain)
+/area/space/virtual_domain)
 "Aw" = (
 /obj/structure/lattice/catwalk{
 	name = "industrial lift"
@@ -1528,9 +1528,13 @@
 /obj/machinery/disposal/bin,
 /turf/open/floor/iron,
 /area/virtual_domain)
+"RI" = (
+/obj/effect/smooths_with_walls,
+/turf/closed/indestructible/binary,
+/area/virtual_domain/fullbright)
 "RJ" = (
 /turf/closed/indestructible/binary,
-/area/virtual_domain)
+/area/virtual_domain/fullbright)
 "RK" = (
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/iron,
@@ -1921,7 +1925,7 @@ RJ
 RJ
 RJ
 RJ
-RJ
+RI
 RJ
 RJ
 RJ
@@ -2107,7 +2111,7 @@ yQ
 yQ
 yQ
 yQ
-RJ
+RI
 eg
 eg
 eg
@@ -2353,7 +2357,7 @@ yQ
 yQ
 yQ
 RJ
-RJ
+RI
 RJ
 RJ
 RJ
@@ -2443,8 +2447,8 @@ yQ
 yQ
 yQ
 yQ
-RJ
-RJ
+yQ
+yQ
 RJ
 eg
 eg
@@ -2493,7 +2497,7 @@ yQ
 yQ
 yQ
 yQ
-RJ
+yQ
 RJ
 RJ
 eg
@@ -2543,7 +2547,7 @@ yQ
 yQ
 yQ
 yQ
-RJ
+yQ
 RJ
 kU
 kU
@@ -3126,7 +3130,7 @@ eg
 eg
 rO
 rO
-RJ
+RI
 RJ
 rO
 rO
@@ -3170,7 +3174,7 @@ RJ
 RJ
 RJ
 RJ
-RJ
+RI
 RJ
 RJ
 RJ
@@ -3215,7 +3219,7 @@ Cv
 Nu
 eg
 RJ
-RJ
+yQ
 yQ
 yQ
 yQ
@@ -3652,7 +3656,7 @@ yQ
 yQ
 yQ
 yQ
-RJ
+yQ
 RJ
 RJ
 RJ
diff --git a/_maps/virtual_domains/pirates.dmm b/_maps/virtual_domains/pirates.dmm
index 5ad9c23595d64..31b4c359ba6ae 100644
--- a/_maps/virtual_domains/pirates.dmm
+++ b/_maps/virtual_domains/pirates.dmm
@@ -121,6 +121,11 @@
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
 /area/virtual_domain/fullbright)
+"gc" = (
+/obj/structure/flora/rock/pile/jungle/style_2,
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/dirt/jungle,
+/area/virtual_domain/protected_space)
 "gf" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 5
@@ -146,6 +151,10 @@
 	icon_state = "wood_large"
 	},
 /area/virtual_domain/fullbright)
+"gD" = (
+/obj/item/flashlight/flare/torch,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/fullbright)
 "gK" = (
 /obj/structure/flora/bush/flowers_br/style_random,
 /obj/structure/flora/bush/ferny,
@@ -216,10 +225,6 @@
 	dir = 4
 	},
 /area/virtual_domain/fullbright)
-"mR" = (
-/obj/machinery/smartfridge/drying_rack,
-/turf/open/misc/beach/sand,
-/area/virtual_domain/fullbright)
 "nb" = (
 /obj/structure/fermenting_barrel{
 	pixel_x = 6;
@@ -267,6 +272,10 @@
 /obj/structure/flora/bush/flowers_br/style_random,
 /turf/open/misc/grass,
 /area/virtual_domain/fullbright)
+"ps" = (
+/obj/machinery/smartfridge/drying/rack,
+/turf/open/misc/beach/sand,
+/area/virtual_domain/fullbright)
 "py" = (
 /turf/closed/indestructible/binary,
 /area/virtual_domain/protected_space/fullbright)
@@ -341,6 +350,9 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/wood/parquet,
 /area/virtual_domain)
+"tA" = (
+/turf/closed/mineral/random/jungle,
+/area/virtual_domain/protected_space)
 "tH" = (
 /obj/structure/closet/cabinet,
 /obj/item/clothing/head/costume/pirate/armored,
@@ -437,6 +449,13 @@
 "xp" = (
 /turf/open/water/beach,
 /area/virtual_domain/fullbright)
+"yF" = (
+/obj/effect/light_emitter{
+	set_cap = 3;
+	set_luminosity = 5
+	},
+/turf/open/misc/beach/coast,
+/area/virtual_domain/fullbright)
 "zc" = (
 /obj/item/gun/energy/laser/hellgun{
 	pixel_y = 10
@@ -639,6 +658,10 @@
 	dir = 1
 	},
 /area/virtual_domain/fullbright)
+"KP" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/binary,
+/area/virtual_domain/protected_space/fullbright)
 "KS" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
@@ -647,6 +670,13 @@
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/carpet/blue,
 /area/virtual_domain)
+"KU" = (
+/obj/effect/light_emitter{
+	set_cap = 3;
+	set_luminosity = 5
+	},
+/turf/open/water/beach,
+/area/virtual_domain/fullbright)
 "KV" = (
 /obj/structure/flora/rock/pile/jungle/style_3{
 	pixel_x = -15;
@@ -730,10 +760,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/carpet/blue,
 /area/virtual_domain)
-"Oz" = (
-/obj/structure/flora/rock/pile/jungle/style_2,
-/turf/open/misc/dirt/jungle,
-/area/virtual_domain/protected_space)
 "OD" = (
 /obj/effect/turf_decal/weather/sand{
 	dir = 6
@@ -921,9 +947,6 @@
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/virtual_domain/protected_space/fullbright)
-"WW" = (
-/turf/template_noop,
-/area/virtual_domain/fullbright)
 "Xn" = (
 /obj/modular_map_root/safehouse{
 	key = "wood"
@@ -1244,7 +1267,7 @@ DM
 DM
 hb
 hb
-hb
+fR
 py
 py
 py
@@ -1474,13 +1497,13 @@ nQ
 bI
 VE
 py
-hb
-hb
-hb
-hb
-hb
-hb
-fR
+py
+py
+py
+py
+py
+py
+KP
 "}
 (12,1,1) = {"
 xg
@@ -1524,7 +1547,7 @@ ub
 ub
 ub
 Xn
-hb
+py
 "}
 (13,1,1) = {"
 hb
@@ -1568,7 +1591,7 @@ ub
 ub
 ub
 ub
-hb
+py
 "}
 (14,1,1) = {"
 hb
@@ -1578,7 +1601,7 @@ Ul
 Ul
 Ul
 Hn
-mR
+ps
 eS
 eS
 eS
@@ -1612,7 +1635,7 @@ ub
 ub
 ub
 ub
-hb
+py
 "}
 (15,1,1) = {"
 hb
@@ -1656,7 +1679,7 @@ ub
 ub
 ub
 ub
-hb
+py
 "}
 (16,1,1) = {"
 hb
@@ -1700,7 +1723,7 @@ ub
 ub
 ub
 ub
-hb
+py
 "}
 (17,1,1) = {"
 hb
@@ -1744,7 +1767,7 @@ ub
 ub
 ub
 ub
-hb
+py
 "}
 (18,1,1) = {"
 hb
@@ -1788,7 +1811,7 @@ ub
 ub
 ub
 zR
-hb
+py
 "}
 (19,1,1) = {"
 hb
@@ -1826,13 +1849,13 @@ au
 nQ
 fw
 au
-xp
-xp
-xp
-xp
-xp
-hb
-hb
+au
+au
+au
+au
+au
+py
+py
 "}
 (20,1,1) = {"
 hb
@@ -1870,12 +1893,12 @@ au
 Uw
 cr
 vR
-xp
-xp
-xp
-xp
-xp
-hb
+au
+au
+au
+au
+au
+py
 xg
 "}
 (21,1,1) = {"
@@ -1914,12 +1937,12 @@ af
 nQ
 LK
 fw
-xp
-xp
-xp
-xp
-xp
-hb
+au
+au
+au
+au
+au
+py
 xg
 "}
 (22,1,1) = {"
@@ -1958,12 +1981,12 @@ au
 oM
 VE
 eO
-xp
-xp
-xp
-xp
-xp
-hb
+au
+au
+au
+au
+au
+py
 xg
 "}
 (23,1,1) = {"
@@ -2002,12 +2025,12 @@ au
 au
 au
 au
-xp
-xp
-xp
-DM
-DM
-hb
+au
+au
+au
+Li
+Li
+py
 xg
 "}
 (24,1,1) = {"
@@ -2046,12 +2069,12 @@ au
 au
 au
 au
-xp
-xp
-xp
-DM
-DM
-hb
+au
+au
+au
+Li
+Li
+py
 xg
 "}
 (25,1,1) = {"
@@ -2071,9 +2094,9 @@ eS
 eS
 nr
 eS
-eS
-SK
-xp
+gD
+yF
+KU
 xp
 xp
 xp
@@ -2090,12 +2113,12 @@ au
 au
 au
 au
-xp
-xp
-DM
-DM
-DM
-hb
+au
+au
+Li
+Li
+Li
+py
 xg
 "}
 (26,1,1) = {"
@@ -2114,12 +2137,12 @@ DM
 DM
 DM
 DM
-DM
-DM
+tA
+tA
 eP
 sb
-DM
-DM
+tA
+tA
 hb
 hb
 xp
@@ -2134,12 +2157,12 @@ au
 au
 au
 au
-hb
-DM
-DM
-DM
-DM
-hb
+py
+Li
+Li
+Li
+Li
+py
 xg
 "}
 (27,1,1) = {"
@@ -2147,7 +2170,7 @@ xg
 xg
 xg
 xg
-WW
+xg
 hb
 DM
 DM
@@ -2159,10 +2182,10 @@ DM
 DM
 DM
 DM
-DM
+tA
 fd
 OW
-DM
+tA
 DM
 DM
 hb
@@ -2178,12 +2201,12 @@ au
 au
 au
 py
-hb
-DM
-DM
-DM
-hb
-hb
+py
+Li
+Li
+Li
+py
+py
 xg
 "}
 (28,1,1) = {"
@@ -2203,11 +2226,11 @@ DM
 DM
 DM
 DM
-DM
+tA
 KV
 OW
-DM
-DM
+tA
+tA
 DM
 DM
 hb
@@ -2222,11 +2245,11 @@ au
 au
 py
 py
-hb
-hb
-hb
-hb
-hb
+py
+py
+py
+py
+py
 xg
 xg
 "}
@@ -2247,13 +2270,13 @@ DM
 DM
 DM
 DM
-DM
+tA
 qk
 IW
 sb
-DM
-DM
-DM
+tA
+tA
+tA
 DM
 DM
 DM
@@ -2291,16 +2314,16 @@ DM
 DM
 DM
 DM
-DM
+tA
 Gl
 qk
 IW
 hn
 sb
-DM
-DM
-DM
-DM
+tA
+tA
+tA
+tA
 DM
 hb
 hb
@@ -2335,17 +2358,17 @@ hb
 DM
 DM
 DM
-DM
-DM
+tA
+tA
 qk
 qk
 Oi
 OW
 sb
 be
-Oz
-DM
-DM
+gc
+tA
+tA
 DM
 hb
 hb
@@ -2380,8 +2403,8 @@ hb
 DM
 DM
 DM
-DM
-DM
+tA
+tA
 qk
 CL
 IW
@@ -2389,8 +2412,8 @@ sb
 QG
 qk
 rm
-DM
-DM
+tA
+tA
 DM
 hb
 xg
@@ -2425,7 +2448,7 @@ hb
 DM
 DM
 DM
-DM
+tA
 oB
 qk
 wu
@@ -2434,7 +2457,7 @@ QF
 BX
 qk
 rm
-DM
+tA
 DM
 hb
 xg
@@ -2469,8 +2492,8 @@ hb
 hb
 DM
 DM
-DM
-DM
+tA
+tA
 qk
 qk
 NU
@@ -2478,7 +2501,7 @@ db
 hq
 zc
 ID
-DM
+tA
 DM
 hb
 xg
@@ -2514,15 +2537,15 @@ hb
 hb
 hb
 DM
-DM
-DM
-DM
-DM
-DM
-DM
-DM
-DM
-DM
+tA
+tA
+tA
+tA
+tA
+tA
+tA
+tA
+tA
 DM
 hb
 xg
diff --git a/_maps/virtual_domains/psyker_shuffle.dmm b/_maps/virtual_domains/psyker_shuffle.dmm
index e53ec600e8a3a..c3434167bb18f 100644
--- a/_maps/virtual_domains/psyker_shuffle.dmm
+++ b/_maps/virtual_domains/psyker_shuffle.dmm
@@ -2,16 +2,16 @@
 "a" = (
 /obj/structure/closet/crate/secure,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "b" = (
 /obj/item/restraints/legcuffs/beartrap/prearmed,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "e" = (
 /obj/item/gun/ballistic/shotgun/lethal,
 /obj/structure/closet/crate/preopen,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "h" = (
 /obj/structure/closet/crate/preopen,
 /obj/item/gun/ballistic/automatic/mini_uzi,
@@ -49,61 +49,61 @@
 /obj/item/gun/ballistic/revolver,
 /turf/template_noop,
 /area/virtual_domain/safehouse)
-"k" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+"i" = (
+/obj/effect/landmark/bitrunning/crate_replacer,
+/turf/open/indestructible/dark,
+/area/virtual_domain)
 "m" = (
 /obj/item/toy/gun{
 	pixel_y = 3
 	},
 /obj/structure/closet/crate/wooden,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "o" = (
 /turf/template_noop,
 /area/template_noop)
-"q" = (
-/obj/effect/landmark/bitrunning/crate_replacer,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
 "r" = (
 /mob/living/simple_animal/hostile/mimic,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "s" = (
 /mob/living/simple_animal/hostile/mimic/crate,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "t" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
+"u" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/indestructible/dark,
+/area/virtual_domain)
 "v" = (
 /obj/structure/closet/crate/hydroponics,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "x" = (
 /obj/item/gun/ballistic/shotgun/lethal,
 /obj/item/gun/ballistic/revolver/mateba,
 /obj/structure/closet/crate/preopen,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "B" = (
-/turf/template_noop,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/open/space,
+/area/space/virtual_domain)
 "F" = (
 /obj/structure/closet/crate/internals,
 /obj/item/gun/ballistic/revolver/mateba,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "K" = (
 /obj/structure/closet/crate/eva,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "M" = (
 /obj/machinery/door/airlock/abductor,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "N" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -111,23 +111,23 @@
 "O" = (
 /obj/structure/closet/crate/freezer/surplus_limbs,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "P" = (
 /obj/structure/closet/crate/wooden,
 /obj/item/gun/ballistic/revolver/mateba,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Q" = (
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "R" = (
 /obj/structure/closet/crate/secure/loot,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "S" = (
 /obj/structure/closet/crate/secure/bitrunning/encrypted,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "U" = (
 /obj/modular_map_root/safehouse{
 	key = "bathroom"
@@ -141,14 +141,15 @@
 /obj/projectile/bullet/shotgun_frag12,
 /obj/projectile/bullet/shotgun_frag12,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Y" = (
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 
 (1,1,1) = {"
 o
 o
+o
 Y
 Y
 Y
@@ -162,9 +163,8 @@ Y
 Y
 Y
 Y
-Y
-Y
-k
+o
+o
 o
 o
 o
@@ -177,7 +177,7 @@ o
 (2,1,1) = {"
 o
 o
-Y
+o
 Y
 Q
 Q
@@ -192,7 +192,7 @@ Q
 a
 Y
 Y
-Y
+o
 o
 o
 o
@@ -205,7 +205,7 @@ o
 (3,1,1) = {"
 o
 o
-Y
+o
 Y
 Y
 K
@@ -218,8 +218,7 @@ Q
 Q
 Q
 Q
-Q
-Y
+u
 Y
 o
 o
@@ -229,6 +228,7 @@ o
 o
 o
 o
+o
 "}
 (4,1,1) = {"
 o
@@ -246,8 +246,7 @@ Y
 Q
 Q
 Q
-Q
-Y
+i
 Y
 o
 o
@@ -257,6 +256,7 @@ o
 o
 o
 o
+o
 "}
 (5,1,1) = {"
 o
@@ -920,7 +920,7 @@ Y
 Y
 Y
 Y
-q
+Y
 o
 o
 o
diff --git a/_maps/virtual_domains/psyker_zombies.dmm b/_maps/virtual_domains/psyker_zombies.dmm
index 1d4307ebdcef8..4ca97f8ef6315 100644
--- a/_maps/virtual_domains/psyker_zombies.dmm
+++ b/_maps/virtual_domains/psyker_zombies.dmm
@@ -1,21 +1,25 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "b" = (
 /obj/item/pizzabox/bomb/armed,
 /obj/structure/rack,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "c" = (
 /obj/structure/sign/warning/directional/west,
 /turf/open/chasm,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "e" = (
 /obj/effect/mob_spawn/corpse/human/cyber_police,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
+"f" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/indestructible/dark,
+/area/virtual_domain/protected_space)
 "h" = (
 /obj/structure/rack,
 /turf/open/indestructible/dark,
@@ -23,7 +27,7 @@
 "i" = (
 /obj/structure/sign/warning/directional/east,
 /turf/open/chasm,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "o" = (
 /turf/template_noop,
 /area/template_noop)
@@ -39,7 +43,7 @@
 	pixel_y = 1
 	},
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "r" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -51,16 +55,16 @@
 /obj/effect/mapping_helpers/airlock/locked,
 /obj/machinery/door/airlock/abductor,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "A" = (
 /obj/effect/spawner/random/trash/caution_sign,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "B" = (
 /obj/machinery/door/airlock/abductor,
 /obj/effect/mapping_helpers/airlock/abandoned,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "D" = (
 /turf/open/indestructible/dark,
 /area/virtual_domain/protected_space)
@@ -68,9 +72,6 @@
 /obj/structure/mystery_box/guns,
 /turf/open/indestructible/dark,
 /area/virtual_domain/protected_space)
-"I" = (
-/turf/closed/indestructible/binary,
-/area/virtual_domain/protected_space)
 "J" = (
 /obj/machinery/door/airlock/abductor,
 /turf/open/indestructible/dark,
@@ -78,11 +79,11 @@
 "K" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "M" = (
 /obj/effect/mob_spawn/corpse/human/zombie,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "O" = (
 /obj/modular_map_root/safehouse{
 	key = "bathroom"
@@ -91,34 +92,34 @@
 /area/virtual_domain/safehouse)
 "Q" = (
 /turf/open/chasm,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "R" = (
 /obj/effect/mine/explosive/light,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "T" = (
 /obj/machinery/door/airlock/abductor,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "U" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "V" = (
 /obj/structure/sign/warning/directional/east,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "W" = (
 /obj/effect/mob_spawn/corpse/human/cyber_police,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "X" = (
 /mob/living/simple_animal/hostile/zombie,
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Y" = (
 /turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 o
@@ -540,10 +541,10 @@ Y
 Y
 a
 Y
-I
-I
-I
-I
+a
+a
+a
+a
 a
 a
 a
@@ -567,10 +568,10 @@ Y
 Y
 Y
 Y
-I
+a
 h
 D
-D
+f
 t
 t
 t
@@ -594,7 +595,7 @@ X
 Y
 Y
 Y
-I
+a
 F
 D
 D
@@ -621,7 +622,7 @@ a
 Y
 Y
 Y
-I
+a
 D
 D
 D
@@ -675,7 +676,7 @@ Y
 R
 Y
 Y
-I
+a
 D
 D
 D
@@ -702,7 +703,7 @@ Y
 Y
 Y
 Y
-I
+a
 F
 D
 D
@@ -729,7 +730,7 @@ a
 a
 Y
 Y
-I
+a
 h
 D
 D
@@ -756,10 +757,10 @@ a
 a
 a
 Y
-I
-I
-I
-I
+a
+a
+a
+a
 a
 a
 a
diff --git a/_maps/virtual_domains/stairs_and_cliffs.dmm b/_maps/virtual_domains/stairs_and_cliffs.dmm
index accdf93bf00be..4c1d364d7778d 100644
--- a/_maps/virtual_domains/stairs_and_cliffs.dmm
+++ b/_maps/virtual_domains/stairs_and_cliffs.dmm
@@ -144,6 +144,10 @@
 	},
 /turf/template_noop,
 /area/virtual_domain/safehouse)
+"wZ" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/closed/indestructible/rock/snow/ice,
+/area/icemoon/underground/explored/virtual_domain)
 "xB" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -173,9 +177,6 @@
 	},
 /turf/open/floor/wood,
 /area/icemoon/underground/explored/virtual_domain)
-"Am" = (
-/turf/closed/indestructible/binary,
-/area/icemoon/underground/explored/virtual_domain)
 "AI" = (
 /obj/structure/flora/grass/green/style_random,
 /turf/open/floor/plating/snowed/smoothed,
@@ -283,9 +284,8 @@
 /turf/closed/indestructible/rock/snow/ice,
 /area/icemoon/underground/explored/virtual_domain)
 "RD" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/icemoon/underground/explored/virtual_domain)
+/area/virtual_domain/fullbright)
 "Tz" = (
 /obj/item/pickaxe/mini,
 /turf/open/misc/asteroid/snow,
@@ -309,85 +309,84 @@
 /area/virtual_domain/safehouse)
 
 (1,1,1) = {"
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
 RD
 "}
 (2,1,1) = {"
-Am
-Qv
+RD
 Qv
 Qv
 Qv
@@ -460,10 +459,11 @@ Qv
 Qv
 Qv
 Qv
-Am
+wZ
+RD
 "}
 (3,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -537,10 +537,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (4,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -614,10 +614,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (5,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -691,10 +691,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (6,1,1) = {"
-Am
+RD
 Qv
 Qv
 kK
@@ -768,10 +768,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (7,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -845,10 +845,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (8,1,1) = {"
-Am
+RD
 Qv
 Qv
 eB
@@ -922,10 +922,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (9,1,1) = {"
-Am
+RD
 Qv
 Qv
 mr
@@ -999,10 +999,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (10,1,1) = {"
-Am
+RD
 Qv
 dR
 sw
@@ -1076,10 +1076,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (11,1,1) = {"
-Am
+RD
 Qv
 dR
 eB
@@ -1153,10 +1153,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (12,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -1230,10 +1230,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (13,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -1307,10 +1307,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (14,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -1384,10 +1384,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (15,1,1) = {"
-Am
+RD
 Qv
 sw
 sa
@@ -1461,10 +1461,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (16,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -1538,10 +1538,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (17,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -1615,10 +1615,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (18,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -1692,10 +1692,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (19,1,1) = {"
-Am
+RD
 Qv
 Qv
 kK
@@ -1769,10 +1769,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (20,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -1846,10 +1846,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (21,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -1923,10 +1923,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (22,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -2000,10 +2000,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (23,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -2077,10 +2077,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (24,1,1) = {"
-Am
+RD
 Qv
 Qv
 sw
@@ -2154,10 +2154,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (25,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -2231,10 +2231,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (26,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -2308,10 +2308,10 @@ pL
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (27,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -2385,10 +2385,10 @@ pL
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (28,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -2462,10 +2462,10 @@ pL
 pL
 Qv
 Qv
-Am
+RD
 "}
 (29,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -2539,10 +2539,10 @@ pL
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (30,1,1) = {"
-Am
+RD
 Qv
 Qv
 qc
@@ -2616,10 +2616,10 @@ pL
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (31,1,1) = {"
-Am
+RD
 Qv
 pl
 qc
@@ -2693,10 +2693,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (32,1,1) = {"
-Am
+RD
 Qv
 sM
 sM
@@ -2770,10 +2770,10 @@ dR
 dR
 Qv
 Qv
-Am
+RD
 "}
 (33,1,1) = {"
-Am
+RD
 Qv
 sM
 sM
@@ -2847,10 +2847,10 @@ dR
 dR
 Qv
 Qv
-Am
+RD
 "}
 (34,1,1) = {"
-Am
+RD
 Qv
 sM
 sM
@@ -2924,10 +2924,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (35,1,1) = {"
-Am
+RD
 Qv
 sM
 sM
@@ -3001,10 +3001,10 @@ YT
 YT
 vz
 Qv
-Am
+RD
 "}
 (36,1,1) = {"
-Am
+RD
 Qv
 dR
 sM
@@ -3078,10 +3078,10 @@ YT
 YT
 YT
 Qv
-Am
+RD
 "}
 (37,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -3155,10 +3155,10 @@ YT
 YT
 YT
 Qv
-Am
+RD
 "}
 (38,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -3232,10 +3232,10 @@ YT
 YT
 YT
 Qv
-Am
+RD
 "}
 (39,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -3309,10 +3309,10 @@ YT
 YT
 YT
 Qv
-Am
+RD
 "}
 (40,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -3386,10 +3386,10 @@ YT
 YT
 YT
 Qv
-Am
+RD
 "}
 (41,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -3463,10 +3463,10 @@ YT
 YT
 uJ
 Qv
-Am
+RD
 "}
 (42,1,1) = {"
-Am
+RD
 Qv
 dR
 AI
@@ -3540,10 +3540,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (43,1,1) = {"
-Am
+RD
 Qv
 yo
 yo
@@ -3617,10 +3617,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (44,1,1) = {"
-Am
+RD
 Qv
 dR
 yo
@@ -3694,10 +3694,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (45,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -3771,10 +3771,10 @@ kK
 dR
 Qv
 Qv
-Am
+RD
 "}
 (46,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -3848,10 +3848,10 @@ dR
 dR
 Qv
 Qv
-Am
+RD
 "}
 (47,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -3925,10 +3925,10 @@ dR
 dR
 Qv
 Qv
-Am
+RD
 "}
 (48,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4002,10 +4002,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (49,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4079,10 +4079,10 @@ sw
 dR
 dR
 Qv
-Am
+RD
 "}
 (50,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -4156,10 +4156,10 @@ eB
 dR
 dR
 Qv
-Am
+RD
 "}
 (51,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -4233,10 +4233,10 @@ dR
 dR
 sa
 Qv
-Am
+RD
 "}
 (52,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -4310,10 +4310,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (53,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -4387,10 +4387,10 @@ Qv
 dR
 dR
 Qv
-Am
+RD
 "}
 (54,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -4464,10 +4464,10 @@ Qv
 dR
 Qv
 Qv
-Am
+RD
 "}
 (55,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4541,10 +4541,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (56,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4618,10 +4618,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (57,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4695,10 +4695,10 @@ dR
 dR
 dR
 Qv
-Am
+RD
 "}
 (58,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4772,10 +4772,10 @@ sa
 dR
 dR
 Qv
-Am
+RD
 "}
 (59,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -4849,10 +4849,10 @@ dR
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (60,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -4926,10 +4926,10 @@ dR
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (61,1,1) = {"
-Am
+RD
 Qv
 dR
 kK
@@ -5003,10 +5003,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (62,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -5080,10 +5080,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (63,1,1) = {"
-Am
+RD
 Qv
 dR
 Lw
@@ -5157,10 +5157,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (64,1,1) = {"
-Am
+RD
 Qv
 dR
 sa
@@ -5234,10 +5234,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (65,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -5311,10 +5311,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (66,1,1) = {"
-Am
+RD
 Qv
 dR
 kK
@@ -5388,10 +5388,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (67,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -5465,10 +5465,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (68,1,1) = {"
-Am
+RD
 Qv
 dR
 dR
@@ -5542,10 +5542,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (69,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -5619,10 +5619,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (70,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -5696,10 +5696,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (71,1,1) = {"
-Am
+RD
 Qv
 Qv
 dR
@@ -5773,10 +5773,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (72,1,1) = {"
-Am
+RD
 Qv
 Qv
 sa
@@ -5850,10 +5850,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (73,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -5927,10 +5927,10 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (74,1,1) = {"
-Am
+RD
 Qv
 Qv
 Qv
@@ -6004,82 +6004,82 @@ Qv
 Qv
 Qv
 Qv
-Am
+RD
 "}
 (75,1,1) = {"
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
-Am
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
+RD
 "}
diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm
index a40945410c11b..00c7f84dbca20 100644
--- a/_maps/virtual_domains/syndicate_assault.dmm
+++ b/_maps/virtual_domains/syndicate_assault.dmm
@@ -3,7 +3,7 @@
 /obj/item/storage/backpack/duffelbag/syndie/surgery,
 /obj/structure/table/reinforced,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "aw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -11,7 +11,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "aN" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -30,10 +30,10 @@
 "aO" = (
 /obj/machinery/recharge_station,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bh" = (
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bD" = (
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -41,7 +41,7 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bG" = (
 /turf/open/floor/pod/dark,
 /area/virtual_domain/protected_space)
@@ -51,7 +51,7 @@
 	},
 /obj/effect/spawner/random/clothing/costume,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cj" = (
 /obj/structure/transit_tube/crossing,
 /turf/closed/wall/r_wall/syndicate,
@@ -67,7 +67,7 @@
 	},
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cw" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -83,7 +83,7 @@
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/clothing/under/syndicate/skirt,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cy" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
@@ -97,7 +97,7 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cB" = (
 /obj/machinery/camera/xray{
 	c_tag = "Medbay";
@@ -106,11 +106,11 @@
 	screen_loc = ""
 	},
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cR" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "cZ" = (
 /obj/structure/table/reinforced,
 /obj/item/gun/ballistic/automatic/l6_saw/unrestricted,
@@ -120,11 +120,11 @@
 "da" = (
 /obj/machinery/stasis,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dd" = (
 /obj/structure/sign/warning/vacuum/external,
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "di" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -132,18 +132,18 @@
 /obj/structure/cable,
 /obj/item/paper/fluff/ruins/forgottenship/powerissues,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dp" = (
 /turf/open/floor/mineral/plastitanium,
 /area/virtual_domain/protected_space)
 "dw" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dz" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "dU" = (
 /obj/structure/cable,
 /obj/structure/fans/tiny,
@@ -152,7 +152,7 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "eB" = (
 /obj/machinery/camera/xray{
 	c_tag = "Cargo pod";
@@ -179,19 +179,19 @@
 	},
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fJ" = (
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fV" = (
 /obj/machinery/atmospherics/components/unary/vent_pump,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "gD" = (
 /obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hg" = (
 /obj/structure/window/reinforced/plasma/plastitanium,
 /obj/machinery/door/poddoor{
@@ -200,28 +200,28 @@
 	state_open = 1
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hy" = (
 /obj/structure/table/reinforced,
 /obj/item/paper/fluff/ruins/forgottenship/missionobj,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hA" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hD" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ip" = (
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "iB" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "iL" = (
 /obj/structure/sign/departments/cargo,
 /turf/closed/wall/r_wall/syndicate,
@@ -242,7 +242,7 @@
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "iX" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
@@ -254,25 +254,25 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ja" = (
 /obj/machinery/door/window/left/directional/north{
 	name = "Spare Equipment";
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "jl" = (
 /obj/structure/bodycontainer/crematorium{
 	id = "fscremate"
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "jA" = (
 /obj/structure/cable,
 /mob/living/basic/trooper/syndicate/melee/space/stormtrooper,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "jJ" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
@@ -281,7 +281,7 @@
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kh" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
@@ -295,13 +295,13 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kI" = (
 /obj/machinery/computer/atmos_alert{
 	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "kJ" = (
 /obj/modular_map_root/safehouse{
 	key = "shuttle_space"
@@ -325,7 +325,7 @@
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lo" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/external/ruin{
@@ -333,17 +333,17 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lN" = (
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mo" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
 	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mA" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/plastitanium,
@@ -354,7 +354,7 @@
 	},
 /obj/item/wrench,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "mL" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/mineral/plastitanium,
@@ -364,36 +364,36 @@
 /obj/effect/mapping_helpers/apc/syndicate_access,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "nn" = (
 /turf/closed/mineral/random,
 /area/virtual_domain/protected_space)
 "nB" = (
 /turf/closed/mineral/random,
-/area/space)
+/area/ruin/space/virtual_domain)
 "nG" = (
 /obj/machinery/light/directional/south,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "nU" = (
 /obj/structure/sign/poster/contraband/syndicate_pistol,
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "og" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/cup/glass/trophy/silver_cup,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "oM" = (
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pl" = (
 /obj/machinery/atmospherics/components/tank/air{
 	dir = 8
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pz" = (
 /obj/machinery/computer/security{
 	desc = "Used to access interrogation room camera.";
@@ -403,38 +403,38 @@
 	screen_loc = ""
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pH" = (
 /obj/structure/table/reinforced,
 /obj/item/toy/plush/nukeplushie,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pM" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pS" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 6
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "pU" = (
 /obj/machinery/shower/directional/north,
 /obj/machinery/light/directional/south,
 /turf/open/floor/iron,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "qf" = (
 /obj/structure/table/optable,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "qx" = (
 /turf/open/space/basic,
-/area/space)
+/area/space/virtual_domain)
 "qU" = (
 /obj/structure/sign/poster/contraband/c20r,
 /turf/closed/wall/r_wall/syndicate,
@@ -443,22 +443,22 @@
 /obj/machinery/light/small/directional/south,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rm" = (
 /obj/machinery/button/crematorium{
 	id = "fscremate";
 	pixel_x = -32
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ru" = (
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rH" = (
 /obj/machinery/airalarm/directional/north,
 /obj/effect/mapping_helpers/airalarm/syndicate_access,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rM" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -470,12 +470,12 @@
 	},
 /obj/effect/spawner/random/contraband/armory,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rP" = (
 /obj/machinery/light/small/directional/south,
 /obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sg" = (
 /obj/machinery/ore_silo,
 /turf/open/floor/mineral/plastitanium,
@@ -486,13 +486,13 @@
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sH" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -505,7 +505,7 @@
 /obj/item/ammo_box/c9mm,
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sK" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -521,7 +521,7 @@
 "sL" = (
 /obj/structure/chair/comfy,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "sM" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
@@ -533,7 +533,7 @@
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "tI" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -542,48 +542,48 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "uP" = (
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vp" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vD" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vK" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "vU" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "wb" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2,
 /obj/machinery/portable_atmospherics/scrubber{
 	anchored = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "we" = (
 /turf/closed/mineral/random/high_chance,
-/area/space)
+/area/ruin/space/virtual_domain)
 "wK" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "wL" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/medkit/regular,
@@ -601,10 +601,10 @@
 	},
 /obj/item/ammo_box/c9mm,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xS" = (
 /turf/closed/wall/r_wall/syndicate/nodiagonal,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yl" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Captain's Room"
@@ -616,12 +616,12 @@
 	state_open = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yJ" = (
 /obj/structure/table/reinforced,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yR" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -631,39 +631,39 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yT" = (
 /obj/item/ai_module/core/full/cybersun,
 /obj/structure/table/reinforced,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yV" = (
 /obj/structure/table/reinforced,
 /obj/item/assembly/prox_sensor,
 /obj/item/assembly/prox_sensor,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "yZ" = (
 /turf/closed/mineral,
-/area/space)
+/area/ruin/space/virtual_domain)
 "zi" = (
 /obj/machinery/vending/cigarette/syndicate,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "zt" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "zN" = (
 /turf/closed/wall/r_wall/syndicate,
 /area/virtual_domain/protected_space)
 "Aa" = (
 /obj/structure/chair/comfy/shuttle,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Bm" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/syndicate,
@@ -672,7 +672,7 @@
 /obj/structure/lattice/catwalk,
 /obj/structure/cable,
 /turf/open/space/basic,
-/area/space)
+/area/space/virtual_domain)
 "BN" = (
 /obj/structure/transit_tube/crossing,
 /turf/template_noop,
@@ -680,7 +680,7 @@
 "Cf" = (
 /obj/machinery/light/directional/south,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ci" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -695,7 +695,7 @@
 /obj/item/ammo_box/magazine/m9mm_aps,
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Cn" = (
 /obj/machinery/camera/xray/directional/east{
 	c_tag = "Conference room";
@@ -703,14 +703,14 @@
 	screen_loc = ""
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "CK" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /mob/living/basic/trooper/syndicate/ranged/smg/pilot,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "CR" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -725,14 +725,14 @@
 /obj/item/storage/box/firingpins/syndicate,
 /obj/item/storage/box/firingpins/syndicate,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "De" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Dj" = (
 /obj/structure/table/reinforced,
 /obj/item/ammo_box/magazine/smgm45,
@@ -748,7 +748,7 @@
 /obj/effect/spawner/random/maintenance,
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "EB" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -756,11 +756,11 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Fp" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "FN" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -769,13 +769,13 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Gn" = (
 /obj/structure/chair/comfy{
 	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Gs" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -783,7 +783,7 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "GB" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/external/ruin{
@@ -791,17 +791,17 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "GZ" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Syndicate Ship Airlock"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Hq" = (
 /turf/closed/indestructible/binary,
-/area/space)
+/area/virtual_domain/fullbright)
 "HU" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Bridge"
@@ -811,17 +811,17 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ia" = (
 /obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie,
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Id" = (
 /obj/machinery/power/shuttle_engine/huge{
 	dir = 8
 	},
 /turf/open/space/basic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "If" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -831,7 +831,7 @@
 	},
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ig" = (
 /obj/machinery/porta_turret/syndicate/energy{
 	dir = 4;
@@ -840,23 +840,23 @@
 	shot_delay = 10
 	},
 /turf/closed/wall/r_wall/syndicate/nodiagonal,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Im" = (
 /obj/structure/table/reinforced,
 /obj/item/ammo_box/c9mm,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Io" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "IC" = (
 /obj/structure/table/reinforced,
 /obj/item/paper,
 /obj/item/pen,
 /obj/machinery/computer/security/telescreen/forgotten_ship/sci/directional/south,
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "IH" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Syndicate Ship Airlock"
@@ -872,23 +872,23 @@
 	},
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/plating,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Jg" = (
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Jz" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 5
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JA" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JN" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -898,14 +898,14 @@
 	dir = 5
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "JP" = (
 /obj/structure/sink/directional/south,
 /turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Kz" = (
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Lk" = (
 /obj/structure/transit_tube/crossing,
 /turf/closed/mineral/random,
@@ -917,7 +917,7 @@
 	req_access = list("syndicate")
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "LB" = (
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
@@ -936,7 +936,7 @@
 /obj/item/ammo_box/magazine/m9mm,
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Mm" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -954,14 +954,14 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "MR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Nm" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -991,7 +991,7 @@
 "Ox" = (
 /obj/machinery/atmospherics/components/unary/vent_pump,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "OH" = (
 /obj/structure/cable,
 /obj/structure/table/reinforced,
@@ -1005,7 +1005,7 @@
 	},
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "PR" = (
 /obj/machinery/door/password/voice/sfc{
 	password = null
@@ -1024,7 +1024,7 @@
 	suit_type = /obj/item/clothing/suit/space/syndicate/black
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Qi" = (
 /obj/item/stack/sheet/mineral/uranium{
 	amount = 15
@@ -1032,7 +1032,7 @@
 /obj/structure/cable,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "QF" = (
 /obj/structure/table/reinforced,
 /obj/item/dualsaber/green,
@@ -1042,23 +1042,23 @@
 "QG" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/closed/mineral/random,
-/area/space)
+/area/ruin/space/virtual_domain)
 "QX" = (
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Ra" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "RQ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "RU" = (
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/open/floor/mineral/plastitanium,
@@ -1070,7 +1070,7 @@
 	dir = 4
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sd" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -1086,33 +1086,33 @@
 /obj/machinery/light/small/directional/north,
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sq" = (
 /obj/machinery/power/smes,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sv" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
 	},
 /obj/effect/spawner/random/food_or_drink/donkpockets,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Sz" = (
 /turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "SX" = (
 /obj/machinery/vending/medical/syndicate_access/cybersun,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "TB" = (
 /turf/closed/indestructible/syndicate,
 /area/virtual_domain/protected_space)
 "UQ" = (
 /obj/structure/sign/poster/contraband/syndicate_recruitment,
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Vg" = (
 /turf/open/space/basic,
 /area/virtual_domain/protected_space)
@@ -1124,7 +1124,7 @@
 	shot_delay = 10
 	},
 /turf/closed/wall/r_wall/syndicate,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Vq" = (
 /obj/structure/transit_tube/station/dispenser/reverse{
 	dir = 8
@@ -1143,21 +1143,21 @@
 	amount = 19
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "WR" = (
 /obj/machinery/power/port_gen/pacman/super{
 	anchored = 1
 	},
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Xp" = (
 /turf/open/space/basic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "XS" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yb" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -1169,7 +1169,7 @@
 "Yi" = (
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yj" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -1178,7 +1178,7 @@
 	amount = 3
 	},
 /turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yk" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Captain's Room"
@@ -1190,7 +1190,7 @@
 	state_open = 1
 	},
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yr" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -1198,25 +1198,25 @@
 "Yu" = (
 /obj/structure/chair/comfy/black,
 /turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "YV" = (
 /obj/structure/sink/directional/south,
 /obj/structure/mirror/directional/west,
 /turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Za" = (
 /obj/machinery/computer/operating,
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Zb" = (
 /turf/open/floor/plastic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZA" = (
 /obj/machinery/power/shuttle_engine/propulsion{
 	dir = 8
 	},
 /turf/open/space/basic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 Hq
diff --git a/_maps/virtual_domains/vaporwave.dmm b/_maps/virtual_domains/vaporwave.dmm
index 4d5b3ab57ada0..569a65a812baa 100644
--- a/_maps/virtual_domains/vaporwave.dmm
+++ b/_maps/virtual_domains/vaporwave.dmm
@@ -5,20 +5,24 @@
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "bs" = (
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "bF" = (
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
+"bJ" = (
+/turf/closed/wall/rust,
+/area/virtual_domain)
 "cz" = (
+/obj/effect/baseturf_helper/virtual_domain,
 /turf/open/misc/asteroid/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "cL" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/cup/glass/drinkingglass{
@@ -31,39 +35,39 @@
 	pixel_y = 8
 	},
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "df" = (
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron/airless{
 	icon_state = "stairs-l"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "eF" = (
 /turf/closed/indestructible/binary,
 /area/space)
 "fx" = (
 /obj/item/statuebust,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "fQ" = (
 /obj/structure/flora/tree/palm,
 /turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "gM" = (
 /obj/structure/table/reinforced,
 /obj/item/clothing/glasses/sunglasses/big{
 	name = "aesthetic sunglasses"
 	},
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "hN" = (
 /turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "il" = (
 /obj/effect/turf_decal/sand,
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "iP" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /turf/template_noop,
@@ -72,7 +76,7 @@
 /obj/structure/window/spawner/directional/east,
 /obj/structure/closet/crate/secure/bitrunning/encrypted,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ku" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
@@ -81,14 +85,15 @@
 /turf/open/floor/iron/airless{
 	icon_state = "stairs-r"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "ll" = (
 /obj/structure/sign/poster/contraband/clown/directional/north,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lu" = (
+/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/wall/rust,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "lB" = (
 /obj/item/tank/internals/emergency_oxygen,
 /obj/item/tank/internals/emergency_oxygen,
@@ -99,15 +104,15 @@
 /obj/structure/table/reinforced,
 /obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "qm" = (
 /obj/structure/flora/tree/palm,
 /obj/machinery/light/directional/west,
 /turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "qu" = (
 /turf/open/floor/holofloor/beach/water,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "rn" = (
 /obj/structure/statue/sandstone/venus{
 	anchored = 1;
@@ -117,82 +122,74 @@
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "xb" = (
 /obj/structure/chair/stool/directional/west,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xp" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "xK" = (
 /turf/closed/wall,
-/area/ruin/space/has_grav/powered/virtual_domain)
-"ym" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space)
+/area/virtual_domain)
 "AX" = (
 /obj/effect/turf_decal/stripes/asteroid/line,
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "Cq" = (
 /obj/item/instrument/eguitar,
 /turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "CR" = (
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Dk" = (
 /obj/structure/window/spawner/directional/east,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Es" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
-"Fd" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/closed/wall/rust,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Hf" = (
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron/airless{
 	icon_state = "recharge_floor_asteroid"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "HA" = (
 /turf/open/floor/holofloor/beach/coast,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "HV" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Jr" = (
 /obj/structure/window/spawner/directional/west,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "KO" = (
 /obj/structure/chair/comfy/black{
 	dir = 8
 	},
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "KY" = (
 /obj/effect/turf_decal/sand,
 /turf/open/floor/iron/airless{
 	icon_state = "stairs-m"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "LG" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -200,26 +197,30 @@
 "LJ" = (
 /obj/structure/lattice,
 /turf/open/misc/asteroid/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "LP" = (
 /obj/structure/flora/tree/palm,
 /obj/machinery/light/directional/east,
 /turf/open/floor/holofloor/beach,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Nz" = (
 /obj/structure/window/spawner/directional/east,
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/cigarettes/cigars/havana,
 /obj/effect/spawner/random/entertainment/lighter,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "NT" = (
+/obj/effect/baseturf_helper/virtual_domain,
 /turf/open/space/basic,
-/area/space)
+/area/space/virtual_domain)
+"Pv" = (
+/turf/open/space/basic,
+/area/space/virtual_domain)
 "Qh" = (
 /obj/structure/closet/crate/bin,
 /turf/open/misc/asteroid/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "Uy" = (
 /obj/modular_map_root/safehouse{
 	key = "shuttle_space"
@@ -232,20 +233,23 @@
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "UV" = (
 /obj/structure/lattice,
 /turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "Vc" = (
 /obj/structure/flora/tree/palm,
 /turf/open/misc/asteroid/airless,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
+"Vp" = (
+/turf/open/misc/asteroid/airless,
+/area/ruin/space/virtual_domain)
 "XJ" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/hatch,
 /turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Yo" = (
 /obj/structure/statue/sandstone/venus{
 	anchored = 1;
@@ -256,16 +260,16 @@
 /turf/open/floor/plating{
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/ruin/space/virtual_domain)
 "YE" = (
 /mob/living/basic/butterfly,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "ZI" = (
 /obj/effect/spawner/random/structure/musician/piano/random_piano,
 /obj/structure/window/spawner/directional/west,
 /turf/open/floor/iron/vaporwave,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 eF
@@ -299,219 +303,219 @@ eF
 "}
 (2,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 NT
 eF
 "}
 (3,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (4,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (5,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Vp
 LJ
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (6,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-cz
-cz
+Pv
+Pv
+Pv
+Pv
+Pv
+Vp
+Vp
 LJ
-cz
-cz
+Vp
+Vp
 LJ
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (7,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-cz
-cz
-cz
+Pv
+Pv
+Pv
+Pv
+Vp
+Vp
+Vp
 UV
 LJ
-cz
+Vp
 UV
-cz
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (8,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Pv
+Vp
 xK
 xK
-lu
-lu
-lu
+bJ
+bJ
+bJ
 xK
 lu
 UE
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (9,1,1) = {"
 eF
-NT
-NT
-NT
+Pv
+Pv
+Pv
 LJ
 Qh
 xK
@@ -522,29 +526,29 @@ HA
 qu
 xK
 aA
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (10,1,1) = {"
 eF
-NT
-NT
-NT
+Pv
+Pv
+Pv
 LJ
 UV
-lu
+bJ
 ZI
 Jr
 Jr
@@ -553,27 +557,27 @@ Jr
 xK
 bF
 Vc
+Vp
 cz
-cz
-NT
-NT
-NT
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 ku
 Uy
-NT
+Pv
 eF
 "}
 (11,1,1) = {"
 eF
-NT
-NT
-NT
-cz
-cz
+Pv
+Pv
+Pv
+Vp
+Vp
 xK
 xb
 CR
@@ -584,26 +588,26 @@ xK
 Yo
 il
 UE
-cz
-NT
-NT
-NT
+Vp
+Pv
+Pv
+Pv
 ku
 iP
 iP
 iP
 ku
 ku
-NT
+Pv
 eF
 "}
 (12,1,1) = {"
 eF
-NT
-NT
-NT
-cz
-cz
+Pv
+Pv
+Pv
+Vp
+Vp
 xK
 ll
 CR
@@ -614,25 +618,25 @@ xK
 Hf
 df
 il
-cz
-NT
-NT
-NT
+Vp
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 ku
 ku
-NT
+Pv
 eF
 "}
 (13,1,1) = {"
 eF
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Vp
 LJ
 xK
 HV
@@ -645,26 +649,26 @@ bs
 KY
 bs
 il
-NT
-NT
-NT
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 ku
 ku
-NT
+Pv
 eF
 "}
 (14,1,1) = {"
 eF
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Vp
 LJ
-lu
+bJ
 xp
 gM
 CR
@@ -675,53 +679,53 @@ Hf
 kF
 bs
 il
-NT
-NT
-NT
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 ku
 ku
-NT
+Pv
 eF
 "}
 (15,1,1) = {"
 eF
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Vp
 LJ
-lu
+bJ
 KO
 KO
 CR
 YE
 lI
-lu
+bJ
 rn
 il
 UE
 UE
-NT
-NT
-NT
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 lB
 ku
-NT
+Pv
 eF
 "}
 (16,1,1) = {"
 eF
-NT
-NT
-NT
+Pv
+Pv
+Pv
 LJ
 UV
 xK
@@ -733,258 +737,258 @@ Nz
 xK
 AX
 Vc
-cz
-cz
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
 ku
 ku
 ku
 ku
 ku
 LG
-NT
+Pv
 eF
 "}
 (17,1,1) = {"
 eF
-NT
-NT
-NT
-cz
-cz
-lu
+Pv
+Pv
+Pv
+Vp
+Vp
+bJ
 fQ
 Cq
 LP
 HA
 qu
-lu
+bJ
 aA
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (18,1,1) = {"
 eF
-NT
-NT
-NT
-cz
-cz
+Pv
+Pv
+Pv
+Vp
+Vp
 xK
 xK
-lu
+bJ
 xK
-lu
-lu
-Fd
+bJ
+bJ
+bJ
 UE
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (19,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-cz
-cz
-cz
+Pv
+Pv
+Pv
+Pv
+Vp
+Vp
+Vp
 UV
 LJ
 Qh
 UV
-cz
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (20,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-cz
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Vp
 LJ
-cz
-cz
+Vp
+Vp
 LJ
-cz
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Vp
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (21,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-ym
-cz
-cz
-cz
-cz
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+LJ
+Vp
+Vp
+Vp
+Vp
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (22,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (23,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (24,1,1) = {"
 eF
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
-NT
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
+Pv
 eF
 "}
 (25,1,1) = {"
diff --git a/_maps/virtual_domains/wendigo.dmm b/_maps/virtual_domains/wendigo.dmm
index 57c002c148c6f..34dc74685bd17 100644
--- a/_maps/virtual_domains/wendigo.dmm
+++ b/_maps/virtual_domains/wendigo.dmm
@@ -40,9 +40,6 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/underground/explored/virtual_domain)
-"ai" = (
-/turf/closed/indestructible/binary,
-/area/icemoon/underground/explored/virtual_domain)
 "aj" = (
 /obj/effect/mob_spawn/corpse/human/cargo_tech,
 /turf/open/misc/asteroid/snow/icemoon,
@@ -197,9 +194,8 @@
 	},
 /area/icemoon/underground/explored/virtual_domain)
 "aL" = (
-/obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/icemoon/underground/explored/virtual_domain)
+/area/virtual_domain/fullbright)
 "aM" = (
 /obj/effect/decal/cleanable/blood/gibs/core,
 /turf/open/indestructible/necropolis{
@@ -346,6 +342,10 @@
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
 /area/icemoon/underground/explored/virtual_domain)
+"yf" = (
+/obj/effect/baseturf_helper/virtual_domain,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored/virtual_domain)
 "KV" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 9
@@ -369,23 +369,23 @@ aS
 aS
 aS
 aS
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
 aS
 aS
 aS
@@ -407,8 +407,8 @@ aS
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -424,8 +424,8 @@ ae
 ae
 ar
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -445,8 +445,8 @@ aS
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -464,8 +464,8 @@ ae
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -483,8 +483,8 @@ aS
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 av
@@ -504,8 +504,8 @@ av
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -521,8 +521,8 @@ aS
 (5,1,1) = {"
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 av
@@ -544,23 +544,23 @@ ab
 ae
 au
 ae
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
 aL
 "}
 (6,1,1) = {"
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -584,9 +584,8 @@ au
 ae
 ae
 ae
-ai
-ai
-ae
+aL
+aL
 ae
 ae
 ae
@@ -594,11 +593,12 @@ ae
 ae
 ae
 ae
-ai
+yf
+aL
 "}
 (7,1,1) = {"
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -624,7 +624,7 @@ av
 ae
 ae
 ae
-ai
+aL
 ae
 ae
 ae
@@ -633,10 +633,10 @@ ad
 ag
 ae
 ae
-ai
+aL
 "}
 (8,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -672,10 +672,10 @@ aa
 aa
 ag
 ae
-ai
+aL
 "}
 (9,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -711,10 +711,10 @@ am
 aa
 aD
 ae
-ai
+aL
 "}
 (10,1,1) = {"
-ai
+aL
 ae
 ae
 ar
@@ -750,10 +750,10 @@ ae
 aT
 ae
 ae
-ai
+aL
 "}
 (11,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -789,10 +789,10 @@ ae
 aK
 ae
 ae
-ai
+aL
 "}
 (12,1,1) = {"
-ai
+aL
 ae
 ae
 ab
@@ -828,10 +828,10 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (13,1,1) = {"
-ai
+aL
 ae
 ae
 ab
@@ -867,10 +867,10 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (14,1,1) = {"
-ai
+aL
 ae
 ae
 ar
@@ -906,10 +906,10 @@ aV
 aV
 aZ
 ae
-ai
+aL
 "}
 (15,1,1) = {"
-ai
+aL
 ae
 ae
 au
@@ -945,10 +945,10 @@ aV
 aV
 aV
 ae
-ai
+aL
 "}
 (16,1,1) = {"
-ai
+aL
 ae
 ad
 ac
@@ -984,10 +984,10 @@ aV
 aV
 aV
 ae
-ai
+aL
 "}
 (17,1,1) = {"
-ai
+aL
 KV
 aI
 aa
@@ -1023,10 +1023,10 @@ aV
 aV
 aV
 ae
-ai
+aL
 "}
 (18,1,1) = {"
-ai
+aL
 ae
 ae
 am
@@ -1062,10 +1062,10 @@ aV
 aV
 aV
 ae
-ai
+aL
 "}
 (19,1,1) = {"
-ai
+aL
 ae
 ae
 av
@@ -1101,10 +1101,10 @@ aV
 aV
 aV
 ae
-ai
+aL
 "}
 (20,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -1140,10 +1140,10 @@ aV
 aV
 aA
 ae
-ai
+aL
 "}
 (21,1,1) = {"
-ai
+aL
 ar
 ae
 au
@@ -1179,10 +1179,10 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (22,1,1) = {"
-ai
+aL
 ae
 ae
 ab
@@ -1218,10 +1218,10 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (23,1,1) = {"
-ai
+aL
 ae
 ae
 ab
@@ -1257,10 +1257,10 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (24,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -1296,10 +1296,10 @@ ae
 aU
 ae
 ae
-ai
+aL
 "}
 (25,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -1335,10 +1335,10 @@ ad
 aI
 aW
 ae
-ai
+aL
 "}
 (26,1,1) = {"
-ai
+aL
 ae
 ae
 ae
@@ -1374,11 +1374,11 @@ aK
 ae
 ae
 ae
-ai
+aL
 "}
 (27,1,1) = {"
-ai
-ai
+aL
+aL
 ae
 au
 ae
@@ -1404,7 +1404,7 @@ ae
 ae
 ar
 ae
-ai
+aL
 ae
 ae
 ae
@@ -1413,12 +1413,12 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (28,1,1) = {"
 aS
-ai
-ai
+aL
+aL
 ae
 au
 ae
@@ -1442,8 +1442,8 @@ ae
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -1452,13 +1452,13 @@ ae
 ae
 ae
 ae
-ai
+aL
 "}
 (29,1,1) = {"
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -1480,25 +1480,25 @@ ae
 ae
 ar
 ae
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
 "}
 (30,1,1) = {"
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -1518,8 +1518,8 @@ ae
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -1537,8 +1537,8 @@ aS
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -1556,8 +1556,8 @@ ae
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -1577,8 +1577,8 @@ aS
 aS
 aS
 aS
-ai
-ai
+aL
+aL
 ae
 ae
 ae
@@ -1594,8 +1594,8 @@ ae
 ae
 ae
 ae
-ai
-ai
+aL
+aL
 aS
 aS
 aS
@@ -1617,23 +1617,23 @@ aS
 aS
 aS
 aS
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
 aS
 aS
 aS
diff --git a/_maps/virtual_domains/xeno_nest.dmm b/_maps/virtual_domains/xeno_nest.dmm
index 65f183d69c401..895ba5e84c37c 100644
--- a/_maps/virtual_domains/xeno_nest.dmm
+++ b/_maps/virtual_domains/xeno_nest.dmm
@@ -2,31 +2,32 @@
 "a" = (
 /turf/template_noop,
 /area/template_noop)
+"b" = (
+/obj/structure/alien/weeds,
+/obj/structure/alien/resin/wall,
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain)
 "c" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
 /obj/structure/alien/resin/wall,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
-"d" = (
-/obj/structure/alien/resin/wall,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "e" = (
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "f" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg/burst,
 /obj/effect/decal/cleanable/blood,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "h" = (
 /obj/structure/alien/weeds,
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "i" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -35,7 +36,7 @@
 /obj/item/clothing/under/syndicate,
 /obj/item/clothing/glasses/night,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "j" = (
 /obj/machinery/suit_storage_unit/spaceruin,
 /turf/template_noop,
@@ -44,18 +45,18 @@
 /obj/structure/alien/weeds/node,
 /obj/structure/alien/resin/wall,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "l" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "m" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /obj/structure/alien/resin/wall,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "n" = (
 /turf/template_noop,
 /area/virtual_domain/safehouse)
@@ -63,18 +64,18 @@
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "p" = (
 /obj/structure/alien/weeds,
 /mob/living/basic/alien/drone{
 	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "q" = (
 /obj/structure/alien/resin/wall,
-/turf/open/space/basic,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain)
 "r" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/template_noop,
@@ -85,17 +86,17 @@
 	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "t" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "u" = (
 /obj/structure/alien/weeds/node,
 /obj/effect/decal/cleanable/blood,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "v" = (
 /obj/modular_map_root/safehouse{
 	key = "shuttle"
@@ -107,37 +108,37 @@
 /obj/structure/bed/nest,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "y" = (
 /obj/structure/alien/weeds/node,
 /obj/effect/landmark/bitrunning/mob_segment,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "z" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "A" = (
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "B" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "C" = (
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "D" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "E" = (
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "F" = (
 /obj/structure/table/greyscale,
 /obj/item/gun/energy/xray,
@@ -155,7 +156,7 @@
 /obj/structure/alien/resin/wall,
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "H" = (
 /obj/structure/table/greyscale,
 /obj/machinery/recharger{
@@ -172,7 +173,7 @@
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "J" = (
 /obj/structure/alien/weeds,
 /mob/living/basic/alien/queen/large{
@@ -182,12 +183,12 @@
 	can_plant_weeds = 0
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "K" = (
 /obj/structure/alien/weeds,
 /obj/effect/landmark/bitrunning/cache_spawn,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "L" = (
 /obj/item/storage/medkit/regular,
 /obj/item/storage/medkit/regular,
@@ -196,12 +197,10 @@
 "M" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall{
-	move_force = 1000;
-	move_resist = 3000;
-	pull_force = 1000
+	move_resist = 3000
 	},
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "N" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -211,48 +210,48 @@
 /obj/item/melee/baton/security/loaded,
 /obj/item/clothing/head/helmet,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "O" = (
 /obj/effect/baseturf_helper/virtual_domain,
 /turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain/fullbright)
 "P" = (
 /obj/structure/alien/weeds/node,
 /mob/living/basic/alien,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Q" = (
 /obj/structure/alien/resin/wall,
 /obj/structure/alien/resin/wall,
-/turf/closed/indestructible/binary,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins,
+/area/virtual_domain)
 "S" = (
 /obj/structure/alien/weeds,
 /mob/living/basic/alien,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "T" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg/burst,
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "U" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/item/gun/ballistic/automatic/pistol,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "V" = (
 /obj/structure/alien/weeds/node,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "W" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg/burst,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 "Z" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -262,12 +261,13 @@
 /obj/item/clothing/mask/gas,
 /obj/item/clothing/head/helmet/space/syndicate/orange,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/space/has_grav/powered/virtual_domain)
+/area/virtual_domain)
 
 (1,1,1) = {"
 a
 a
 a
+a
 E
 E
 E
@@ -278,8 +278,7 @@ E
 E
 E
 E
-E
-E
+a
 a
 a
 a
@@ -309,7 +308,7 @@ a
 a
 a
 a
-E
+a
 E
 z
 z
@@ -656,16 +655,16 @@ a
 a
 a
 a
+a
+a
+a
 E
 E
 E
 E
 E
 E
-E
-E
-E
-E
+a
 a
 a
 a
@@ -697,8 +696,8 @@ a
 a
 a
 a
-E
-E
+a
+a
 E
 E
 z
@@ -738,7 +737,7 @@ a
 a
 a
 a
-E
+a
 E
 E
 z
@@ -760,7 +759,7 @@ a
 a
 a
 a
-E
+a
 E
 z
 z
@@ -779,7 +778,7 @@ a
 a
 a
 a
-E
+a
 E
 z
 z
@@ -801,7 +800,7 @@ a
 a
 a
 a
-E
+a
 E
 E
 z
@@ -817,8 +816,8 @@ a
 a
 a
 a
-E
-E
+a
+a
 E
 E
 E
@@ -853,12 +852,12 @@ z
 z
 E
 E
-E
-E
-E
-E
-E
-E
+a
+a
+a
+a
+a
+a
 E
 E
 z
@@ -952,7 +951,7 @@ z
 E
 E
 E
-E
+a
 a
 a
 a
@@ -1029,12 +1028,12 @@ e
 z
 E
 E
-E
-E
-E
+a
+a
+a
 E
 Q
-d
+q
 q
 q
 q
@@ -1069,7 +1068,7 @@ t
 z
 z
 E
-E
+a
 a
 a
 a
@@ -1110,7 +1109,7 @@ e
 z
 E
 E
-E
+a
 a
 a
 a
@@ -1150,8 +1149,8 @@ e
 e
 z
 E
-E
-E
+a
+a
 a
 a
 a
@@ -1191,7 +1190,7 @@ e
 z
 z
 E
-E
+a
 a
 a
 a
@@ -1233,12 +1232,12 @@ z
 E
 E
 E
+a
+a
+a
+a
 E
-E
-E
-E
-E
-d
+q
 C
 C
 A
@@ -1279,7 +1278,7 @@ E
 E
 E
 E
-z
+b
 C
 C
 C
@@ -1647,7 +1646,7 @@ a
 E
 z
 E
-d
+q
 q
 C
 C
@@ -1688,7 +1687,7 @@ a
 E
 E
 E
-d
+q
 q
 A
 A
@@ -1729,7 +1728,7 @@ a
 a
 a
 E
-d
+q
 q
 A
 C
@@ -1745,8 +1744,8 @@ a
 a
 a
 a
-E
-E
+a
+a
 E
 E
 z
@@ -1770,7 +1769,7 @@ a
 a
 a
 E
-d
+q
 q
 A
 A
@@ -1786,7 +1785,7 @@ a
 a
 a
 a
-E
+a
 E
 E
 z
@@ -1811,7 +1810,7 @@ a
 a
 a
 E
-d
+q
 q
 A
 A
@@ -1827,7 +1826,7 @@ a
 a
 a
 a
-E
+a
 E
 z
 z
@@ -1925,7 +1924,7 @@ E
 E
 E
 E
-E
+a
 a
 a
 a
@@ -2001,8 +2000,8 @@ z
 z
 E
 E
-E
-E
+a
+a
 a
 a
 a
diff --git a/auxlua.dll b/auxlua.dll
deleted file mode 100644
index 4f712c26d82ee..0000000000000
Binary files a/auxlua.dll and /dev/null differ
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index c75793dfe34b6..4756b80f02737 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -19,7 +19,7 @@
 //Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate
 /// A mutation that can be activated and deactived by completing a sequence
 #define MUT_NORMAL 1
-/// A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console
+/// A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before its name in the mutation section of the dna console
 #define MUT_EXTRA 2
 /// Cannot be interacted with by players through normal means. I.E. wizards mutate
 #define MUT_OTHER 3
@@ -60,9 +60,15 @@
 #define DNA_MOTH_MARKINGS_BLOCK 13
 #define DNA_MUSHROOM_CAPS_BLOCK 14
 #define DNA_POD_HAIR_BLOCK 15
-#define DNA_MONKEY_TAIL_BLOCK 16
 
-#define DNA_FEATURE_BLOCKS 16
+// Hey! Listen up if you're here because you're adding a species feature!
+//
+// You don't need to add a DNA block for EVERY species feature!
+// You ONLY need DNA blocks if you intend to allow players to change it via GENETICS!
+// (Which means having a DNA block for a feature tied to a mob without DNA is entirely pointless.)
+
+/// Total amount of DNA blocks, must be equal to the highest DNA block number
+#define DNA_FEATURE_BLOCKS 15
 
 #define DNA_SEQUENCE_LENGTH 4
 #define DNA_MUTATION_BLOCKS 8
@@ -86,6 +92,8 @@
 #define ORGAN_SLOT_MONSTER_CORE "monstercore"
 #define ORGAN_SLOT_RIGHT_ARM_AUG "r_arm_device"
 #define ORGAN_SLOT_LEFT_ARM_AUG "l_arm_device" //This one ignores alphabetical order cause the arms should be together
+#define ORGAN_SLOT_RIGHT_ARM_MUSCLE "r_arm_muscle"
+#define ORGAN_SLOT_LEFT_ARM_MUSCLE "l_arm_muscle" //same as above
 #define ORGAN_SLOT_SPINE "spine"
 #define ORGAN_SLOT_STOMACH "stomach"
 #define ORGAN_SLOT_STOMACH_AID "stomach_aid"
@@ -137,6 +145,8 @@ GLOBAL_LIST_INIT(organ_process_order, list(
 	ORGAN_SLOT_APPENDIX,
 	ORGAN_SLOT_RIGHT_ARM_AUG,
 	ORGAN_SLOT_LEFT_ARM_AUG,
+	ORGAN_SLOT_LEFT_ARM_MUSCLE,
+	ORGAN_SLOT_RIGHT_ARM_MUSCLE,
 	ORGAN_SLOT_STOMACH,
 	ORGAN_SLOT_STOMACH_AID,
 	ORGAN_SLOT_BREATHING_TUBE,
diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm
index 55e706ce06d03..cbc17654078bf 100644
--- a/code/__DEFINES/_flags.dm
+++ b/code/__DEFINES/_flags.dm
@@ -11,6 +11,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define DF_USE_TAG (1<<0)
 #define DF_VAR_EDITED (1<<1)
 #define DF_ISPROCESSING (1<<2)
+/// Placed on datums that have a static, constant reference. Primarily only used for turfs.
+#define DF_STATIC_OBJECT (1<<3)
 
 //FLAGS BITMASK
 // scroll down before changing the numbers on these
@@ -136,6 +138,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define VIRTUAL_SAFE_AREA (1<<16)
 /// This area does not allow the Binary channel
 #define BINARY_JAMMING (1<<17)
+/// This area prevents Bag of Holding rifts from being opened.
+#define NO_BOH (1<<18)
 
 /*
 	These defines are used specifically with the atom/pass_flags bitmask
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 84b0229a97612..66f34f5f57b37 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -73,6 +73,8 @@
 #define ADMIN_LUAVIEW_CHUNK(state, log_index) "(<a href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];lua_state=[REF(state)];log_index=[log_index]'>VIEW CODE</a>)"
 /// Displays "(SHOW)" in the chat, when clicked it tries to show atom(paper). First you need to set the request_state variable to TRUE for the paper.
 #define ADMIN_SHOW_PAPER(atom) "(<A href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];show_paper=[REF(atom)]'>SHOW</a>)"
+/// Displays "(PRINT)" in the chat, when clicked it will try to print the atom(paper) on the CentCom fax machine.
+#define ADMIN_PRINT_FAX(atom, fax_name) "(<a href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];print_fax=[REF(atom)];fax_name=[fax_name]'>PRINT</a>)"
 /// Displays "(PLAY)" in the chat, when clicked it tries to play internet sounds from the request.
 #define ADMIN_PLAY_INTERNET(text, credit) "(<A href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];play_internet=[url_encode(text)];credit=[credit]'>PLAY</a>)"
 /// Displays "(SEE Z-LEVEL LAYOUT)" in the chat, when clicked it shows the z-level layouts for the current world state.
@@ -87,7 +89,7 @@
 	if(!drop_atom)
 		return //not a valid atom.
 	var/turf/drop_turf = get_step(drop_atom, 0) //resolve where the thing is.
-	if(!drop_turf) //incase it's inside a valid drop container, inside another container. ie if a mech picked up a closet and has it inside it's internal storage.
+	if(!drop_turf) //incase it's inside a valid drop container, inside another container. ie if a mech picked up a closet and has it inside its internal storage.
 		var/atom/last_try = drop_atom.loc?.drop_location() //one last try, otherwise fuck it.
 		if(last_try)
 			drop_turf = get_step(last_try, 0)
diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm
index 90a9b55ba1749..4374288b07c5b 100644
--- a/code/__DEFINES/ai/ai_blackboard.dm
+++ b/code/__DEFINES/ai/ai_blackboard.dm
@@ -24,6 +24,8 @@
 ///the list of interactions we can have with the owner
 #define BB_INTERACTIONS_WITH_OWNER "BB_interactions_with_owner"
 
+///The trait checked by ai_behavior/find_potential_targets/prioritize_trait to return a target with a trait over the rest.
+#define BB_TARGET_PRIORITY_TRAIT "target_priority_trait"
 
 /// Store a single or list of emotes at this key
 #define BB_EMOTE_KEY "BB_emotes"
@@ -91,7 +93,7 @@
 #define BB_TARGETLESS_TIME "BB_targetless_time"
 
 ///Tipped blackboards
-///Bool that means a basic mob will start reacting to being tipped in it's planning
+///Bool that means a basic mob will start reacting to being tipped in its planning
 #define BB_BASIC_MOB_TIP_REACTING "BB_basic_tip_reacting"
 ///the motherfucker who tipped us
 #define BB_BASIC_MOB_TIPPER "BB_basic_tip_tipper"
diff --git a/code/__DEFINES/ai/monsters.dm b/code/__DEFINES/ai/monsters.dm
index f80eb85735da6..fb6952eb08491 100644
--- a/code/__DEFINES/ai/monsters.dm
+++ b/code/__DEFINES/ai/monsters.dm
@@ -10,6 +10,16 @@
 /// Key where we keep the spine traps ability
 #define BB_METEOR_HEART_SPINE_TRAPS "BB_meteor_spine_traps"
 
+// Cybersun AI core AI keys
+///key for lightning strike attack
+#define BB_CYBERSUN_CORE_LIGHTNING "BB_lightning_strike"
+///key for big laser attack
+#define BB_CYBERSUN_CORE_BARRAGE "BB_cybersun_barrage"
+
+// Donk Exenteration Drone keys
+// key for aoe slash attack
+#define BB_DEDBOT_SLASH "BB_dedbot_exenterate"
+
 // Spider AI keys
 /// Key where we store a turf to put webs on
 #define BB_SPIDER_WEB_TARGET "BB_spider_web_target"
@@ -60,6 +70,11 @@
 #define BB_LOBSTROSITY_TARGET_LIMB "BB_lobstrosity_target_limb"
 /// We increment this counter every time we try to move while dragging an arm and if we go too long we'll give up trying to get out of line of sight and just eat the fingers
 #define BB_LOBSTROSITY_FINGER_LUST "BB_lobstrosity_finger_lust"
+/// Does this carp still target lying mobs even if they aren't stunned, and flee from sary fishermen?
+#define BB_LOBSTROSITY_NAIVE_HUNTER "BB_lobstrosity_naive_hunter"
+
+/// Does this carp run from scary fishermen?
+#define BB_CARPS_FEAR_FISHERMAN "BB_carp_fear_fisherman"
 
 // eyeball keys
 ///the death glare ability
diff --git a/code/__DEFINES/art.dm b/code/__DEFINES/art.dm
index b6e9b885d9132..2f6fd95523148 100644
--- a/code/__DEFINES/art.dm
+++ b/code/__DEFINES/art.dm
@@ -14,3 +14,16 @@
 #define CRAYON_COST_SMALL 0.5
 #define CRAYON_COST_DEFAULT 1
 #define CRAYON_COST_LARGE 5
+
+/**
+ * Patronage thresholds for paintings.
+ * Different cosmetic frames become available as more credits are spent on the patronage.
+ * These also influence the artistic value (read: positive moodlets) of a painting.
+ */
+#define PATRONAGE_OK_FRAME (PAYCHECK_CREW * 3) // 150 credits, as of march 2022
+#define PATRONAGE_NICE_FRAME (PATRONAGE_OK_FRAME * 2.5)
+#define PATRONAGE_GREAT_FRAME (PATRONAGE_NICE_FRAME * 2)
+#define PATRONAGE_EXCELLENT_FRAME (PATRONAGE_GREAT_FRAME * 2)
+#define PATRONAGE_AMAZING_FRAME (PATRONAGE_EXCELLENT_FRAME * 2)
+#define PATRONAGE_SUPERB_FRAME (PATRONAGE_AMAZING_FRAME * 2)
+#define PATRONAGE_LEGENDARY_FRAME (PATRONAGE_SUPERB_FRAME * 2)
diff --git a/code/__DEFINES/atmospherics/atmos_mob_interaction.dm b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
index dbd8bbc5610b0..75dcebc72d963 100644
--- a/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
+++ b/code/__DEFINES/atmospherics/atmos_mob_interaction.dm
@@ -64,13 +64,13 @@
 /// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area.
 #define BODYTEMP_HEATING_MAX 30
 /// The body temperature limit the human body can take before it starts taking damage from heat.
-/// This also affects how fast the body normalises it's temperature when hot.
+/// This also affects how fast the body normalises its temperature when hot.
 /// 340k is about 66c, and rather high for a human.
 #define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30)
 /// A temperature limit which is above the maximum lavaland temperature
 #define BODYTEMP_HEAT_LAVALAND_SAFE (LAVALAND_MAX_TEMPERATURE + 5)
 /// The body temperature limit the human body can take before it starts taking damage from cold.
-/// This also affects how fast the body normalises it's temperature when cold.
+/// This also affects how fast the body normalises its temperature when cold.
 /// 270k is about -3c, that is below freezing and would hurt over time.
 #define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40)
 /// A temperature limit which is above the minimum icebox temperature
diff --git a/code/__DEFINES/atmospherics/atmos_piping.dm b/code/__DEFINES/atmospherics/atmos_piping.dm
index 3870a7aed34ac..521dbd02579ec 100644
--- a/code/__DEFINES/atmospherics/atmos_piping.dm
+++ b/code/__DEFINES/atmospherics/atmos_piping.dm
@@ -91,6 +91,8 @@
 #define PIPING_ALL_COLORS (1<<4)
 /// can bridge over pipenets
 #define PIPING_BRIDGE (1<<5)
+/// intended to connect with layers 2 and 4 only
+#define PIPING_DISTRO_AND_WASTE_LAYERS (1<<6)
 
 // Ventcrawling bitflags, handled in var/vent_movement
 ///Allows for ventcrawling to occur. All atmospheric machines have this flag on by default. Cryo is the exception
diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
index 86de96f07a1d1..1af3003bb8577 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/atom_hud.dm
@@ -58,8 +58,8 @@
 #define DATA_HUD_SECURITY_ADVANCED 2
 #define DATA_HUD_MEDICAL_BASIC 3
 #define DATA_HUD_MEDICAL_ADVANCED 4
-#define DATA_HUD_DIAGNOSTIC_BASIC 5
-#define DATA_HUD_DIAGNOSTIC_ADVANCED 6
+#define DATA_HUD_DIAGNOSTIC 5
+#define DATA_HUD_BOT_PATH 6
 #define DATA_HUD_ABDUCTOR 7
 #define DATA_HUD_SENTIENT_DISEASE 8
 #define DATA_HUD_AI_DETECT 9
diff --git a/code/__DEFINES/bandastation/ru_jobs.dm b/code/__DEFINES/bandastation/ru_jobs.dm
index 19550d141d7f9..fb2f94945ae3f 100644
--- a/code/__DEFINES/bandastation/ru_jobs.dm
+++ b/code/__DEFINES/bandastation/ru_jobs.dm
@@ -1,6 +1,6 @@
 // Keep this in sync with JOBS_RU from tgui\packages\tgui\bandastation\ru_jobs.tsx
 //No department
-#define JOB_ASSISTANT_RU "Гражданский"
+#define JOB_ASSISTANT_RU "Ассистент"
 #define JOB_PRISONER_RU "Заключенный"
 //Command
 #define JOB_CAPTAIN_RU "Капитан"
@@ -113,16 +113,14 @@ GLOBAL_LIST_INIT(job_titles_ru, list(
 	JOB_PSYCHOLOGIST = JOB_PSYCHOLOGIST_RU,
 ))
 
+GLOBAL_LIST_EMPTY(job_titles_ru_to_en)
+
 // Use it ONLY for display!!
-/proc/job_title_ru(title)
-	var/job_ru_title = GLOB.job_titles_ru[title]
-	if(job_ru_title)
-		return job_ru_title
-	return title
+/proc/job_title_ru(en_title)
+	return GLOB.job_titles_ru[en_title] || en_title
 
-/proc/job_title_ru_to_en(title)
-	GLOB.job_titles_ru.Find("")
-	for(var/en_title in GLOB.job_titles_ru)
-		if(GLOB.job_titles_ru[en_title] == title)
-			return en_title
-	return title
+/proc/job_title_ru_to_en(ru_title)
+	if(!length(GLOB.job_titles_ru_to_en))
+		for(var/key in GLOB.job_titles_ru)
+			GLOB.job_titles_ru_to_en[GLOB.job_titles_ru[key]] = key
+	return GLOB.job_titles_ru_to_en[ru_title] || ru_title
diff --git a/code/__DEFINES/basic_mobs.dm b/code/__DEFINES/basic_mobs.dm
index ae74872cd7302..e519fb25240be 100644
--- a/code/__DEFINES/basic_mobs.dm
+++ b/code/__DEFINES/basic_mobs.dm
@@ -70,5 +70,3 @@ GLOBAL_VAR_INIT(gutlunch_count, 0)
 #define BB_RAPTOR_TROUGH_TARGET "raptor_trough_target"
 
 #define MAX_RAPTOR_POP 64
-
-
diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm
index 1d34ed6b3cff8..d136f35a69ffb 100644
--- a/code/__DEFINES/cargo.dm
+++ b/code/__DEFINES/cargo.dm
@@ -1,33 +1,9 @@
-#define STYLE_STANDARD 1
-#define STYLE_BLUESPACE 2
-#define STYLE_CENTCOM 3
-#define STYLE_SYNDICATE 4
-#define STYLE_BLUE 5
-#define STYLE_CULT 6
-#define STYLE_MISSILE 7
-#define STYLE_RED_MISSILE 8
-#define STYLE_BOX 9
-#define STYLE_HONK 10
-#define STYLE_FRUIT 11
-#define STYLE_INVISIBLE 12
-#define STYLE_GONDOLA 13
-#define STYLE_SEETHROUGH 14
-
-#define POD_SHAPE 1
-#define POD_BASE 2
-#define POD_DOOR 3
-#define POD_DECAL 4
-#define POD_GLOW 5
-#define POD_RUBBLE_TYPE 6
-#define POD_NAME 7
-#define POD_DESC 8
-
 #define RUBBLE_NONE 1
 #define RUBBLE_NORMAL 2
 #define RUBBLE_WIDE 3
 #define RUBBLE_THIN 4
 
-#define POD_SHAPE_NORML 1
+#define POD_SHAPE_NORMAL 1
 #define POD_SHAPE_OTHER 2
 
 #define POD_TRANSIT "1"
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm
index 72159bde0540e..5a95d4f77d7d2 100644
--- a/code/__DEFINES/colors.dm
+++ b/code/__DEFINES/colors.dm
@@ -435,3 +435,8 @@ GLOBAL_LIST_INIT(cable_colors, list(
 ))
 
 #define HUSK_COLOR_TONE rgb(96, 88, 80)
+
+#define CM_COLOR_SAT_MIN 0.6
+#define CM_COLOR_SAT_MAX 0.7
+#define CM_COLOR_LUM_MIN 0.65
+#define CM_COLOR_LUM_MAX 0.75
diff --git a/code/__DEFINES/cult.dm b/code/__DEFINES/cult.dm
index 005b0ca27eef8..4f77e2966ca39 100644
--- a/code/__DEFINES/cult.dm
+++ b/code/__DEFINES/cult.dm
@@ -58,5 +58,5 @@ GLOBAL_LIST(sacrificed)
 
 // Used to keep track of items rewarded after a heretic is sacked.
 #define CURSED_BLADE_UNLOCKED "Cursed Blade"
-#define CRIMSON_FOCUS_UNLOCKED "Crimson Focus"
+#define CRIMSON_MEDALLION_UNLOCKED "Crimson Medallion"
 #define PROTEON_ORB_UNLOCKED "Proteon Orb"
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm
index c612d174ac354..3282c9387a1e5 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm
@@ -68,7 +68,7 @@
 #define COMSIG_ATOM_EXITED "atom_exited"
 ///from base of atom/movable/Moved(): (atom/movable/gone, direction)
 #define COMSIG_ATOM_ABSTRACT_EXITED "atom_abstract_exited"
-///from base of atom/Bumped(): (/atom/movable)
+///from base of atom/Bumped(): (/atom/movable) (the one that gets bumped)
 #define COMSIG_ATOM_BUMPED "atom_bumped"
 ///from base of atom/has_gravity(): (turf/location, list/forced_gravities)
 #define COMSIG_ATOM_HAS_GRAVITY "atom_has_gravity"
@@ -140,3 +140,6 @@
 /// From /obj/effect/particle_effect/sparks/proc/sparks_touched(datum/source, atom/movable/singed)
 #define COMSIG_ATOM_TOUCHED_SPARKS "atom_touched_sparks"
 #define COMSIG_ATOM_TOUCHED_HAZARDOUS_SPARKS "atom_touched_hazardous_sparks"
+
+/// From whoever has been revealed (atom/revealed)
+#define COMSIG_ATOM_REVEAL "atom_reveal"
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm
index bc73dbf32914a..d75d8bacec73a 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm
@@ -9,10 +9,12 @@
 #define COMSIG_MOVABLE_MOVED "movable_moved"
 ///from base of atom/movable/Cross(): (/atom/movable)
 #define COMSIG_MOVABLE_CROSS "movable_cross"
+	#define COMPONENT_BLOCK_CROSS (1<<0)
 ///from base of atom/movable/Move(): (/atom/movable)
 #define COMSIG_MOVABLE_CROSS_OVER "movable_cross_am"
 ///from base of atom/movable/Bump(): (/atom)
 #define COMSIG_MOVABLE_BUMP "movable_bump"
+	#define COMPONENT_INTERCEPT_BUMPED (1<<0)
 ///from base of atom/movable/newtonian_move(): (inertia_direction, start_delay)
 #define COMSIG_MOVABLE_NEWTONIAN_MOVE "movable_newtonian_move"
 	#define COMPONENT_MOVABLE_NEWTONIAN_BLOCK (1<<0)
@@ -72,7 +74,7 @@
 #define COMSIG_MOVABLE_DISPOSING "movable_disposing"
 // called when movable is expelled from a disposal pipe, bin or outlet on obj/pipe_eject: (direction)
 #define COMSIG_MOVABLE_PIPE_EJECTING "movable_pipe_ejecting"
-///called when the movable sucessfully has it's anchored var changed, from base atom/movable/set_anchored(): (value)
+///called when the movable sucessfully has its anchored var changed, from base atom/movable/set_anchored(): (value)
 #define COMSIG_MOVABLE_SET_ANCHORED "movable_set_anchored"
 ///from base of atom/movable/setGrabState(): (newstate)
 #define COMSIG_MOVABLE_SET_GRAB_STATE "living_set_grab_state"
@@ -123,3 +125,4 @@
 #define COMSIG_MOVABLE_BUMP_PUSHED "movable_bump_pushed"
 	/// Stop it from moving
 	#define COMPONENT_NO_PUSH (1<<0)
+
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
index 5836a0be65a39..63ad7655be7ee 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm
@@ -19,7 +19,12 @@
 #define COMSIG_ATOM_START_PULL "movable_start_pull"
 /// called on /atom when something attempts to pass through it (atom/movable/source, atom/movable/passing, dir)
 #define COMSIG_ATOM_TRIED_PASS "atom_tried_pass"
-	#define COMSIG_COMPONENT_PERMIT_PASSAGE (1 << 0)
+/// called on /movable when something attempts to pass through it (atom/movable/source, atom/movable/passing, dir) AND WHEN general_movement = FALSE for some fucking reason
+#define COMSIG_MOVABLE_CAN_PASS_THROUGH "movable_can_pass_through"
+/// If given, we permit passage through
+#define COMSIG_COMPONENT_PERMIT_PASSAGE (1 << 0)
+/// If given, we DONT permit passage through
+#define COMSIG_COMPONENT_REFUSE_PASSAGE (1 << 1)
 ///called on /living when someone starts pulling (atom/movable/pulled, state, force)
 #define COMSIG_LIVING_START_PULL "living_start_pull"
 ///called on /living when someone is pulled (mob/living/puller)
diff --git a/code/__DEFINES/dcs/signals/signals_clothing.dm b/code/__DEFINES/dcs/signals/signals_clothing.dm
index 03b695aca4c3e..eeb40ade8aae5 100644
--- a/code/__DEFINES/dcs/signals/signals_clothing.dm
+++ b/code/__DEFINES/dcs/signals/signals_clothing.dm
@@ -1,5 +1,5 @@
 // /obj/item/clothing
-/// (/obj/item/clothing, visor_state) - When a clothing gets it's visor toggled.
+/// (/obj/item/clothing, visor_state) - When a clothing gets its visor toggled.
 #define COMSIG_CLOTHING_VISOR_TOGGLE "clothing_visor_toggle"
 /// From an undersuit being adjusted: ()
 #define COMSIG_CLOTHING_UNDER_ADJUSTED "clothing_under_adjusted"
diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm
index 0c998be19219f..81224e7a58d81 100644
--- a/code/__DEFINES/dcs/signals/signals_datum.dm
+++ b/code/__DEFINES/dcs/signals/signals_datum.dm
@@ -45,3 +45,6 @@
 
 ///from /datum/bank_account/pay_debt(), after a portion or all the debt has been paid.
 #define COMSIG_BANK_ACCOUNT_DEBT_PAID "bank_account_debt_paid"
+
+///from /datum/component/on_hit_effect/send_signal(): (user, target, hit_zone)
+#define COMSIG_ON_HIT_EFFECT "comsig_on_hit_effect"
diff --git a/code/__DEFINES/dcs/signals/signals_fish.dm b/code/__DEFINES/dcs/signals/signals_fish.dm
index 5b01bd7d61299..2fbf99446ab94 100644
--- a/code/__DEFINES/dcs/signals/signals_fish.dm
+++ b/code/__DEFINES/dcs/signals/signals_fish.dm
@@ -21,11 +21,15 @@
 /// Fishing challenge completed
 #define COMSIG_FISHING_CHALLENGE_COMPLETED "fishing_completed"
 /// Sent to the fisherman when the reward is dispensed: (reward)
-#define COMSIG_MOB_FISHING_REWARD_DISPENSED "mob_fishing_reward_dispensed"
+#define COMSIG_FISH_SOURCE_REWARD_DISPENSED "mob_fish_source_reward_dispensed"
 
 /// Called when you try to use fishing rod on anything
 #define COMSIG_PRE_FISHING "pre_fishing"
 
+/// Called when an ai-controlled mob interacts with the fishing spot
+#define COMSIG_NPC_FISHING "npc_fishing"
+	#define NPC_FISHING_SPOT 1
+
 /// Sent by the target of the fishing rod cast
 #define COMSIG_FISHING_ROD_CAST "fishing_rod_cast"
 	#define FISHING_ROD_CAST_HANDLED (1 << 0)
@@ -42,3 +46,9 @@
 
 /// From /obj/item/fish_analyzer/proc/analyze_status: (fish, user)
 #define COMSIG_FISH_ANALYZER_ANALYZE_STATUS "fish_analyzer_analyze_status"
+
+/// From /datum/component/fish_growth/on_fish_life: (seconds_per_tick)
+#define COMSIG_FISH_BEFORE_GROWING "fish_before_growing"
+	#define COMPONENT_DONT_GROW (1 << 0)
+/// From /datum/component/fish_growth/finish_growing: (result)
+#define COMSIG_FISH_FINISH_GROWING "fish_finish_growing"
diff --git a/code/__DEFINES/dcs/signals/signals_blackmarket.dm b/code/__DEFINES/dcs/signals/signals_market.dm
similarity index 100%
rename from code/__DEFINES/dcs/signals/signals_blackmarket.dm
rename to code/__DEFINES/dcs/signals/signals_market.dm
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
index 4c79c9ad8147d..285c0b0ac4e2a 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
@@ -223,11 +223,6 @@
 /// From /obj/effect/temp_visual/resonance/burst() : (mob/creator, mob/living/hit_living)
 #define COMSIG_LIVING_RESONATOR_BURST "living_resonator_burst"
 
-/// From /obj/projectile/attempt_parry() : (obj/projectile/parried_projectile)
-#define COMSIG_LIVING_PROJECTILE_PARRYING "living_projectile_parrying"
-	/// Return to allow the parry to happen
-	#define ALLOW_PARRY (1<<0)
-
 /// From /obj/projectile/on_parry() : (obj/projectile/parried_projectile)
 #define COMSIG_LIVING_PROJECTILE_PARRIED "living_projectile_parried"
 	/// Return to prevent the projectile from executing any code in on_parry()
@@ -277,6 +272,9 @@
 #define COMSIG_LIVING_GRAB "living_grab"
 	// Return COMPONENT_CANCEL_ATTACK_CHAIN / COMPONENT_SKIP_ATTACK_CHAIN to stop the grab
 
+///Called when living finish eat (/datum/component/edible/proc/On_Consume)
+#define COMSIG_LIVING_FINISH_EAT "living_finish_eat"
+
 /// From /datum/element/basic_eating/try_eating()
 #define COMSIG_MOB_PRE_EAT "mob_pre_eat"
 	///cancel eating attempt
@@ -291,3 +289,8 @@
 #define COMSIG_MOB_HAPPINESS_CHANGE "happiness_change"
 /// From /obj/item/melee/baton/baton_effect(): (datum/source, mob/living/user, /obj/item/melee/baton)
 #define COMSIG_MOB_BATONED "mob_batoned"
+
+/// Sent to the mob when their mind is slaved
+#define COMSIG_MOB_ENSLAVED_TO "mob_enslaved_to"
+/// From /obj/item/proc/attack_atom: (mob/living/attacker, atom/attacked)
+#define COMSIG_LIVING_ATTACK_ATOM "living_attack_atom"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
index 8be5b1fdb64aa..dfbfe68ad52cd 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
@@ -243,5 +243,8 @@
 /// from /mob/proc/slip(): (knockdown_amonut, obj/slipped_on, lube_flags [mobs.dm], paralyze, force_drop)
 #define COMSIG_MOB_SLIPPED "mob_slipped"
 
+/// From the base of /datum/component/callouts/proc/callout_picker(mob/user, atom/clicked_atom): (datum/callout_option/callout, atom/target)
+#define COMSIG_MOB_CREATED_CALLOUT "mob_created_callout"
+
 /// from /mob/proc/key_down(): (key, client/client, full_key)
 #define COMSIG_MOB_KEYDOWN "mob_key_down"
diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm
index d34de1e356792..45b671141a380 100644
--- a/code/__DEFINES/dcs/signals/signals_object.dm
+++ b/code/__DEFINES/dcs/signals/signals_object.dm
@@ -389,10 +389,16 @@
 ///sent to targets during the process_hit proc of projectiles
 #define COMSIG_PROJECTILE_PREHIT "com_proj_prehit"
 	#define PROJECTILE_INTERRUPT_HIT (1<<0)
+///from /obj/projectile/pixel_move(): ()
+#define COMSIG_PROJECTILE_PIXEL_STEP "projectile_pixel_step"
+///sent to self during the process_hit proc of projectiles
+#define COMSIG_PROJECTILE_SELF_PREHIT "com_proj_prehit"
 ///from the base of /obj/projectile/Range(): ()
 #define COMSIG_PROJECTILE_RANGE "projectile_range"
 ///from the base of /obj/projectile/on_range(): ()
 #define COMSIG_PROJECTILE_RANGE_OUT "projectile_range_out"
+///from the base of /obj/projectile/process(): ()
+#define COMSIG_PROJECTILE_BEFORE_MOVE "projectile_before_move"
 ///from [/obj/item/proc/tryEmbed] sent when trying to force an embed (mainly for projectiles and eating glass)
 #define COMSIG_EMBED_TRY_FORCE "item_try_embed"
 	#define COMPONENT_EMBED_SUCCESS (1<<1)
@@ -526,5 +532,5 @@
 
 /// Sent from /obj/item/update_weight_class(). (old_w_class, new_w_class)
 #define COMSIG_ITEM_WEIGHT_CLASS_CHANGED "item_weight_class_changed"
-/// Sent from /obj/item/update_weight_class(), to it's loc. (obj/item/changed_item, old_w_class, new_w_class)
+/// Sent from /obj/item/update_weight_class(), to its loc. (obj/item/changed_item, old_w_class, new_w_class)
 #define COMSIG_ATOM_CONTENTS_WEIGHT_CLASS_CHANGED "atom_contents_weight_class_changed"
diff --git a/code/__DEFINES/dcs/signals/signals_spell.dm b/code/__DEFINES/dcs/signals/signals_spell.dm
index 4502997438589..d9ef98527e25c 100644
--- a/code/__DEFINES/dcs/signals/signals_spell.dm
+++ b/code/__DEFINES/dcs/signals/signals_spell.dm
@@ -74,6 +74,10 @@
 #define COMSIG_MOB_EJECTED_FROM_JAUNT "spell_mob_eject_jaunt"
 /// Sent from datum/action/cooldown/spell/jaunt/exit_jaunt, after the mob exited jaunt: (datum/action/cooldown/spell/spell)
 #define COMSIG_MOB_AFTER_EXIT_JAUNT "spell_mob_after_exit_jaunt"
+/// Sent from /obj/effect/dummy/phased_mob/proc/phased_check when moving to the holder object: (/obj/effect/dummy/phased_mob, mob/living/phaser, turf/newloc)
+#define COMSIG_MOB_PHASED_CHECK "mob_phased_check"
+	/// Return this to cancel the phased move
+	#define COMPONENT_BLOCK_PHASED_MOVE (1 << 0)
 
 /// Sent from/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/try_enter_jaunt,
 /// to any unconscious / critical mobs being dragged when the jaunter enters blood:
diff --git a/code/__DEFINES/dcs/signals/signals_voidwalker.dm b/code/__DEFINES/dcs/signals/signals_voidwalker.dm
new file mode 100644
index 0000000000000..013e6173d867c
--- /dev/null
+++ b/code/__DEFINES/dcs/signals/signals_voidwalker.dm
@@ -0,0 +1,2 @@
+/// Called from /datum/component/space_kidnap/succesful_kidnap() : (mob/living/carbon/human/voidwalker, mob/living/carbon/human/victim)
+#define COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP "voidwalker_succesful_kidnap"
diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm
index 36903049e895b..3671ff3d8cdc6 100644
--- a/code/__DEFINES/fish.dm
+++ b/code/__DEFINES/fish.dm
@@ -161,3 +161,6 @@
 #define FISH_BEAUTY_GOOD 450
 #define FISH_BEAUTY_GREAT 600
 #define FISH_BEAUTY_EXCELLENT 700
+
+//Fish breeding stops if fish count exceeds this.
+#define AQUARIUM_MAX_BREEDING_POPULATION 20
diff --git a/code/__DEFINES/interaction_flags.dm b/code/__DEFINES/interaction_flags.dm
index 615fe5c4cbda2..fd66cee5bb93e 100644
--- a/code/__DEFINES/interaction_flags.dm
+++ b/code/__DEFINES/interaction_flags.dm
@@ -26,6 +26,8 @@
 #define INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY (1<<12)
 /// Bypass all adjacency and other checks for mouse drop
 #define INTERACT_ATOM_MOUSEDROP_IGNORE_CHECKS (INTERACT_ATOM_MOUSEDROP_IGNORE_ADJACENT | INTERACT_ATOM_MOUSEDROP_IGNORE_USABILITY)
+/// calls try_interact() on attack_paw() and returns that.
+#define INTERACT_ATOM_ATTACK_PAW (1<<13)
 
 /// attempt pickup on attack_hand for items
 #define INTERACT_ITEM_ATTACK_HAND_PICKUP (1<<0)
diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index 6d96f895eb588..aaf1a22b41239 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -106,6 +106,8 @@ DEFINE_BITFIELD(no_equip_flags, list(
 #define HIDESNOUT (1<<12)
 ///hides mutant/moth wings, does not apply to functional wings
 #define HIDEMUTWINGS (1<<13)
+///hides belts and riggings
+#define HIDEBELT (1<<14)
 
 //bitflags for clothing coverage - also used for limbs
 #define HEAD (1<<0)
diff --git a/code/__DEFINES/lazy_templates.dm b/code/__DEFINES/lazy_templates.dm
index 8a469af4deeda..1e8dca9a7a110 100644
--- a/code/__DEFINES/lazy_templates.dm
+++ b/code/__DEFINES/lazy_templates.dm
@@ -3,6 +3,7 @@
 #define LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY "LT_NINJAHOLDING"
 #define LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS "LT_ABDUCTORSHIPS"
 #define LAZY_TEMPLATE_KEY_HERETIC_SACRIFICE "LT_HERETICSACRIFICE"
+#define LAZY_TEMPLATE_KEY_VOIDWALKER_VOID "LT_VOIDWALKERVOID"
 
 #define LAZY_TEMPLATE_KEY_LIST_ALL(...) list( \
 	"Nukie Base" = LAZY_TEMPLATE_KEY_NUKIEBASE, \
@@ -10,4 +11,5 @@
 	"Ninja Holding" = LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY, \
 	"Abductor Ships" = LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS, \
 	"Heretic Sacrifice Level" = LAZY_TEMPLATE_KEY_HERETIC_SACRIFICE, \
+	"Voidwalker Void" = LAZY_TEMPLATE_KEY_VOIDWALKER_VOID, \
 )
diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm
index 2c63f2568dcf3..d7245d8b6f362 100644
--- a/code/__DEFINES/machines.dm
+++ b/code/__DEFINES/machines.dm
@@ -33,7 +33,7 @@
 #define BASE_MACHINE_ACTIVE_CONSUMPTION (BASE_MACHINE_IDLE_CONSUMPTION * 10)
 
 /// Bitflags for a machine's preferences on when it should start processing. For use with machinery's `processing_flags` var.
-#define START_PROCESSING_ON_INIT (1<<0) /// Indicates the machine will automatically start processing right after it's `Initialize()` is ran.
+#define START_PROCESSING_ON_INIT (1<<0) /// Indicates the machine will automatically start processing right after its `Initialize()` is ran.
 #define START_PROCESSING_MANUALLY (1<<1) /// Machines with this flag will not start processing when it's spawned. Use this if you want to manually control when a machine starts processing.
 
 //bitflags for door switches.
diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm
index c76ba60911355..3c87195e99076 100644
--- a/code/__DEFINES/maps.dm
+++ b/code/__DEFINES/maps.dm
@@ -222,3 +222,13 @@ Always compile, always use that verb, and always make sure that it works for wha
 
 /// Checks the job changes in the map config for the passed change key.
 #define CHECK_MAP_JOB_CHANGE(job, change) SSmapping.config.job_changes?[job]?[change]
+
+///Identifiers for away mission spawnpoints
+#define AWAYSTART_BEACH "AWAYSTART_BEACH"
+#define AWAYSTART_MUSEUM "AWAYSTART_MUSEUM"
+#define AWAYSTART_RESEARCH "AWAYSTART_RESEARCH"
+#define AWAYSTART_CAVES "AWAYSTART_CAVES"
+#define AWAYSTART_MOONOUTPOST "AWAYSTART_MOONOUTPOST"
+#define AWAYSTART_SNOWCABIN "AWAYSTART_SNOWCABIN"
+#define AWAYSTART_SNOWDIN "AWAYSTART_SNOWDIN"
+#define AWAYSTART_UNDERGROUND "AWAYSTART_UNDERGROUND"
diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/market.dm
similarity index 100%
rename from code/__DEFINES/blackmarket.dm
rename to code/__DEFINES/market.dm
diff --git a/code/__DEFINES/mining.dm b/code/__DEFINES/mining.dm
index 4b233a5d4f171..d0fa97062b1a2 100644
--- a/code/__DEFINES/mining.dm
+++ b/code/__DEFINES/mining.dm
@@ -5,10 +5,11 @@
 #define BOULDER_SIZE_MEDIUM 10
 /// Durability of a small size boulder from a small size vent.
 #define BOULDER_SIZE_SMALL 5
-/// How many boulders can a single ore vent have on it's tile before it stops producing more?
+/// How many boulders can a single ore vent have on its tile before it stops producing more?
 #define MAX_BOULDERS_PER_VENT 10
 /// Time multiplier
 #define INATE_BOULDER_SPEED_MULTIPLIER 3
+
 // Vent type
 /// Large vents, giving large boulders.
 #define LARGE_VENT_TYPE "large"
@@ -17,6 +18,14 @@
 /// Small vents, giving small boulders.
 #define SMALL_VENT_TYPE "small"
 
+// Timers for the ore vents to perform wave defense.
+/// Duration for wave defense for a small vent.
+#define WAVE_DURATION_SMALL 60 SECONDS
+/// Duration for wave defense for a medium vent.
+#define WAVE_DURATION_MEDIUM 90 SECONDS
+/// Duration for wave defense for a large vent.
+#define WAVE_DURATION_LARGE 150 SECONDS
+
 /// Proximity to a vent that a wall ore needs to be for 5 ore to be mined.
 #define VENT_PROX_VERY_HIGH 3
 /// Proximity to a vent that a wall ore needs to be for 4 ore to be mined.
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index f690304fd5f0c..b722c1a96155b 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -10,6 +10,8 @@
 #define MOVE_INTENT_WALK "walk"
 #define MOVE_INTENT_RUN "run"
 
+/// Amount of oxyloss that KOs a human
+#define OXYLOSS_PASSOUT_THRESHOLD 50
 //Blood levels
 #define BLOOD_VOLUME_MAX_LETHAL 2150
 #define BLOOD_VOLUME_EXCESS 2100
@@ -130,6 +132,7 @@
 #define SPECIES_ZOMBIE "zombie"
 #define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
 #define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
+#define SPECIES_VOIDWALKER "voidwalker"
 
 // Like species IDs, but not specifically attached a species.
 #define BODYPART_ID_ALIEN "alien"
@@ -466,6 +469,9 @@
 #define ROBOTIC_BRUTE_EXAMINE_TEXT "denting"
 #define ROBOTIC_BURN_EXAMINE_TEXT "charring"
 
+#define GLASSY_BRUTE_EXAMINE_TEXT "cracking"
+#define GLASSY_BURN_EXAMINE_TEXT "deformation"
+
 #define GRAB_PIXEL_SHIFT_PASSIVE 6
 #define GRAB_PIXEL_SHIFT_AGGRESSIVE 12
 #define GRAB_PIXEL_SHIFT_NECK 16
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 6f8fa60d48ae1..5997015d85c8a 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -74,7 +74,7 @@
 #define EXP_TYPE_ADMIN "Admin"
 
 //Flags in the players table in the db
-#define DB_FLAG_EXEMPT 1
+#define DB_FLAG_EXEMPT (1<<0)
 
 #define DEFAULT_CYBORG_NAME "Default Cyborg Name"
 
diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm
index ed4c66b799c59..28b7b6f3d1be5 100644
--- a/code/__DEFINES/projectiles.dm
+++ b/code/__DEFINES/projectiles.dm
@@ -14,8 +14,10 @@
 #define CALIBER_A7MM "a7mm"
 /// The caliber used by the [security auto-rifle][/obj/item/gun/ballistic/automatic/wt550].
 #define CALIBER_46X30MM "4.6x30mm"
-/// The caliber used by the Nanotrasen Saber SMG, PP-95 SMG and Type U3 Uzi. Also used as the default caliber for pistols but only the stechkin APS machine pistol doesn't override it.
+/// The caliber used by the Nanotrasen Saber SMG and Type U3 Uzi. Also used as the default caliber for pistols but only the stechkin APS machine pistol doesn't override it.
 #define CALIBER_9MM "9mm"
+/// The caliber used by smart SMG ammunition
+#define CALIBER_160SMART ".160 Smart"
 /// The caliber used as the default for ballistic guns. Only not overridden for the [surplus rifle][/obj/item/gun/ballistic/automatic/surplus].
 #define CALIBER_10MM "10mm"
 /// The caliber used by most revolver variants.
diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm
index a758aa4170c73..314d8f5ecf2ee 100644
--- a/code/__DEFINES/reagents.dm
+++ b/code/__DEFINES/reagents.dm
@@ -127,7 +127,7 @@
 #define REACTION_COMPETITIVE (1<<5)
 ///Used to force pH changes to be constant regardless of volume
 #define REACTION_PH_VOL_CONSTANT (1<<6)
-///If a reaction will generate it's impure/inverse reagents in the middle of a reaction, as apposed to being determined on ingestion/on reaction completion
+///If a reaction will generate its impure/inverse reagents in the middle of a reaction, as apposed to being determined on ingestion/on reaction completion
 #define REACTION_REAL_TIME_SPLIT (1<<7)
 
 ///Used for overheat_temp - This sets the overheat so high it effectively has no overheat temperature.
@@ -161,7 +161,7 @@
 #define REACTION_TAG_HEALING (1<<4)
 /// This reagent primarily damages
 #define REACTION_TAG_DAMAGING (1<<5)
-/// This reagent explodes as a part of it's intended effect (i.e. not overheated/impure)
+/// This reagent explodes as a part of its intended effect (i.e. not overheated/impure)
 #define REACTION_TAG_EXPLOSIVE (1<<6)
 /// This reagent does things that are unique and special
 #define REACTION_TAG_OTHER (1<<7)
diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm
index 123fd4814356f..a2af6533334e9 100644
--- a/code/__DEFINES/robots.dm
+++ b/code/__DEFINES/robots.dm
@@ -176,17 +176,17 @@ DEFINE_BITFIELD(bot_cover_flags, list(
 /// Medibots - Healing people
 #define BOT_HEALING "Healing"
 /// MULEbot - Moving to deliver
-#define BOT_DELIVER "Navigating to Delivery Location"
+#define BOT_DELIVER "Delivering"
 /// MULEbot - Returning to home
-#define BOT_GO_HOME "Proceeding to work site"
+#define BOT_GO_HOME "Returning"
 /// MULEbot - Blocked
-#define BOT_BLOCKED "No Route"
+#define BOT_BLOCKED "Blocked"
 /// MULEbot - Computing navigation
-#define BOT_NAV "Unable to reach destination"
+#define BOT_NAV "Unreachable"
 /// MULEbot - Waiting for nav computation
-#define BOT_WAIT_FOR_NAV "Calculating navigation path"
+#define BOT_WAIT_FOR_NAV "Calculating"
 /// MULEbot - No destination beacon found (or no route)
-#define BOT_NO_ROUTE "Navigating to Home"
+#define BOT_NO_ROUTE "Returning Home"
 
 //Secbot and ED209 judgement criteria bitflag values
 #define JUDGE_EMAGGED (1<<0)
@@ -257,7 +257,18 @@ DEFINE_BITFIELD(firebot_mode_flags, list(
 	"FIREBOT_EXTINGUISH_FLAMES" = FIREBOT_EXTINGUISH_FLAMES,
 ))
 
-
+///auto return to home after delivery
+#define MULEBOT_RETURN_MODE (1<<0)
+///autopickups at beacons
+#define MULEBOT_AUTO_PICKUP_MODE (1<<1)
+///announce every delivery we make
+#define MULEBOT_REPORT_DELIVERY_MODE (1<<2)
+
+DEFINE_BITFIELD(mulebot_delivery_flags, list(
+	"MULEBOT_RETURN_MODE" = MULEBOT_RETURN_MODE,
+	"MULEBOT_AUTO_PICKUP_MODE" = MULEBOT_AUTO_PICKUP_MODE,
+	"MULEBOT_REPORT_DELIVERY_MODE" = MULEBOT_REPORT_DELIVERY_MODE,
+))
 
 //cleanBOT defines on what to clean
 #define CLEANBOT_CLEAN_BLOOD (1<<0)
diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index 88e64164acd4b..bc8987b4539d5 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -37,6 +37,7 @@
 #define ROLE_SPACE_DRAGON "Space Dragon"
 #define ROLE_SPIDER "Spider"
 #define ROLE_WIZARD_MIDROUND "Wizard (Midround)"
+#define ROLE_VOIDWALKER "Voidwalker"
 
 // Latejoin roles
 #define ROLE_HERETIC_SMUGGLER "Heretic Smuggler"
@@ -153,6 +154,7 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_SPACE_DRAGON = 0,
 	ROLE_SPIDER = 0,
 	ROLE_WIZARD_MIDROUND = 14,
+	ROLE_VOIDWALKER = 0,
 
 	// Latejoin
 	ROLE_HERETIC_SMUGGLER = 0,
diff --git a/code/__DEFINES/roundend.dm b/code/__DEFINES/roundend.dm
index a210d034015dc..d25204336444f 100644
--- a/code/__DEFINES/roundend.dm
+++ b/code/__DEFINES/roundend.dm
@@ -31,7 +31,7 @@
 #define REVS_LOSE 18
 /// The wizard was killed by the crew
 #define WIZARD_KILLED 19
-/// The station was destroyed by it's own self-destruct nuclear device
+/// The station was destroyed by its own self-destruct nuclear device
 #define STATION_NUKED 20
 /// The station was destroyed by the supermatter cascade
 #define SUPERMATTER_CASCADE 21
diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm
index 5db7227521a3f..eacdd868a9556 100644
--- a/code/__DEFINES/say.dm
+++ b/code/__DEFINES/say.dm
@@ -76,7 +76,7 @@
 #define SPAN_SINGING "singing"
 #define SPAN_TAPE_RECORDER "tape_recorder"
 #define SPAN_SMALL_VOICE "small"
-
+#define SPAN_SOAPBOX "soapbox"
 //bitflag #defines for return value of the radio() proc.
 /// Makes the message use italics
 #define ITALICS (1<<0)
diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
index 0447e87f532fe..fadd00053156d 100644
--- a/code/__DEFINES/span.dm
+++ b/code/__DEFINES/span.dm
@@ -120,6 +120,7 @@
 #define span_small(str) ("<span class='small'>" + str + "</span>")
 #define span_smallnotice(str) ("<span class='smallnotice'>" + str + "</span>")
 #define span_smallnoticeital(str) ("<span class='smallnoticeital'>" + str + "</span>")
+#define span_soapbox(str) ("<span class='soapbox'>" + str + "</span>")
 #define span_spiderbroodmother(str) ("<span class='spiderbroodmother'>" + str + "</span>")
 #define span_spiderscout(str) ("<span class='spiderscout'>" + str + "</span>")
 #define span_spiderbreacher(str) ("<span class='spiderbreacher'>" + str + "</span>")
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 8d460c3aecb6f..e24ea5e862e4d 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -155,6 +155,7 @@
 #define INIT_ORDER_AI_CONTROLLERS 55 //So the controller can get the ref
 #define INIT_ORDER_TICKER 55
 #define INIT_ORDER_TCG 55
+#define INIT_ORDER_AUTOMAPPER 51 // BANDASTATION EDIT ADDITION
 #define INIT_ORDER_MAPPING 50
 #define INIT_ORDER_EARLY_ASSETS 48
 #define INIT_ORDER_RESEARCH 47
@@ -298,9 +299,14 @@
 #define SSEXPLOSIONS_THROWS 3
 
 // Machines subsystem subtasks.
-#define SSMACHINES_APCS_EARLY 1
-#define SSMACHINES_MACHINES 2
-#define SSMACHINES_APCS_LATE 3
+#define SSMACHINES_MACHINES_EARLY 1
+#define SSMACHINES_APCS_EARLY 2
+#define SSMACHINES_APCS_ENVIRONMENT 3
+#define SSMACHINES_APCS_LIGHTS 4
+#define SSMACHINES_APCS_EQUIPMENT 5
+#define SSMACHINES_APCS_LATE 6
+#define SSMACHINES_MACHINES 7
+#define SSMACHINES_MACHINES_LATE 8
 
 // Wardrobe subsystem tasks
 #define SSWARDROBE_STOCK 1
diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm
index e2c89df90e9bf..17464b44dae81 100644
--- a/code/__DEFINES/tgs.dm
+++ b/code/__DEFINES/tgs.dm
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "7.1.2"
+#define TGS_DMAPI_VERSION "7.1.3"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index 1c03ecac2ee16..294d32ddc3b0f 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -72,7 +72,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 // Trait added to the user of a hippocratic oath status effect
 #define TRAIT_HIPPOCRATIC_OATH "hippocratic_oath"
 #define TRAIT_IGNORESLOWDOWN "ignoreslow"
-#define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
 /// Makes it so the mob can use guns regardless of tool user status
 #define TRAIT_GUN_NATURAL "gunnatural"
 /// Causes death-like unconsciousness
@@ -138,6 +137,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Prevents plasmamen from self-igniting if only their helmet is missing
 #define TRAIT_NOSELFIGNITION_HEAD_ONLY "no_selfignition_head_only"
 #define TRAIT_NOGUNS "no_guns"
+///Can toss a guns like a badass, causing additional damage/effect to their enemies
+#define TRAIT_TOSS_GUN_HARD "toss_gun_hard"
 /// Species with this trait are genderless
 #define TRAIT_AGENDER "agender"
 /// Species with this trait have a blood clan mechanic
@@ -224,6 +225,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_REVEAL_FISH "reveal_fish"
 ///This trait gets you a list of fishes that can be caught when examining a fishing spot.
 #define TRAIT_EXAMINE_FISHING_SPOT "examine_fishing_spot"
+///lobstrosities and carps will prioritize/flee from those that have this trait (given by the skill-locked hat)
+#define TRAIT_SCARY_FISHERMAN "scary_fisherman"
 ///Trait given to turfs or objects that can be fished from
 #define TRAIT_FISHING_SPOT "fishing_spot"
 ///Trait given to mobs that can fish without a rod
@@ -232,6 +235,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_EXAMINE_FITNESS "reveal_power_level"
 /// These mobs have particularly hygienic tongues
 #define TRAIT_WOUND_LICKER "wound_licker"
+/// Mobs with this trait are allowed to use silicon emotes
+#define TRAIT_SILICON_EMOTES_ALLOWED "silicon_emotes_allowed"
 
 /// This trait designate that the mob was originally a monkey
 #define TRAIT_BORN_MONKEY "born_as_a_monkey"
@@ -333,6 +338,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_SECURITY_HUD "sec_hud"
 /// for something granting you a diagnostic hud
 #define TRAIT_DIAGNOSTIC_HUD "diag_hud"
+#define TRAIT_BOT_PATH_HUD "bot_path_hud"
 /// Is a medbot healing you
 #define TRAIT_MEDIBOTCOMINGTHROUGH "medbot"
 #define TRAIT_PASSTABLE "passtable"
@@ -698,6 +704,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_HONKSPAMMING "trait_honkspamming"
 /// Required by the waddling element since there are multiple sources of it.
 #define TRAIT_WADDLING "trait_waddling"
+/// Required by the on_hit_effect element, which is in turn added by other elements.
+#define TRAIT_ON_HIT_EFFECT "trait_on_hit_effect"
 
 ///Used for managing KEEP_TOGETHER in [/atom/var/appearance_flags]
 #define TRAIT_KEEP_TOGETHER "keep-together"
@@ -741,6 +749,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_GREAT_QUALITY_BAIT "great_quality_bait"
 /// Baits with this trait will ignore bait preferences and related fish traits.
 #define TRAIT_OMNI_BAIT "omni_bait"
+/// The bait won't be consumed when used
+#define TRAIT_BAIT_UNCONSUMABLE "bait_unconsumabe"
 /// Plants that were mutated as a result of passive instability, not a mutation threshold.
 #define TRAIT_PLANT_WILDMUTATE "wildmutation"
 /// If you hit an APC with exposed internals with this item it will try to shock you
@@ -767,7 +777,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_DANGEROUS_OBJECT "dangerous_object"
 /// determines whether or not objects are haunted and teleport/attack randomly
 #define TRAIT_HAUNTED "haunted"
-/// An item that, if it has contents, will ignore it's contents when scanning for contraband.
+/// An item that, if it has contents, will ignore its contents when scanning for contraband.
 #define TRAIT_CONTRABAND_BLOCKER "contraband_blocker"
 
 //quirk traits
@@ -970,9 +980,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 
 /// changelings with this trait can no longer talk over the hivemind
 #define TRAIT_CHANGELING_HIVEMIND_MUTE "ling_mute"
+/// This guy is a hulk! (Bulky and green, lacks tact)
 #define TRAIT_HULK "hulk"
 /// Isn't attacked harmfully by blob structures
 #define TRAIT_BLOB_ALLY "blob_ally"
+/// Has the chuuni component
+#define TRAIT_CHUUNIBYOU "chuunibyou"
+/// Has splattercasting
+#define TRAIT_SPLATTERCASTER "splattercaster"
 
 ///Traits given by station traits
 #define STATION_TRAIT_ASSISTANT_GIMMICKS "station_trait_assistant_gimmicks"
@@ -1112,6 +1127,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///Trait given to limb by /mob/living/basic/living_limb_flesh
 #define TRAIT_IGNORED_BY_LIVING_FLESH "livingflesh_ignored"
 
+///Trait given to organs that have been inside a living being previously
+#define TRAIT_USED_ORGAN "used_organ"
+
 /// Trait given while using /datum/action/cooldown/mob_cooldown/wing_buffet
 #define TRAIT_WING_BUFFET "wing_buffet"
 /// Trait given while tired after using /datum/action/cooldown/mob_cooldown/wing_buffet
@@ -1119,8 +1137,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait given to a dragon who fails to defend their rifts
 #define TRAIT_RIFT_FAILURE "fail_dragon_loser"
 
-///this mob is able to relay happiness, given by /datum/component/happiness
-#define TRAIT_MOB_RELAY_HAPPINESS "mob_relay_happiness"
+///this trait hides most visible fluff and interactions of happiness, likely temporarily.
+#define TRAIT_MOB_HIDE_HAPPINESS "mob_hide_happiness"
 ///trait determines if this mob can breed given by /datum/component/breeding
 #define TRAIT_MOB_BREEDER "mob_breeder"
 ///trait given to mobs that are hatched
@@ -1171,6 +1189,11 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 /// Trait given to anything linked to, not necessarily allied to, the mansus
 #define TRAIT_MANSUS_TOUCHED "mansus_touched"
 
+/// Appiled when wizard buy (/datum/spellbook_entry/perks/spalls_lottery) perk.
+/// Give 50/25% chance not spend a spellbook charge on 1/2 cost spell.
+/// Appiled it wizard can't refund any spells.
+#define TRAIT_SPELLS_LOTTERY "spell_for_sale"
+
 /// Trait given to mobs wearing the clown mask
 #define TRAIT_PERCEIVED_AS_CLOWN "perceived_as_clown"
 /// Does this item bypass ranged armor checks?
@@ -1198,5 +1221,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///Trait given to a turf that should not be allowed to be terraformed, such as turfs holding ore vents.
 #define TRAIT_NO_TERRAFORM "no_terraform"
 
+///Mobs with these trait do not get italicized/quiet speech when speaking in low pressure
+#define TRAIT_SPEECH_BOOSTER "speech_booster"
+
+/// Given to a mob that can throw to make them not able to throw
+#define TRAIT_NO_THROWING "no_throwing"
+
+///Trait which allows mobs to parry mining mob projectiles
+#define TRAIT_MINING_PARRYING "mining_parrying"
 
 // END TRAIT DEFINES
diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
index 759101dc2abd5..f11cc50dbbd58 100644
--- a/code/__DEFINES/traits/sources.dm
+++ b/code/__DEFINES/traits/sources.dm
@@ -225,8 +225,6 @@
 #define SPEED_TRAIT "speed_trait"
 /// Trait given to mobs that have been autopsied
 #define AUTOPSY_TRAIT "autopsy_trait"
-/// Trait given by [/datum/status_effect/blessing_of_insanity]
-#define MAD_WIZARD_TRAIT "mad_wizard_trait"
 
 ///From the market_crash event
 #define MARKET_CRASH_EVENT_TRAIT "crashed_market_event"
@@ -294,3 +292,6 @@
 
 /// Trait when a drink was renamed by a shaker
 #define SHAKER_LABEL_TRAIT "shaker_trait"
+
+/// Trait added by style component
+#define STYLE_TRAIT "style"
diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm
index 545767289e0b5..47a1a5a9a5924 100644
--- a/code/__DEFINES/turfs.dm
+++ b/code/__DEFINES/turfs.dm
@@ -116,3 +116,10 @@
 #define LARGE_TURF_SMOOTHING_X_OFFSET -9
 /// Defines the y offset to apply to larger smoothing turfs (such as grass).
 #define LARGE_TURF_SMOOTHING_Y_OFFSET -9
+
+/// Defines a consistent light power for our various basalt turfs
+#define BASALT_LIGHT_POWER 0.6
+/// Defines a consistent light range for basalt turfs that have a bigger area of lava
+#define BASALT_LIGHT_RANGE_BRIGHT 2
+/// Defines a consistent light range for basalt turfs that have a smaller area of lava
+#define BASALT_LIGHT_RANGE_DIM 1.4
diff --git a/code/__DEFINES/uplink.dm b/code/__DEFINES/uplink.dm
index 67df6fc0e6295..cdfdf4680f792 100644
--- a/code/__DEFINES/uplink.dm
+++ b/code/__DEFINES/uplink.dm
@@ -42,3 +42,6 @@
 #define SPY_LOWER_COST_THRESHOLD 5
 /// Upper threshold for which an uplink items's TC cost is considered "high" for spy bounties picking rewards
 #define SPY_UPPER_COST_THRESHOLD 12
+
+/// Minimal cost for an item to be eligible for a discount
+#define TRAITOR_DISCOUNT_MIN_PRICE 4
diff --git a/code/__HELPERS/_auxtools_api.dm b/code/__HELPERS/_auxtools_api.dm
index 0117ded4c5195..a907be8ecf8fb 100644
--- a/code/__HELPERS/_auxtools_api.dm
+++ b/code/__HELPERS/_auxtools_api.dm
@@ -1,38 +1,3 @@
-#define AUXTOOLS_FULL_INIT 2
-#define AUXTOOLS_PARTIAL_INIT 1
-
-GLOBAL_LIST_EMPTY(auxtools_initialized)
-GLOBAL_PROTECT(auxtools_initialized)
-
-#define AUXTOOLS_CHECK(LIB)\
-	if (!CONFIG_GET(flag/auxtools_enabled)) {\
-		CRASH("Auxtools is not enabled in config!");\
-	}\
-	if (GLOB.auxtools_initialized[LIB] != AUXTOOLS_FULL_INIT) {\
-		if (fexists(LIB)) {\
-			var/string = call_ext(LIB,"auxtools_init")();\
-			if(findtext(string, "SUCCESS")) {\
-				GLOB.auxtools_initialized[LIB] = AUXTOOLS_FULL_INIT;\
-			} else {\
-				CRASH(string);\
-			}\
-		} else {\
-			CRASH("No file named [LIB] found!")\
-		}\
-	}\
-
-#define AUXTOOLS_SHUTDOWN(LIB)\
-	if (GLOB.auxtools_initialized[LIB] == AUXTOOLS_FULL_INIT && fexists(LIB)){\
-		call_ext(LIB,"auxtools_shutdown")();\
-		GLOB.auxtools_initialized[LIB] = AUXTOOLS_PARTIAL_INIT;\
-	}\
-
-#define AUXTOOLS_FULL_SHUTDOWN(LIB)\
-	if (GLOB.auxtools_initialized[LIB] && fexists(LIB)){\
-		call_ext(LIB,"auxtools_full_shutdown")();\
-		GLOB.auxtools_initialized[LIB] = FALSE;\
-	}
-
 /proc/auxtools_stack_trace(msg)
 	CRASH(msg)
 
diff --git a/code/__HELPERS/_dreamluau.dm b/code/__HELPERS/_dreamluau.dm
new file mode 100644
index 0000000000000..76d38effd19a2
--- /dev/null
+++ b/code/__HELPERS/_dreamluau.dm
@@ -0,0 +1,295 @@
+#define DREAMLUAU (world.system_type == MS_WINDOWS ? "dreamluau.dll" : "libdreamluau.so")
+
+#define DREAMLUAU_CALL(func) call_ext(DREAMLUAU, "byond:[#func]")
+
+/**
+ * All of the following functions will return a string if the underlying rust code returns an error or a wrapped panic.
+ * The return values specified for each function are what they will return if successful.
+ */
+
+/**
+ * As of 515.1631, byondapi does not provide direct access to `usr`.
+ * Use this function to pass `usr` into the dreamluau binary so that luau scripts can retrieve it.
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_USR DREAMLUAU_CALL(set_usr)(usr)
+
+
+/**
+ * Sets the execution limit, in milliseconds.
+ *
+ * @param limit the new execution limit
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_EXECUTION_LIMIT_MILLIS(limit) DREAMLUAU_CALL(set_execution_limit_millis)((limit))
+
+/**
+ * Sets the execution limit, in seconds.
+ *
+ * @param limit the new execution limit
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_EXECUTION_LIMIT_SECS(limit) DREAMLUAU_CALL(set_execution_limit_secs)((limit))
+
+/**
+ * Clears the execution limit, allowing scripts to run as long as they need to.
+ *
+ * WARNING: This allows infinite loops to block Dream Daemon indefinitely, with no safety checks.
+ * Do not use this if you have no reason for scripts to run arbitrarily long.
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_CLEAR_EXECUTION_LIMIT DREAMLUAU_CALL(clear_execution_limit)
+
+//Wrapper setters/clearers
+
+/**
+ * Set the wrapper for instancing new datums with `dm.new`.
+ * Clears it if the argument is null.
+ * If unset, the object will be instantiated using the default `new` instruction.
+ *
+ * The wrapper must be a proc with the signature `(type as path, list/arguments)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_NEW_WRAPPER(wrapper) DREAMLUAU_CALL(set_new_wrapper)((wrapper))
+
+/**
+ * Set the wrapper for reading the vars of an object.
+ * Clears it if the argument is null.
+ * If unset, the var will be read directly, without any safety checks.
+ *
+ * The wrapper must be a proc with the signature `(target, var)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_VAR_GET_WRAPPER(wrapper) DREAMLUAU_CALL(set_var_get_wrapper)((wrapper))
+
+/**
+ * Set the wrapper for writing the vars of an object.
+ * Clears it if the argument is null.
+ * If unset, the var will be modified directly, without any safety checks.
+ *
+ * The wrapper must be a proc with the signature `(target, var, value)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_VAR_SET_WRAPPER(wrapper) DREAMLUAU_CALL(set_var_set_wrapper)((wrapper))
+
+/**
+ * Set the wrapper for calling a proc on an object.
+ * Clears it if the argument is null.
+ * If unset, the proc will be called directly, without any safety checks.
+ *
+ * The wrapper must be a proc with the signature `(target, procname as text, list/arguments)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_OBJECT_CALL_WRAPPER(wrapper) DREAMLUAU_CALL(set_object_call_wrapper)((wrapper))
+
+/**
+ * Set the wrapper for calling a global proc.
+ * Clears it if the argument is null.
+ * If unset, the proc will be called directly, without any safety checks.
+ *
+ * The wrapper must be a proc with the signature `(procname as text, list/arguments)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_GLOBAL_CALL_WRAPPER(wrapper) DREAMLUAU_CALL(set_global_call_wrapper)((wrapper))
+
+/**
+ * Set the wrapper for printing with the `print` function.
+ * Clears it if the argument is null.
+ * If unset, `print` will raise an error.
+ *
+ * The wrapper must be a proc with the signature `(list/arguments)`.
+ *
+ * @param wrapper the path to the proc to use as the new wrapper
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_SET_PRINT_WRAPPER(wrapper) DREAMLUAU_CALL(set_print_wrapper)((wrapper))
+
+
+
+/**
+ * Create a new luau state.
+ *
+ * @return a handle to the created state.
+ */
+#define DREAMLUAU_NEW_STATE DREAMLUAU_CALL(new_state)
+
+/**
+ * Some of the following functions return values that cannot be cleanly converted from luau to DM.
+ * To account for this, these functions also return a list of variant specifiers, equivalent to
+ * an array of objects of the type described beloe:
+ * ```
+ * type Variants = {
+ *     key?: "error"|Array<Variants?>
+ *     value?: "error"|Array<Variants?>
+ * }
+ * ```
+ */
+
+/**
+ * The following 4 functions execute luau code and return
+ * an associative list containing information about the result.
+ * This list has the following params.
+ *
+ * - "status": either "finished", "sleep", "yield", or "error"
+ * - "return_values": if "status" is "finished" or "yield", contains a list of the return values
+ * - "variants": a list of variant specifiers for the "return_values" param
+ * - "message": if "status" is "error", contains the error message
+ * - "name": the name of the executed code, according to the `what` field of `debug.getinfo`
+ */
+
+/**
+ * Load and execute a luau script.
+ *
+ * @param state the handle to the state
+ * @param code the source code of the script to run
+ * @param name an optional name to give to the script, for debugging purposes
+ *
+ * @return an associative list containing result information as specified above
+ */
+#define DREAMLUAU_LOAD DREAMLUAU_CALL(load)
+
+/**
+ * Awaken the thread at the front of the specified state's sleeping thread queue.
+ *
+ * @param state the handle to the state
+ *
+ * @return an associative list containing result information as specified above
+ */
+#define DREAMLUAU_AWAKEN(state) DREAMLUAU_CALL(awaken)((state))
+
+/**
+ * Resume one of the state's yielded threads.
+ *
+ * @param state the handle to the state
+ * @param index the index of the thread in the state's yielded threads list
+ * @param ...arguments arguments that will be returned by the `coroutine.yield` that yielded the thread
+ *
+ * @return an associative list containing result information as specified above
+ */
+#define DREAMLUAU_RESUME DREAMLUAU_CALL(resume)
+
+/**
+ * Call a function accessible from the global table.
+ *
+ * @param state the handle to the state
+ * @param function a list of nested indices from the global table to the specified function
+ * @param ...arguments arguments to pass to the function
+ *
+ * @return an associative list containing result information as specified above
+ */
+#define DREAMLUAU_CALL_FUNCTION DREAMLUAU_CALL(call_function)
+
+// State information collection functions
+
+/**
+ * Obtain a copy of the state's global table, converted to DM.
+ *
+ * @param state the handle to the state
+ *
+ * @return an associative list with the follwing entries:
+ * - "values": The actual values of the global table
+ * - "variants": Variant specifiers for "values"
+ */
+#define DREAMLUAU_GET_GLOBALS(state) DREAMLUAU_CALL(get_globals)((state))
+
+/**
+ * List the names of all sleeping or yielded threads for the state.
+ *
+ * @param state the handle to the state
+ *
+ * @return an associative list with the following entries:
+ *  - "sleeps": A list of sleeping threads
+ *  - "yields": A list of yielded threads
+ */
+#define DREAMLUAU_LIST_THREADS(state) DREAMLUAU_CALL(list_threads)((state))
+
+// Cleanup functions
+
+/**
+ * Run garbage collection on the state.
+ *
+ * This may be necessary to prevent hanging references, as some
+ * hard references may persist in unreachable luau objects that
+ * would be collected after a garbage collection cycle or two.
+ *
+ * @param state the handle to the state
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_COLLECT_GARBAGE(state) DREAMLUAU_CALL(collect_garbage)((state))
+
+/**
+ * Remove a sleeping thread from the sleep queue, without executing it.
+ *
+ * @param state the handle to the state
+ * @param thread the index in the sleep queue to the target thread
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_KILL_SLEEPING_THREAD(state, thread) DREAMLUAU_CALL(kill_sleeping_thread)((state), (thread))
+
+/**
+ * Remove a yielded thread from the yield table, without executing it.
+ *
+ * @param state the handle to the state
+ * @param thread the index in the yield table to the target thread
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_KILL_YIELDED_THREAD(state, thread) DREAMLUAU_CALL(kill_yielded_thread)((state), (thread))
+
+/**
+ * Delete a state. The state's handle will be freed for any new states created afterwards.
+ *
+ * @param state the handle to the state
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_KILL_STATE(state) DREAMLUAU_CALL(kill_state)((state))
+
+/**
+ * Retrieve lua traceback info, containing every lua stack frame between the lua entrypoint and the re-entry to dm code.
+ *
+ * @param level the level of lua execution to get the traceback for,
+ * with 1 being the lua code that executed the dm code that called this function,
+ * 2 being the lua code that executed the dm code that executed the lua code
+ * that executed the dm code that called this function, etc.
+ *
+ * @return the callstack of the specified lua level if valid, null if invalid
+ */
+#define DREAMLUAU_GET_TRACEBACK(index) DREAMLUAU_CALL(get_traceback)((index))
+
+/**
+ * Luau userdata corresponding to a ref-counted DM type counts as a hard reference for BYOND's garbage collector.
+ * If you need to delete a DM object, and you cannot be certain that there are no references to it in any luau state,
+ * call this function before deleting that object to disassociate it from any userdata in any luau state.
+ *
+ * Hard deleting an object without clearing userdata corresponding to it leaves the userdata to become associated with
+ * the next DM object to receive the old object's reference ID, which may be undesirable behavior.
+ *
+ * @param object the object to disassociate from userdata.
+ *
+ * @return null on success
+ */
+#define DREAMLUAU_CLEAR_REF_USERDATA(object) DREAMLUAU_CALL(clear_ref_userdata)((object))
+
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index 6811a31284aa4..f8a0dc6d7d551 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -850,7 +850,7 @@
 		used_key_list[input_key] = 1
 	return input_key
 
-///Flattens a keyed list into a list of it's contents
+///Flattens a keyed list into a list of its contents
 /proc/flatten_list(list/key_list)
 	if(!islist(key_list))
 		return null
@@ -978,53 +978,57 @@
 	else
 		return element
 
-/// Returns a copy of the list where any element that is a datum or the world is converted into a ref
-/proc/refify_list(list/target_list, list/visited, path_accumulator = "list")
+/**
+ * Intermediate step for preparing lists to be passed into the lua editor tgui.
+ * Resolves weakrefs, converts some values without a standard textual representation to text,
+ * and can handle self-referential lists and potential duplicate output keys.
+ */
+/proc/prepare_lua_editor_list(list/target_list, list/visited)
 	if(!visited)
 		visited = list()
 	var/list/ret = list()
-	visited[target_list] = path_accumulator
+	visited[target_list] = ret
+	var/list/duplicate_keys = list()
 	for(var/i in 1 to target_list.len)
 		var/key = target_list[i]
 		var/new_key = key
 		if(isweakref(key))
 			var/datum/weakref/ref = key
-			var/resolved = ref.resolve()
-			if(resolved)
-				new_key = "[resolved] [REF(resolved)]"
-			else
-				new_key = "null weakref [REF(key)]"
-		else if(isdatum(key))
-			new_key = "[key] [REF(key)]"
+			new_key = ref.resolve() || "null weakref"
 		else if(key == world)
-			new_key = "world [REF(world)]"
+			new_key = world.name
+		else if(ref(key) == "\[0xe000001\]")
+			new_key = "global"
 		else if(islist(key))
-			if(visited.Find(key))
+			if(visited[key])
 				new_key = visited[key]
 			else
-				new_key = refify_list(key, visited, path_accumulator + "\[[i]\]")
+				new_key = prepare_lua_editor_list(key, visited)
 		var/value
-		if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world)
+		if(!isnull(key) && !isnum(key))
 			value = target_list[key]
 		if(isweakref(value))
 			var/datum/weakref/ref = value
-			var/resolved = ref.resolve()
-			if(resolved)
-				value = "[resolved] [REF(resolved)]"
-			else
-				value = "null weakref [REF(key)]"
-		else if(isdatum(value))
-			value = "[value] [REF(value)]"
-		else if(value == world)
-			value = "world [REF(world)]"
+			value = ref.resolve() || "null weakref"
+		if(value == world)
+			value = "world"
+		else if(ref(value) == "\[0xe000001\]")
+			value = "global"
 		else if(islist(value))
-			if(visited.Find(value))
+			if(visited[value])
 				value = visited[value]
 			else
-				value = refify_list(value, visited, path_accumulator + "\[[key]\]")
-		var/list/to_add = list(new_key)
-		if(value)
-			to_add[new_key] = value
+				value = prepare_lua_editor_list(value, visited)
+		var/list/to_add = list()
+		if(!isnull(value))
+			var/final_key = new_key
+			while(duplicate_keys[final_key])
+				duplicate_keys[new_key]++
+				final_key = "[new_key] ([duplicate_keys[new_key]])"
+			duplicate_keys[final_key] = 1
+			to_add[final_key] = value
+		else
+			to_add += list(new_key)
 		ret += to_add
 		if(i < target_list.len)
 			CHECK_TICK
@@ -1033,29 +1037,31 @@
 /**
  * Converts a list into a list of assoc lists of the form ("key" = key, "value" = value)
  * so that list keys that are themselves lists can be fully json-encoded
+ * and that unique objects with the same string representation do not
+ * produce duplicate keys that are clobbered by the standard JavaScript JSON.parse function
  */
-/proc/kvpify_list(list/target_list, depth = INFINITY, list/visited, path_accumulator = "list")
+/proc/kvpify_list(list/target_list, depth = INFINITY, list/visited)
 	if(!visited)
 		visited = list()
 	var/list/ret = list()
-	visited[target_list] = path_accumulator
+	visited[target_list] = ret
 	for(var/i in 1 to target_list.len)
 		var/key = target_list[i]
 		var/new_key = key
 		if(islist(key) && depth)
-			if(visited.Find(key))
+			if(visited[key])
 				new_key = visited[key]
 			else
-				new_key = kvpify_list(key, depth-1, visited, path_accumulator + "\[[i]\]")
+				new_key = kvpify_list(key, depth-1, visited)
 		var/value
-		if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world)
+		if(!isnull(key) && !isnum(key))
 			value = target_list[key]
 		if(islist(value) && depth)
-			if(visited.Find(value))
+			if(visited[value])
 				value = visited[value]
 			else
-				value = kvpify_list(value, depth-1, visited, path_accumulator + "\[[key]\]")
-		if(value)
+				value = kvpify_list(value, depth-1, visited)
+		if(!isnull(value))
 			ret += list(list("key" = new_key, "value" = value))
 		else
 			ret += list(list("key" = i, "value" = new_key))
@@ -1065,12 +1071,12 @@
 
 /// Compares 2 lists, returns TRUE if they are the same
 /proc/deep_compare_list(list/list_1, list/list_2)
-	if(!islist(list_1) || !islist(list_2))
-		return FALSE
-
 	if(list_1 == list_2)
 		return TRUE
 
+	if(!islist(list_1) || !islist(list_2))
+		return FALSE
+
 	if(list_1.len != list_2.len)
 		return FALSE
 
@@ -1093,11 +1099,11 @@
 	return TRUE
 
 /// Returns a copy of the list where any element that is a datum is converted into a weakref
-/proc/weakrefify_list(list/target_list, list/visited, path_accumulator = "list")
+/proc/weakrefify_list(list/target_list, list/visited)
 	if(!visited)
 		visited = list()
 	var/list/ret = list()
-	visited[target_list] = path_accumulator
+	visited[target_list] = ret
 	for(var/i in 1 to target_list.len)
 		var/key = target_list[i]
 		var/new_key = key
@@ -1107,62 +1113,19 @@
 			if(visited.Find(key))
 				new_key = visited[key]
 			else
-				new_key = weakrefify_list(key, visited, path_accumulator + "\[[i]\]")
+				new_key = weakrefify_list(key, visited)
 		var/value
-		if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world)
+		if(!isnull(key) && !isnum(key))
 			value = target_list[key]
 		if(isdatum(value))
 			value = WEAKREF(value)
 		else if(islist(value))
-			if(visited.Find(value))
+			if(visited[value])
 				value = visited[value]
 			else
-				value = weakrefify_list(value, visited, path_accumulator + "\[[key]\]")
-		var/list/to_add = list(new_key)
-		if(value)
-			to_add[new_key] = value
-		ret += to_add
-		if(i < target_list.len)
-			CHECK_TICK
-	return ret
-
-/// Returns a copy of a list where text values (except assoc-keys and string representations of lua-only values) are
-/// wrapped in quotes and existing quote marks are escaped,
-/// and nulls are replaced with the string "null"
-/proc/encode_text_and_nulls(list/target_list, list/visited)
-	var/static/regex/lua_reference_regex
-	if(!lua_reference_regex)
-		lua_reference_regex = regex(@"^((function)|(table)|(thread)|(userdata)): 0x[0-9a-fA-F]+$")
-	if(!visited)
-		visited = list()
-	var/list/ret = list()
-	visited[target_list] = TRUE
-	for(var/i in 1 to target_list.len)
-		var/key = target_list[i]
-		var/new_key = key
-		if(istext(key) && !target_list[key] && !lua_reference_regex.Find(key))
-			new_key = "\"[replacetext(key, "\"", "\\\"")]\""
-		else if(islist(key))
-			var/found_index = visited.Find(key)
-			if(found_index)
-				new_key = visited[found_index]
-			else
-				new_key = encode_text_and_nulls(key, visited)
-		else if(isnull(key))
-			new_key = "null"
-		var/value
-		if(istext(key) || islist(key) || ispath(key) || isdatum(key) || key == world)
-			value = target_list[key]
-		if(istext(value) && !lua_reference_regex.Find(value))
-			value = "\"[replacetext(value, "\"", "\\\"")]\""
-		else if(islist(value))
-			var/found_index = visited.Find(value)
-			if(found_index)
-				value = visited[found_index]
-			else
-				value = encode_text_and_nulls(value, visited)
+				value = weakrefify_list(value, visited)
 		var/list/to_add = list(new_key)
-		if(value)
+		if(!isnull(value))
 			to_add[new_key] = value
 		ret += to_add
 		if(i < target_list.len)
@@ -1188,3 +1151,155 @@
 	if("x" in coords)
 		return locate(coords["x"], coords["y"], coords["z"])
 	return locate(coords[1], coords[2], coords[3])
+
+/**
+ * Given a list and a list of its variant hints, appends variants that aren't explicitly required by dreamluau,
+ * but are required by the lua editor tgui.
+ */
+/proc/add_lua_editor_variants(list/values, list/variants, list/visited, path = "")
+	if(!islist(visited))
+		visited = list()
+		visited[values] = "\[\]"
+	if(!islist(values) || !islist(variants))
+		return
+	if(values.len != variants.len)
+		CRASH("values and variants must be the same length")
+	for(var/i in 1 to variants.len)
+		var/pair = variants[i]
+		var/pair_modified = FALSE
+		if(isnull(pair))
+			pair = list("key", "value")
+		var/key = values[i]
+		if(islist(key))
+			if(visited[key])
+				pair["key"] = list("cycle", visited[key])
+			else
+				var/list/key_variants = pair["key"]
+				var/new_path = path + "\[[i], \"key\"\],"
+				visited[key] = new_path
+				add_lua_editor_variants(key, key_variants, visited, new_path)
+				visited -= key
+				pair["key"] = list("list", key_variants)
+			pair_modified = TRUE
+		else if(isdatum(key) || key == world || ref(key) == "\[0xe000001\]")
+			pair["key"] = list("ref", ref(key))
+			pair_modified = TRUE
+		var/value
+		if(!isnull(key) && !isnum(key))
+			value = values[key]
+		if(islist(value))
+			if(visited[value])
+				pair["value"] = list("cycle", visited[value])
+			else
+				var/list/value_variants = pair["value"]
+				var/new_path = path + "\[[i], \"value\"\],"
+				visited[value] = new_path
+				add_lua_editor_variants(value, value_variants, visited, new_path)
+				visited -= value
+				pair["value"] = list("list", value_variants)
+			pair_modified = TRUE
+		else if(isdatum(value) || value == world || ref(value) == "\[0xe000001\]")
+			pair["value"] = list("ref", ref(value))
+			pair_modified = TRUE
+		if(pair_modified && pair != variants[i])
+			variants[i] = pair
+		if(i < variants.len)
+			CHECK_TICK
+
+/proc/add_lua_return_value_variants(list/values, list/variants)
+	if(!islist(values) || !islist(variants))
+		return
+	if(values.len != variants.len)
+		CRASH("values and variants must be the same length")
+	for(var/i in 1 to values.len)
+		var/value = values[i]
+		if(islist(value))
+			add_lua_editor_variants(value, variants[i])
+		else if(isdatum(value) || value == world || ref(value) == "\[0xe000001\]")
+			variants[i] = list("ref", ref(value))
+
+/proc/deep_copy_without_cycles(list/values, list/visited)
+	if(!islist(visited))
+		visited = list()
+	if(!islist(values))
+		return values
+	var/list/ret = list()
+	var/cycle_count = 0
+	visited[values] = TRUE
+	for(var/i in 1 to values.len)
+		var/key = values[i]
+		var/out_key = key
+		if(islist(key))
+			if(visited[key])
+				do
+					out_key = "\[cyclical reference[cycle_count ? " (i)" : ""]\]"
+					cycle_count++
+				while(values.Find(out_key))
+			else
+				visited[key] = TRUE
+				out_key = deep_copy_without_cycles(key, visited)
+				visited -= key
+		var/value
+		if(!isnull(key) && !isnum(key))
+			value = values[key]
+		var/out_value = value
+		if(islist(value))
+			if(visited[value])
+				out_value = "\[cyclical reference\]"
+			else
+				visited[value] = TRUE
+				out_value = deep_copy_without_cycles(value, visited)
+				visited -= value
+		var/list/to_add = list(out_key)
+		if(!isnull(out_value))
+			to_add[out_key] = out_value
+		ret += to_add
+		if(i < values.len)
+			CHECK_TICK
+	return ret
+
+/**
+ * Given a list and a list of its variant hints, removes any list key/values that are represent lua values that could not be directly converted to DM.
+ */
+/proc/remove_non_dm_variants(list/return_values, list/variants, list/visited)
+	if(!islist(visited))
+		visited = list()
+	if(!islist(return_values) || !islist(variants) || visited[return_values])
+		return
+	visited[return_values] = TRUE
+	if(return_values.len != variants.len)
+		CRASH("return_values and variants must be the same length")
+	for(var/i in 1 to variants.len)
+		var/pair = variants[i]
+		if(!islist(variants))
+			continue
+		var/key = return_values[i]
+		if(pair["key"])
+			if(!islist(pair["key"]))
+				return_values[i] = null
+				continue
+			remove_non_dm_variants(key, pair["key"], visited)
+		if(pair["value"])
+			if(!islist(pair["value"]))
+				return_values[key] = null
+				continue
+			remove_non_dm_variants(return_values[key], pair["value"], visited)
+
+/proc/compare_lua_logs(list/log_1, list/log_2)
+	if(log_1 == log_2)
+		return TRUE
+	for(var/field in list("status", "name", "message", "chunk"))
+		if(log_1[field] != log_2[field])
+			return FALSE
+	switch(log_1["status"])
+		if("finished", "yield")
+			return deep_compare_list(
+					recursive_list_resolve(log_1["return_values"]),
+					recursive_list_resolve(log_2["return_values"])
+					) && deep_compare_list(log_1["variants"], log_2["variants"])
+		if("runtime")
+			return log_1["file"] == log_2["file"]\
+				&& log_1["line"] == log_2["line"]\
+				&& deep_compare_list(log_1["stack"], log_2["stack"])
+		else
+			return TRUE
diff --git a/code/__HELPERS/colors.dm b/code/__HELPERS/colors.dm
index 9c70cef798eac..3a20e5ad60c09 100644
--- a/code/__HELPERS/colors.dm
+++ b/code/__HELPERS/colors.dm
@@ -101,5 +101,50 @@
 
 	return output
 
+/**
+ * Gets a color for a name, will return the same color for a given string consistently within a round.atom
+ *
+ * Note that this proc aims to produce pastel-ish colors using the HSL colorspace. These seem to be favorable for displaying on the map.
+ *
+ * Arguments:
+ * * name - The name to generate a color for
+ * * sat_shift - A value between 0 and 1 that will be multiplied against the saturation
+ * * lum_shift - A value between 0 and 1 that will be multiplied against the luminescence
+ */
+/proc/colorize_string(name, sat_shift = 1, lum_shift = 1)
+	// seed to help randomness
+	var/static/rseed = rand(1,26)
+
+	// get hsl using the selected 6 characters of the md5 hash
+	var/hash = copytext(md5(name + GLOB.round_id), rseed, rseed + 6)
+	var/h = hex2num(copytext(hash, 1, 3)) * (360 / 255)
+	var/s = (hex2num(copytext(hash, 3, 5)) >> 2) * ((CM_COLOR_SAT_MAX - CM_COLOR_SAT_MIN) / 63) + CM_COLOR_SAT_MIN
+	var/l = (hex2num(copytext(hash, 5, 7)) >> 2) * ((CM_COLOR_LUM_MAX - CM_COLOR_LUM_MIN) / 63) + CM_COLOR_LUM_MIN
+
+	// adjust for shifts
+	s = clamp(s * sat_shift, 0, 1)
+	l = clamp(l * lum_shift, 0, 1)
+
+	// convert to rgb
+	var/h_int = round(h/60) // mapping each section of H to 60 degree sections
+	var/c = (1 - abs(2 * l - 1)) * s
+	var/x = c * (1 - abs((h / 60) % 2 - 1))
+	var/m = l - c * 0.5
+	x = (x + m) * 255
+	c = (c + m) * 255
+	m *= 255
+	switch(h_int)
+		if(0)
+			return "#[num2hex(c, 2)][num2hex(x, 2)][num2hex(m, 2)]"
+		if(1)
+			return "#[num2hex(x, 2)][num2hex(c, 2)][num2hex(m, 2)]"
+		if(2)
+			return "#[num2hex(m, 2)][num2hex(c, 2)][num2hex(x, 2)]"
+		if(3)
+			return "#[num2hex(m, 2)][num2hex(x, 2)][num2hex(c, 2)]"
+		if(4)
+			return "#[num2hex(x, 2)][num2hex(m, 2)][num2hex(c, 2)]"
+		if(5)
+			return "#[num2hex(c, 2)][num2hex(m, 2)][num2hex(x, 2)]"
 
 #define RANDOM_COLOUR (rgb(rand(0,255),rand(0,255),rand(0,255)))
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 9d72d7c432041..6012645bced1c 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -214,16 +214,16 @@
 		if(istype(atom_to_find, type))
 			return atom_to_find
 
-		while(!istype(atom_to_find.loc, type))
+		while(!istype(atom_to_find, type))
 			if(!atom_to_find.loc)
 				return
 			atom_to_find = atom_to_find.loc
 	else if(isatom(type))
 		atom_to_find = target
-		if(atom_to_find.loc == type)
+		if(atom_to_find == type)
 			return atom_to_find
 
-		while(atom_to_find.loc != type)
+		while(atom_to_find != type)
 			if(!atom_to_find.loc)
 				return
 			atom_to_find = atom_to_find.loc
diff --git a/code/__HELPERS/generators.dm b/code/__HELPERS/generators.dm
index d50df7deba198..85f6de3a090d4 100644
--- a/code/__HELPERS/generators.dm
+++ b/code/__HELPERS/generators.dm
@@ -5,7 +5,7 @@
  * * Note: this means things like "list(1,2,3)" will need to be processed
  */
 /proc/return_generator_args(generator/target)
-	var/string_repr = "[target]" //the name of the generator is the string representation of it's _binobj, which also contains it's args
+	var/string_repr = "[target]" //the name of the generator is the string representation of its _binobj, which also contains its args
 	string_repr = copytext(string_repr, 11, length(string_repr)) // strips extraneous data
 	string_repr = replacetext(string_repr, "\"", "") // removes the " around the type
 	return splittext(string_repr, ", ")
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index bd991f29d014a..1bacd0ce2c774 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list(
 	/obj/machinery/defibrillator_mount,
 	/obj/machinery/firealarm,
 	/obj/machinery/flasher,
-	/obj/machinery/keycard_auth,
+	/obj/machinery/keycard_auth/wall_mounted,
 	/obj/machinery/light_switch,
 	/obj/machinery/newscaster,
 	/obj/machinery/power/apc,
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index d5b3ecb16aff2..8d8727a90b052 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -1135,7 +1135,7 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects)
 	if((x_dimension == world.icon_size) && (y_dimension == world.icon_size))
 		return image_to_center
 
-	//Offset the image so that it's bottom left corner is shifted this many pixels
+	//Offset the image so that its bottom left corner is shifted this many pixels
 	//This makes it infinitely easier to draw larger inhands/images larger than world.iconsize
 	//but still use them in game
 	var/x_offset = -((x_dimension / world.icon_size) - 1) * (world.icon_size * 0.5)
diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm
index 68b94fc2fe654..8a5534e3827b8 100644
--- a/code/__HELPERS/matrices.dm
+++ b/code/__HELPERS/matrices.dm
@@ -40,8 +40,7 @@
 	decompose_matrix.rotation = arctan(cossine, sine) * flip_sign
 
 /matrix/proc/TurnTo(old_angle, new_angle)
-	. = new_angle - old_angle
-	Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
+	return Turn(new_angle - old_angle) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
 
 /**
  * Shear the transform on either or both axes.
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index dd81fff2a97ee..322e7d5342870 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -632,7 +632,7 @@ GLOBAL_LIST_INIT(skin_tone_names, list(
 		else
 			return zone
 
-///Takes a zone and returns it's "parent" zone, if it has one.
+///Takes a zone and returns its "parent" zone, if it has one.
 /proc/deprecise_zone(precise_zone)
 	switch(precise_zone)
 		if(BODY_ZONE_PRECISE_GROIN)
diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index 3a82c8dc1a66c..c1561fa77ee9c 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -76,7 +76,7 @@ GLOBAL_VAR(command_name)
 	if (GLOB.command_name)
 		return GLOB.command_name
 
-	var/name = "Central Command"
+	var/name = "Центральное Командование"
 
 	GLOB.command_name = name
 	return name
diff --git a/code/__HELPERS/piping_colors_lists.dm b/code/__HELPERS/piping_colors_lists.dm
index c198e569635e7..8b92e2d530a3d 100644
--- a/code/__HELPERS/piping_colors_lists.dm
+++ b/code/__HELPERS/piping_colors_lists.dm
@@ -4,7 +4,7 @@ GLOBAL_LIST_INIT(pipe_paint_colors, list(
 	"green" = COLOR_VIBRANT_LIME,
 	"blue" = COLOR_BLUE,
 	"red" = COLOR_RED,
-	"orange" = COLOR_TAN_ORANGE,
+	"orange" = COLOR_ENGINEERING_ORANGE,
 	"cyan" = COLOR_CYAN,
 	"dark" = COLOR_DARK,
 	"yellow" = COLOR_YELLOW,
@@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(pipe_colors_ordered, sort_list(list(
 	COLOR_DARK = -2,
 	COLOR_VIBRANT_LIME = -1,
 	COLOR_VERY_LIGHT_GRAY = 0,
-	COLOR_TAN_ORANGE = 1,
+	COLOR_ENGINEERING_ORANGE = 1,
 	COLOR_PURPLE = 2,
 	COLOR_RED = 3,
 	COLOR_STRONG_VIOLET = 4,
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(pipe_color_name, sort_list(list(
 	COLOR_BLUE = "blue",
 	COLOR_RED = "red",
 	COLOR_VIBRANT_LIME = "green",
-	COLOR_TAN_ORANGE = "orange",
+	COLOR_ENGINEERING_ORANGE = "orange",
 	COLOR_CYAN = "cyan",
 	COLOR_DARK = "dark",
 	COLOR_YELLOW = "yellow",
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
index 4ced6fac8d573..b70f73f1244b6 100644
--- a/code/__HELPERS/priority_announce.dm
+++ b/code/__HELPERS/priority_announce.dm
@@ -201,7 +201,7 @@
 
 			/// SS220 TTS START
 			var/mob/living/silicon/ai/active_ai = DEFAULTPICK(active_ais(TRUE, null), null)
-			var/datum/tts_seed/announcement_tts_seed = active_ai ? active_ai.get_tts_seed() :  /datum/tts_seed/silero/glados
+			var/datum/tts_seed/announcement_tts_seed = active_ai ? active_ai.get_tts_seed() : /datum/tts_seed/silero/glados
 			INVOKE_ASYNC(
 				SStts220, \
 				TYPE_PROC_REF(/datum/controller/subsystem/tts220, get_tts), \
@@ -210,7 +210,6 @@
 				announcement, \
 				announcement_tts_seed, \
 				FALSE, \
-				/datum/singleton/sound_effect/radio_robot, \
 			)
 			/// SS220 TTS END
 
diff --git a/code/__HELPERS/spawns.dm b/code/__HELPERS/spawns.dm
index 2c93e4ba19e56..c72c5a555de5a 100644
--- a/code/__HELPERS/spawns.dm
+++ b/code/__HELPERS/spawns.dm
@@ -29,7 +29,13 @@
 		if(!ispath(path))
 			path.forceMove(pod)
 		else
-			path = new path(pod)
+			var/amount_to_spawn = paths_to_spawn[path] || 1
+			if(!isnum(amount_to_spawn))
+				stack_trace("amount to spawn for path \"[path]\" is not a number, defaulting to 1")
+				amount_to_spawn = 1
+
+			for(var/item_number in 1 to amount_to_spawn)
+				new path(pod)
 
 	//remove non var edits from specifications
 	specifications -= "target"
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
index b8e0113696ad2..feea67939f836 100644
--- a/code/__HELPERS/text.dm
+++ b/code/__HELPERS/text.dm
@@ -121,7 +121,7 @@
 	if(isnull(user_input)) // User pressed cancel
 		return
 	if(no_trim)
-		return copytext(html_encode(user_input), 1, max_length)
+		return copytext_char(html_encode(user_input), 1, max_length)
 	else
 		return trim(html_encode(user_input), max_length) //trim is "outside" because html_encode can expand single symbols into multiple symbols (such as turning < into &lt;)
 
@@ -140,7 +140,7 @@
 	if(isnull(user_input)) // User pressed cancel
 		return
 	if(no_trim)
-		return copytext(html_encode(user_input), 1, max_length)
+		return copytext_char(html_encode(user_input), 1, max_length)
 	else
 		return trim(html_encode(user_input), max_length)
 
@@ -368,7 +368,7 @@
  */
 /proc/truncate(text, max_length)
 	if(length(text) > max_length)
-		return copytext(text, 1, max_length)
+		return copytext_char(text, 1, max_length)
 	return text
 
 //Returns a string with reserved characters and spaces before the first word and after the last word removed.
@@ -1228,6 +1228,13 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
 	var/input_length = LAZYLEN(ending)
 	return !!findtext(input_text, ending, -input_length)
 
+/// Returns TRUE if the input_text starts with any of the beginnings
+/proc/starts_with_any(input_text, list/beginnings)
+	for(var/beginning in beginnings)
+		if(!!findtext(input_text, beginning, 1, LAZYLEN(beginning)+1))
+			return TRUE
+	return FALSE
+
 /// Generate a grawlix string of length of the text argument.
 /proc/grawlix(text)
 	var/grawlix = ""
diff --git a/code/__HELPERS/turfs.dm b/code/__HELPERS/turfs.dm
index 01ad88e68f4c3..93da26ef292f8 100644
--- a/code/__HELPERS/turfs.dm
+++ b/code/__HELPERS/turfs.dm
@@ -210,7 +210,7 @@ Turf and target are separate in case you want to teleport some distance from a t
  * if the bounds are odd, the true middle turf of the atom is returned
 **/
 /proc/get_turf_pixel(atom/checked_atom)
-	var/turf/atom_turf = get_turf(checked_atom) //use checked_atom's turfs, as it's coords are the same as checked_atom's AND checked_atom's coords are lost if it is inside another atom
+	var/turf/atom_turf = get_turf(checked_atom) //use checked_atom's turfs, as its coords are the same as checked_atom's AND checked_atom's coords are lost if it is inside another atom
 	if(!atom_turf)
 		return null
 	if(checked_atom.flags_1 & IGNORE_TURF_PIXEL_OFFSET_1)
@@ -227,7 +227,7 @@ Turf and target are separate in case you want to teleport some distance from a t
  * Icon width/height
 **/
 /proc/get_visual_offset(atom/checked_atom)
-	//Find checked_atom's matrix so we can use it's X/Y pixel shifts
+	//Find checked_atom's matrix so we can use its X/Y pixel shifts
 	var/matrix/atom_matrix = matrix(checked_atom.transform)
 
 	var/pixel_x_offset = checked_atom.pixel_x + checked_atom.pixel_w + atom_matrix.get_x_shift()
diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm
index 87d4348580e29..0f19332934d09 100644
--- a/code/__byond_version_compat.dm
+++ b/code/__byond_version_compat.dm
@@ -16,7 +16,7 @@
 // We use wrappers for this in case some part of the api ever changes, and to make their function more clear
 // For the record: GLOBAL_VERB_REF would be useless as verbs can't be global.
 
-/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
+/// Call by name proc references, checks if the proc exists on either this type () (AND ONLY THIS TYPE) or as a global proc.
 #define PROC_REF(X) (nameof(.proc/##X))
 /// Call by name verb references, checks if the verb exists on either this type or as a global verb.
 #define VERB_REF(X) (nameof(.verb/##X))
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index ea1b16d71cef8..27c0d27ec2e92 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -64,6 +64,7 @@ DEFINE_BITFIELD(area_flags, list(
 	"UNIQUE_AREA" = UNIQUE_AREA,
 	"VALID_TERRITORY" = VALID_TERRITORY,
 	"XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
+	"NO_BOH" = NO_BOH,
 ))
 
 DEFINE_BITFIELD(turf_flags, list(
@@ -199,6 +200,7 @@ DEFINE_BITFIELD(flags_inv, list(
 	"HIDEHEADGEAR" = HIDEHEADGEAR,
 	"HIDEJUMPSUIT" = HIDEJUMPSUIT,
 	"HIDEMASK" = HIDEMASK,
+	"HIDEBELT" = HIDEBELT,
 	"HIDENECK" = HIDENECK,
 	"HIDESHOES" = HIDESHOES,
 	"HIDESNOUT" = HIDESNOUT,
diff --git a/code/_globalvars/lists/ambience.dm b/code/_globalvars/lists/ambience.dm
index 6dd4935817fea..12a389cf081f8 100644
--- a/code/_globalvars/lists/ambience.dm
+++ b/code/_globalvars/lists/ambience.dm
@@ -127,6 +127,11 @@ GLOBAL_LIST_INIT(maint_ambience,list(
 	'sound/ambience/ambimaint5.ogg',
 	'sound/ambience/ambimaint6.ogg',
 	'sound/ambience/ambimaint7.ogg',
+	'sound/ambience/ambimaint8.ogg',
+	'sound/ambience/ambimaint9.ogg',
+	'sound/ambience/ambimaint10.ogg',
+	'sound/ambience/ambimaint11.ogg',
+	'sound/ambience/ambimaint12.ogg',
 	'sound/ambience/ambitech2.ogg',
 	'sound/voice/lowHiss1.ogg',
 	'sound/voice/lowHiss2.ogg',
diff --git a/code/_globalvars/lists/cargo.dm b/code/_globalvars/lists/cargo.dm
index 5e4766fc7c3ff..1a41609d25ce7 100644
--- a/code/_globalvars/lists/cargo.dm
+++ b/code/_globalvars/lists/cargo.dm
@@ -15,20 +15,3 @@ GLOBAL_LIST_INIT(pack_discount_odds, list(
 ))
 
 GLOBAL_LIST_EMPTY(supplypod_loading_bays)
-
-GLOBAL_LIST_INIT(podstyles, list(\
-	list(POD_SHAPE_NORML, "pod",         TRUE, "default", "yellow",   RUBBLE_NORMAL, "supply pod",     "A Nanotrasen supply drop pod."),\
-	list(POD_SHAPE_NORML, "advpod",      TRUE, "bluespace", "blue",     RUBBLE_NORMAL, "bluespace supply pod" ,     "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\
-	list(POD_SHAPE_NORML, "advpod",      TRUE, "centcom", "blue",     RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\
-	list(POD_SHAPE_NORML, "darkpod",     TRUE, "syndicate", "red",      RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\
-	list(POD_SHAPE_NORML, "darkpod",     TRUE, "deathsquad", "blue",     RUBBLE_NORMAL, "\improper Deathsquad drop pod",     "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\
-	list(POD_SHAPE_NORML, "pod",         TRUE, "cultist", "red",      RUBBLE_NORMAL, "bloody supply pod",     "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\
-	list(POD_SHAPE_OTHER, "missile",     FALSE, FALSE, FALSE,   RUBBLE_THIN,     "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
-	list(POD_SHAPE_OTHER, "smissile",    FALSE, FALSE,         FALSE,   RUBBLE_THIN,     "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
-	list(POD_SHAPE_OTHER, "box",         TRUE, FALSE,            FALSE,   RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\
-	list(POD_SHAPE_NORML, "clownpod",    TRUE, "clown", "green",    RUBBLE_NORMAL, "\improper HONK pod",     "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
-	list(POD_SHAPE_OTHER, "orange",      TRUE, FALSE, FALSE,   RUBBLE_NONE,     "\improper Orange", "An angry orange."),\
-	list(POD_SHAPE_OTHER, FALSE,         FALSE,    FALSE,            FALSE,   RUBBLE_NONE,     "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\
-	list(POD_SHAPE_OTHER, "gondola",     FALSE, FALSE, FALSE,   RUBBLE_NONE,     "gondola",     "The silent walker. This one seems to be part of a delivery agency."),\
-	list(POD_SHAPE_OTHER, FALSE,         FALSE,    FALSE,            FALSE,   RUBBLE_NONE,         FALSE,      FALSE,      "rl_click", "give_po")\
-))
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 76c69425bf54b..e44516d2f2873 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -312,7 +312,7 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
 	list(//equipment
 		/obj/item/clothing/glasses/hud/security = 1,
 		/obj/item/clothing/glasses/sunglasses = 1,
-		/obj/item/clothing/gloves/color/black = 1,
+		/obj/item/clothing/gloves/color/black/security = 1,
 		/obj/item/clothing/gloves/color/yellow = 1,
 		/obj/item/clothing/gloves/tackler/combat = 1,
 		/obj/item/clothing/head/helmet/toggleable/justice = 1,
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index dce2dc69a50ae..f9f70a2c7069f 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -31,6 +31,7 @@ GLOBAL_LIST_INIT(guardian_first_names, world.file2list("strings/names/guardian_d
 GLOBAL_LIST_INIT(guardian_tech_surnames, world.file2list("strings/names/guardian_gamepieces.txt"))
 GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guardian_tarot.txt"))
 GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt"))
+GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt"))
 
 GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
 GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))
diff --git a/code/_globalvars/lists/typecache.dm b/code/_globalvars/lists/typecache.dm
index 07e0eabf01f62..805cea677a092 100644
--- a/code/_globalvars/lists/typecache.dm
+++ b/code/_globalvars/lists/typecache.dm
@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(typecache_elevated_structures, typecacheof(list(
 	/obj/structure/table,
 	//Kitchen
 	/obj/machinery/smartfridge,
-	/obj/machinery/smartfridge/drying_rack, // Redundant, given above, but this is for the sake of explicitness.
+	/obj/machinery/smartfridge/drying, // Redundant, given above, but this is for the sake of explicitness.
 	/obj/structure/bonfire,
 	/obj/machinery/grill,
 	/obj/machinery/griddle,
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 592ceda2eac97..dcda2365c4b0f 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -58,7 +58,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NOT_ENGRAVABLE" = TRAIT_NOT_ENGRAVABLE,
 		"TRAIT_SPELLS_TRANSFER_TO_LOC" = TRAIT_SPELLS_TRANSFER_TO_LOC,
 		"TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT" = TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT,
+		"TRAIT_ON_HIT_EFFECT" = TRAIT_ON_HIT_EFFECT,
 		"TRAIT_RUNECHAT_HIDDEN" = TRAIT_RUNECHAT_HIDDEN,
+		"TRAIT_SCARY_FISHERMAN" = TRAIT_SCARY_FISHERMAN,
 		"TRAIT_SECLUDED_LOCATION" = TRAIT_SECLUDED_LOCATION,
 		"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
 		"TRAIT_TELEKINESIS_CONTROLLED" = TRAIT_TELEKINESIS_CONTROLLED,
@@ -152,7 +154,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_BOMBIMMUNE" = TRAIT_BOMBIMMUNE,
 		"TRAIT_BONSAI" = TRAIT_BONSAI,
 		"TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER,
-		"TRAIT_BOXING_READY" = TRAIT_BOXING_READY,
 		"TRAIT_BORN_MONKEY" = TRAIT_BORN_MONKEY,
 		"TRAIT_BOXING_READY" = TRAIT_BOXING_READY,
 		"TRAIT_BRAINWASHING" = TRAIT_BRAINWASHING,
@@ -173,6 +174,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CHEF_KISS" = TRAIT_CHEF_KISS,
 		"TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS,
 		"TRAIT_CHUNKYFINGERS_IGNORE_BATON" = TRAIT_CHUNKYFINGERS_IGNORE_BATON,
+		"TRAIT_CHUUNIBYOU" = TRAIT_CHUUNIBYOU,
 		"TRAIT_CLEANBOT_WHISPERER" = TRAIT_CLEANBOT_WHISPERER,
 		"TRAIT_CLIFF_WALKER" = TRAIT_CLIFF_WALKER,
 		"TRAIT_CLOWN_ENJOYER" = TRAIT_CLOWN_ENJOYER,
@@ -189,6 +191,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_DETECTIVES_TASTE" = TRAIT_DETECTIVES_TASTE,
 		"TRAIT_DETECT_STORM" = TRAIT_DETECT_STORM,
 		"TRAIT_DIAGNOSTIC_HUD" = TRAIT_DIAGNOSTIC_HUD,
+		"TRAIT_BOT_PATH_HUD" = TRAIT_BOT_PATH_HUD,
 		"TRAIT_DISCOORDINATED_TOOL_USER" = TRAIT_DISCOORDINATED_TOOL_USER,
 		"TRAIT_DISEASELIKE_SEVERITY_MEDIUM" = TRAIT_DISEASELIKE_SEVERITY_MEDIUM,
 		"TRAIT_DISFIGURED" = TRAIT_DISFIGURED,
@@ -210,7 +213,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_ECHOLOCATION_RECEIVER" = TRAIT_ECHOLOCATION_RECEIVER,
 		"TRAIT_ELDRITCH_PAINTING_EXAMINE" = TRAIT_ELDRITCH_PAINTING_EXAMINE,
 		"TRAIT_ELITE_CHALLENGER" = TRAIT_ELITE_CHALLENGER,
-		"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
 		"TRAIT_EMOTEMUTE" = TRAIT_EMOTEMUTE,
 		"TRAIT_EMPATH" = TRAIT_EMPATH,
 		"TRAIT_ENTRAILS_READER" = TRAIT_ENTRAILS_READER,
@@ -274,7 +276,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HUSK" = TRAIT_HUSK,
 		"TRAIT_ID_APPRAISER" = TRAIT_ID_APPRAISER,
 		"TRAIT_IGNORE_ELEVATION" = TRAIT_IGNORE_ELEVATION,
-		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN,
 		"TRAIT_IGNORING_GRAVITY" = TRAIT_IGNORING_GRAVITY,
 		"TRAIT_ILLITERATE" = TRAIT_ILLITERATE,
@@ -313,7 +314,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MOB_BREEDER" = TRAIT_MOB_BREEDER,
 		"TRAIT_MOB_EATER" = TRAIT_MOB_EATER,
 		"TRAIT_MOB_HATCHED" = TRAIT_MOB_HATCHED,
-		"TRAIT_MOB_RELAY_HAPPINESS" = TRAIT_MOB_RELAY_HAPPINESS,
+		"TRAIT_MOB_HIDE_HAPPINESS" = TRAIT_MOB_HIDE_HAPPINESS,
 		"TRAIT_MOB_TIPPED" = TRAIT_MOB_TIPPED,
 		"TRAIT_MORBID" = TRAIT_MORBID,
 		"TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS,
@@ -338,6 +339,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NOFIRE_SPREAD" = TRAIT_NOFIRE_SPREAD,
 		"TRAIT_NOFLASH" = TRAIT_NOFLASH,
 		"TRAIT_NOGUNS" = TRAIT_NOGUNS,
+		"TRAIT_TOSS_GUN_HARD" = TRAIT_TOSS_GUN_HARD,
 		"TRAIT_NOHARDCRIT" = TRAIT_NOHARDCRIT,
 		"TRAIT_NOHUNGER" = TRAIT_NOHUNGER,
 		"TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE,
@@ -365,6 +367,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NO_SOUL" = TRAIT_NO_SOUL,
 		"TRAIT_NO_STAGGER" = TRAIT_NO_STAGGER,
 		"TRAIT_NO_STRIP" = TRAIT_NO_STRIP,
+		"TRAIT_NO_THROWING" = TRAIT_NO_THROWING,
 		"TRAIT_NO_TRANSFORM" = TRAIT_NO_TRANSFORM,
 		"TRAIT_NO_TWOHANDING" = TRAIT_NO_TWOHANDING,
 		"TRAIT_NO_UNDERWEAR" = TRAIT_NO_UNDERWEAR,
@@ -439,6 +442,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE,
 		"TRAIT_SIGN_LANG" = TRAIT_SIGN_LANG,
 		"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
+		"TRAIT_SILICON_EMOTES_ALLOWED" = TRAIT_SILICON_EMOTES_ALLOWED,
 		"TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE,
 		"TRAIT_SKITTISH" = TRAIT_SKITTISH,
 		"TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE,
@@ -452,8 +456,10 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SPARRING" = TRAIT_SPARRING,
 		"TRAIT_SPEAKS_CLEARLY" = TRAIT_SPEAKS_CLEARLY,
 		"TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST,
+		"TRAIT_SPELLS_LOTTERY" = TRAIT_SPELLS_LOTTERY,
 		"TRAIT_SPIDER_CONSUMED" = TRAIT_SPIDER_CONSUMED,
 		"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
+		"TRAIT_SPLATTERCASTER" = TRAIT_SPLATTERCASTER,
 		"TRAIT_SPRAY_PAINTABLE" = TRAIT_SPRAY_PAINTABLE,
 		"TRAIT_STABLEHEART" = TRAIT_STABLEHEART,
 		"TRAIT_STABLELIVER" = TRAIT_STABLELIVER,
@@ -523,9 +529,12 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE,
 		"TRAIT_XRAY_HEARING" = TRAIT_XRAY_HEARING,
 		"TRAIT_XRAY_VISION" = TRAIT_XRAY_VISION,
+		"TRAIT_SPEECH_BOOSTER" = TRAIT_SPEECH_BOOSTER,
+		"TRAIT_MINING_PARRYING" = TRAIT_MINING_PARRYING,
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
+		"TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE,
 		"TRAIT_BAKEABLE" = TRAIT_BAKEABLE,
 		"TRAIT_BASIC_QUALITY_BAIT" = TRAIT_BASIC_QUALITY_BAIT,
 		"TRAIT_BLIND_TOOL" = TRAIT_BLIND_TOOL,
@@ -602,6 +611,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 	),
 	/obj/item/organ = list(
 		"TRAIT_LIVING_HEART" = TRAIT_LIVING_HEART,
+		"TRAIT_USED_ORGAN" = TRAIT_USED_ORGAN,
 	),
 	/obj/item/organ/internal/liver = list(
 		"TRAIT_BALLMER_SCIENTIST" = TRAIT_BALLMER_SCIENTIST,
diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
index 25766e5bc69fc..98c3fd6ab1fca 100644
--- a/code/_globalvars/traits/admin_tooling.dm
+++ b/code/_globalvars/traits/admin_tooling.dm
@@ -1,6 +1,6 @@
 // This file contains any stuff related to admin-visible traits.
 // There's likely more than a few traits missing from this file, do consult the `_traits.dm` file in this folder to see every global trait that exists.
-// quirks have it's own panel so we don't need them here.
+// quirks have their own panel so we don't need them here.
 
 GLOBAL_LIST_INIT(admin_visible_traits, list(
 	/atom = list(
@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING,
 		"TRAIT_MOVE_UPSIDE_DOWN" = TRAIT_MOVE_UPSIDE_DOWN,
 		"TRAIT_RUNECHAT_HIDDEN" = TRAIT_RUNECHAT_HIDDEN,
+		"TRAIT_SCARY_FISHERMAN" = TRAIT_SCARY_FISHERMAN,
 		"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
 		"TRAIT_VOIDSTORM_IMMUNE" = TRAIT_VOIDSTORM_IMMUNE,
 		"TRAIT_WEATHER_IMMUNE" = TRAIT_WEATHER_IMMUNE,
@@ -29,14 +30,21 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_AGENDER" = TRAIT_AGENDER,
 		"TRAIT_AGEUSIA" = TRAIT_AGEUSIA,
 		"TRAIT_ALCOHOL_TOLERANCE" = TRAIT_ALCOHOL_TOLERANCE,
+		"TRAIT_ALLOW_HERETIC_CASTING" = TRAIT_ALLOW_HERETIC_CASTING,
+		"TRAIT_ALWAYS_NO_ACCESS" = TRAIT_ALWAYS_NO_ACCESS,
+		"TRAIT_ALWAYS_WANTED" = TRAIT_ALWAYS_WANTED,
 		"TRAIT_ANOSMIA" = TRAIT_ANOSMIA,
+		"TRAIT_ANTENNAE" = TRAIT_ANTENNAE,
 		"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
+		"TRAIT_ANTIMAGIC_NO_SELFBLOCK" = TRAIT_ANTIMAGIC_NO_SELFBLOCK,
 		"TRAIT_ANXIOUS" = TRAIT_ANXIOUS,
 		"TRAIT_BADDNA" = TRAIT_BADDNA,
 		"TRAIT_BADTOUCH" = TRAIT_BADTOUCH,
 		"TRAIT_BALD" = TRAIT_BALD,
+		"TRAIT_BALLOON_SUTRA" = TRAIT_BALLOON_SUTRA,
 		"TRAIT_BATON_RESISTANCE" = TRAIT_BATON_RESISTANCE,
 		"TRAIT_BEAST_EMPATHY" = TRAIT_BEAST_EMPATHY,
+		"TRAIT_BLOB_ALLY" = TRAIT_BLOB_ALLY,
 		"TRAIT_BLOCK_SHUTTLE_MOVEMENT" = TRAIT_BLOCK_SHUTTLE_MOVEMENT,
 		"TRAIT_BLOOD_CLANS" = TRAIT_BLOOD_CLANS,
 		"TRAIT_BLOODSHOT_EYES" = TRAIT_BLOODSHOT_EYES,
@@ -45,21 +53,29 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER,
 		"TRAIT_BYPASS_MEASURES" = TRAIT_BYPASS_MEASURES,
 		"TRAIT_CAN_HOLD_ITEMS" = TRAIT_CAN_HOLD_ITEMS,
+		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP,
+		"TRAIT_CAN_USE_NUKE" = TRAIT_CAN_USE_NUKE,
 		"TRAIT_CANNOT_BE_UNBUCKLED" = TRAIT_CANNOT_BE_UNBUCKLED,
 		"TRAIT_CANNOT_OPEN_PRESENTS" = TRAIT_CANNOT_OPEN_PRESENTS,
+		"TRAIT_CATLIKE_GRACE" = TRAIT_CATLIKE_GRACE,
 		"TRAIT_CHASM_DESTROYED" = TRAIT_CHASM_DESTROYED,
 		"TRAIT_CHUNKYFINGERS_IGNORE_BATON" = TRAIT_CHUNKYFINGERS_IGNORE_BATON,
 		"TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS,
+		"TRAIT_CLEANBOT_WHISPERER" = TRAIT_CLEANBOT_WHISPERER,
+		"TRAIT_CLIFF_WALKER" = TRAIT_CLIFF_WALKER,
 		"TRAIT_CLOWN_ENJOYER" = TRAIT_CLOWN_ENJOYER,
 		"TRAIT_CLUMSY" = TRAIT_CLUMSY,
 		"TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED,
+		"TRAIT_CORPSELOCKED" = TRAIT_CORPSELOCKED,
 		"TRAIT_CRITICAL_CONDITION" = TRAIT_CRITICAL_CONDITION,
 		"TRAIT_CULT_HALO" = TRAIT_CULT_HALO,
 		"TRAIT_DEAF" = TRAIT_DEAF,
 		"TRAIT_DEATHCOMA" = TRAIT_DEATHCOMA,
 		"TRAIT_DEFIB_BLACKLISTED" = TRAIT_DEFIB_BLACKLISTED,
 		"TRAIT_DEPRESSION" = TRAIT_DEPRESSION,
+		"TRAIT_DETECT_STORM" = TRAIT_DETECT_STORM,
 		"TRAIT_DIAGNOSTIC_HUD" = TRAIT_DIAGNOSTIC_HUD,
+		"TRAIT_BOT_PATH_HUD" = TRAIT_BOT_PATH_HUD,
 		"TRAIT_DISCOORDINATED_TOOL_USER" = TRAIT_DISCOORDINATED_TOOL_USER,
 		"TRAIT_DISFIGURED" = TRAIT_DISFIGURED,
 		"TRAIT_DISK_VERIFIER" = TRAIT_DISK_VERIFIER,
@@ -69,43 +85,59 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_DWARF" = TRAIT_DWARF,
 		"TRAIT_EASILY_WOUNDED" = TRAIT_EASILY_WOUNDED,
 		"TRAIT_EASYDISMEMBER" = TRAIT_EASYDISMEMBER,
-		"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
+		"TRAIT_EMOTEMUTE" = TRAIT_EMOTEMUTE,
 		"TRAIT_EMPATH" = TRAIT_EMPATH,
+		"TRAIT_ENTRAILS_READER" = TRAIT_ENTRAILS_READER,
+		"TRAIT_EXAMINE_FISHING_SPOT" = TRAIT_EXAMINE_FISHING_SPOT,
 		"TRAIT_EXAMINE_FITNESS" = TRAIT_EXAMINE_FITNESS,
 		"TRAIT_EXPANDED_FOV" = TRAIT_EXPANDED_FOV,
 		"TRAIT_EXPERT_FISHER" = TRAIT_EXPERT_FISHER,
+		"TRAIT_EXTROVERT" = TRAIT_EXTROVERT,
 		"TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH,
+		"TRAIT_FASTMED" = TRAIT_FASTMED,
 		"TRAIT_FAST_CUFFING" = TRAIT_FAST_CUFFING,
+		"TRAIT_FAST_TYING" = TRAIT_FAST_TYING,
 		"TRAIT_FAT" = TRAIT_FAT,
 		"TRAIT_FEARLESS" = TRAIT_FEARLESS,
 		"TRAIT_FENCE_CLIMBER" = TRAIT_FENCE_CLIMBER,
 		"TRAIT_FIST_MINING" = TRAIT_FIST_MINING,
 		"TRAIT_FIXED_HAIRCOLOR" = TRAIT_FIXED_HAIRCOLOR,
 		"TRAIT_FIXED_MUTANT_COLORS" = TRAIT_FIXED_MUTANT_COLORS,
+		"TRAIT_FLESH_DESIRE" = TRAIT_FLESH_DESIRE,
 		"TRAIT_FLOORED" = TRAIT_FLOORED,
+		"TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION" = TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION,
 		"TRAIT_FORCED_STANDING" = TRAIT_FORCED_STANDING,
 		"TRAIT_FREERUNNING" = TRAIT_FREERUNNING,
+		"TRAIT_FREE_FLOAT_MOVEMENT" = TRAIT_FREE_FLOAT_MOVEMENT,
+		"TRAIT_FREE_HYPERSPACE_MOVEMENT" = TRAIT_FREE_HYPERSPACE_MOVEMENT,
+		"TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT" = TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT,
 		"TRAIT_FRIENDLY" = TRAIT_FRIENDLY,
 		"TRAIT_GAMER" = TRAIT_GAMER,
 		"TRAIT_GAMERGOD" = TRAIT_GAMERGOD,
+		"TRAIT_GARLIC_BREATH" = TRAIT_GARLIC_BREATH,
 		"TRAIT_GENELESS" = TRAIT_GENELESS,
 		"TRAIT_GIANT" = TRAIT_GIANT,
 		"TRAIT_GOOD_HEARING" = TRAIT_GOOD_HEARING,
 		"TRAIT_GRABWEAKNESS" = TRAIT_GRABWEAKNESS,
 		"TRAIT_GREENTEXT_CURSED" = TRAIT_GREENTEXT_CURSED,
 		"TRAIT_GUNFLIP" = TRAIT_GUNFLIP,
+		"TRAIT_GUN_NATURAL" = TRAIT_GUN_NATURAL,
 		"TRAIT_HANDS_BLOCKED" = TRAIT_HANDS_BLOCKED,
 		"TRAIT_HARDLY_WOUNDED" = TRAIT_HARDLY_WOUNDED,
+		"TRAIT_HATED_BY_DOGS" = TRAIT_HATED_BY_DOGS,
+		"TRAIT_HEAVY_DRINKER" = TRAIT_HEAVY_DRINKER,
 		"TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER,
 		"TRAIT_HIDE_EXTERNAL_ORGANS" = TRAIT_HIDE_EXTERNAL_ORGANS,
+		"TRAIT_HIGH_VALUE_RANSOM" = TRAIT_HIGH_VALUE_RANSOM,
 		"TRAIT_HOLY" = TRAIT_HOLY,
 		"TRAIT_HUSK" = TRAIT_HUSK,
+		"TRAIT_ID_APPRAISER" = TRAIT_ID_APPRAISER,
 		"TRAIT_IGNORE_ELEVATION" = TRAIT_IGNORE_ELEVATION,
-		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN,
 		"TRAIT_ILLITERATE" = TRAIT_ILLITERATE,
 		"TRAIT_IMMOBILIZED" = TRAIT_IMMOBILIZED,
 		"TRAIT_INCAPACITATED" = TRAIT_INCAPACITATED,
+		"TRAIT_INTROVERT" = TRAIT_INTROVERT,
 		"TRAIT_INVISIBLE_MAN" = TRAIT_INVISIBLE_MAN,
 		"TRAIT_IWASBATONED" = TRAIT_IWASBATONED,
 		"TRAIT_JOLLY" = TRAIT_JOLLY,
@@ -113,22 +145,28 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_KNOCKEDOUT" = TRAIT_KNOCKEDOUT,
 		"TRAIT_KNOW_ENGI_WIRES" = TRAIT_KNOW_ENGI_WIRES,
 		"TRAIT_KNOW_ROBO_WIRES" = TRAIT_KNOW_ROBO_WIRES,
+		"TRAIT_LIGHTBULB_REMOVER" = TRAIT_LIGHTBULB_REMOVER,
 		"TRAIT_LIGHT_DRINKER" = TRAIT_LIGHT_DRINKER,
 		"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
 		"TRAIT_LIGHTBULB_REMOVER" = TRAIT_LIGHTBULB_REMOVER,
 		"TRAIT_LIMBATTACHMENT" = TRAIT_LIMBATTACHMENT,
 		"TRAIT_LITERATE" = TRAIT_LITERATE,
 		"TRAIT_LIVERLESS_METABOLISM" = TRAIT_LIVERLESS_METABOLISM,
+		"TRAIT_MADNESS_IMMUNE" = TRAIT_MADNESS_IMMUNE,
 		"TRAIT_MAGICALLY_GIFTED" = TRAIT_MAGICALLY_GIFTED,
+		"TRAIT_MARTIAL_ARTS_IMMUNE" = TRAIT_MARTIAL_ARTS_IMMUNE,
 		"TRAIT_MEDICAL_HUD" = TRAIT_MEDICAL_HUD,
 		"TRAIT_MIME_FAN" = TRAIT_MIME_FAN,
 		"TRAIT_MIMING" = TRAIT_MIMING,
 		"TRAIT_MINDSHIELD" = TRAIT_MINDSHIELD,
+		"TRAIT_MOB_HIDE_HAPPINESS" = TRAIT_MOB_HIDE_HAPPINESS,
 		"TRAIT_MORBID" = TRAIT_MORBID,
+		"TRAIT_MULTIZ_SUIT_SENSORS" = TRAIT_MULTIZ_SUIT_SENSORS,
 		"TRAIT_MUSICIAN" = TRAIT_MUSICIAN,
 		"TRAIT_MUTANT_COLORS" = TRAIT_MUTANT_COLORS,
 		"TRAIT_MUTE" = TRAIT_MUTE,
 		"TRAIT_NAIVE" = TRAIT_NAIVE,
+		"TRAIT_NEGATES_GRAVITY" = TRAIT_NEGATES_GRAVITY,
 		"TRAIT_NEVER_WOUNDED" = TRAIT_NEVER_WOUNDED,
 		"TRAIT_NICE_SHOT" = TRAIT_NICE_SHOT,
 		"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
@@ -137,13 +175,18 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_NO_DNA_COPY" = TRAIT_NO_DNA_COPY,
 		"TRAIT_NO_EXTINGUISH" = TRAIT_NO_EXTINGUISH,
 		"TRAIT_NO_GLIDE" = TRAIT_NO_GLIDE,
+		"TRAIT_NO_GUN_AKIMBO" = TRAIT_NO_GUN_AKIMBO,
+		"TRAIT_NO_MINDSWAP" = TRAIT_NO_MINDSWAP,
+		"TRAIT_NO_MIRROR_REFLECTION" = TRAIT_NO_MIRROR_REFLECTION,
 		"TRAIT_NO_PLASMA_TRANSFORM" = TRAIT_NO_PLASMA_TRANSFORM,
 		"TRAIT_NO_SLIP_ALL" = TRAIT_NO_SLIP_ALL,
 		"TRAIT_NO_SLIP_ICE" = TRAIT_NO_SLIP_ICE,
 		"TRAIT_NO_SLIP_SLIDE" = TRAIT_NO_SLIP_SLIDE,
 		"TRAIT_NO_SLIP_WATER" = TRAIT_NO_SLIP_WATER,
 		"TRAIT_NO_SOUL" = TRAIT_NO_SOUL,
+		"TRAIT_NO_STAGGER" = TRAIT_NO_STAGGER,
 		"TRAIT_NO_TRANSFORM" = TRAIT_NO_TRANSFORM,
+		"TRAIT_NO_TWOHANDING" = TRAIT_NO_TWOHANDING,
 		"TRAIT_NO_UNDERWEAR" = TRAIT_NO_UNDERWEAR,
 		"TRAIT_NO_ZOMBIFY" = TRAIT_NO_ZOMBIFY,
 		"TRAIT_NOBLOOD" = TRAIT_NOBLOOD,
@@ -152,15 +195,21 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_NOCRITOVERLAY" = TRAIT_NOCRITOVERLAY,
 		"TRAIT_NODEATH" = TRAIT_NODEATH,
 		"TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER,
+		"TRAIT_NOFAT" = TRAIT_NOFAT,
+		"TRAIT_NOFEAR_HOLDUPS" = TRAIT_NOFEAR_HOLDUPS,
 		"TRAIT_NOFIRE" = TRAIT_NOFIRE,
+		"TRAIT_NOFIRE_SPREAD" = TRAIT_NOFIRE_SPREAD,
 		"TRAIT_NOFLASH" = TRAIT_NOFLASH,
 		"TRAIT_NOGUNS" = TRAIT_NOGUNS,
+		"TRAIT_TOSS_GUN_HARD" = TRAIT_TOSS_GUN_HARD,
 		"TRAIT_NOHARDCRIT" = TRAIT_NOHARDCRIT,
 		"TRAIT_NOHUNGER" = TRAIT_NOHUNGER,
 		"TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE,
 		"TRAIT_NOMOBSWAP" = TRAIT_NOMOBSWAP,
 		"TRAIT_NOSOFTCRIT" = TRAIT_NOSOFTCRIT,
+		"TRAIT_OFF_BALANCE_TACKLER" = TRAIT_OFF_BALANCE_TACKLER,
 		"TRAIT_OIL_FRIED" = TRAIT_OIL_FRIED,
+		"TRAIT_OVERDOSEIMMUNE" = TRAIT_OVERDOSEIMMUNE,
 		"TRAIT_OVERWATCH_IMMUNE" = TRAIT_OVERWATCH_IMMUNE,
 		"TRAIT_PACIFISM" = TRAIT_PACIFISM,
 		"TRAIT_HIPPOCRATIC_OATH" = TRAIT_HIPPOCRATIC_OATH,
@@ -172,6 +221,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_PASSTABLE" = TRAIT_PASSTABLE,
 		"TRAIT_PASSWINDOW" = TRAIT_PASSWINDOW,
 		"TRAIT_PERFECT_ATTACKER" = TRAIT_PERFECT_ATTACKER,
+		"TRAIT_PERMANENTLY_MORTAL" = TRAIT_PERMANENTLY_MORTAL,
 		"TRAIT_PHOTOGRAPHER" = TRAIT_PHOTOGRAPHER,
 		"TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE,
 		"TRAIT_PLANT_SAFE" = TRAIT_PLANT_SAFE,
@@ -182,16 +232,22 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_PROSOPAGNOSIA" = TRAIT_PROSOPAGNOSIA,
 		"TRAIT_PULL_BLOCKED" = TRAIT_PULL_BLOCKED,
 		"TRAIT_PUSHIMMUNE" = TRAIT_PUSHIMMUNE,
+		"TRAIT_QUICK_BUILD" = TRAIT_QUICK_BUILD,
 		"TRAIT_QUICK_CARRY" = TRAIT_QUICK_CARRY,
 		"TRAIT_QUICKER_CARRY" = TRAIT_QUICKER_CARRY,
 		"TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE,
+		"TRAIT_REMOTE_TASTING" = TRAIT_REMOTE_TASTING,
 		"TRAIT_RESISTCOLD" = TRAIT_RESISTCOLD,
 		"TRAIT_RESISTHEAT" = TRAIT_RESISTHEAT,
 		"TRAIT_RESISTHEATHANDS" = TRAIT_RESISTHEATHANDS,
 		"TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE,
 		"TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE,
 		"TRAIT_RESTRAINED" = TRAIT_RESTRAINED,
+		"TRAIT_REVEAL_FISH" = TRAIT_REVEAL_FISH,
+		"TRAIT_ROCK_STONER" = TRAIT_ROCK_STONER,
+		"TRAIT_ROD_SUPLEX" = TRAIT_ROD_SUPLEX,
 		"TRAIT_ROUGHRIDER" = TRAIT_ROUGHRIDER,
+		"TRAIT_SABRAGE_PRO" = TRAIT_SABRAGE_PRO,
 		"TRAIT_SECURITY_HUD" = TRAIT_SECURITY_HUD,
 		"TRAIT_SELF_AWARE" = TRAIT_SELF_AWARE,
 		"TRAIT_SETTLER" = TRAIT_SETTLER,
@@ -199,29 +255,35 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE,
 		"TRAIT_SIGN_LANG" = TRAIT_SIGN_LANG,
 		"TRAIT_SILENT_FOOTSTEPS" = TRAIT_SILENT_FOOTSTEPS,
+		"TRAIT_SILICON_EMOTES_ALLOWED" = TRAIT_SILICON_EMOTES_ALLOWED,
 		"TRAIT_SIXTHSENSE" = TRAIT_SIXTHSENSE,
 		"TRAIT_SKITTISH" = TRAIT_SKITTISH,
 		"TRAIT_SLEEPIMMUNE" = TRAIT_SLEEPIMMUNE,
 		"TRAIT_SLOW_FLIP" = TRAIT_SLOW_FLIP,
 		"TRAIT_SMOKER" = TRAIT_SMOKER,
 		"TRAIT_SNOB" = TRAIT_SNOB,
+		"TRAIT_SOFTSPOKEN" = TRAIT_SOFTSPOKEN,
 		"TRAIT_SOOTHED_THROAT" = TRAIT_SOOTHED_THROAT,
 		"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
 		"TRAIT_SPECIAL_TRAUMA_BOOST" = TRAIT_SPECIAL_TRAUMA_BOOST,
 		"TRAIT_SPIRITUAL" = TRAIT_SPIRITUAL,
 		"TRAIT_STABLEHEART" = TRAIT_STABLEHEART,
 		"TRAIT_STABLELIVER" = TRAIT_STABLELIVER,
+		"TRAIT_STRENGTH" = TRAIT_STRENGTH,
 		"TRAIT_STRONG_GRABBER" = TRAIT_STRONG_GRABBER,
 		"TRAIT_STRONG_STOMACH" = TRAIT_STRONG_STOMACH,
 		"TRAIT_STUBBY_BODY" = TRAIT_STUBBY_BODY,
 		"TRAIT_STUNIMMUNE" = TRAIT_STUNIMMUNE,
 		"TRAIT_STURDY_FRAME" = TRAIT_STURDY_FRAME,
+		"TRAIT_SUPERMATTER_SOOTHER" = TRAIT_SUPERMATTER_SOOTHER,
 		"TRAIT_SURGEON" = TRAIT_SURGEON,
 		"TRAIT_SURGICALLY_ANALYZED" = TRAIT_SURGICALLY_ANALYZED,
 		"TRAIT_TAGGER" = TRAIT_TAGGER,
 		"TRAIT_TENTACLE_IMMUNE" = TRAIT_TENTACLE_IMMUNE,
 		"TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE,
 		"TRAIT_THERMAL_VISION" = TRAIT_THERMAL_VISION,
+		"TRAIT_THROWINGARM" = TRAIT_THROWINGARM,
+		"TRAIT_TIME_STOP_IMMUNE" = TRAIT_TIME_STOP_IMMUNE,
 		"TRAIT_TOXIMMUNE" = TRAIT_TOXIMMUNE,
 		"TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER,
 		"TRAIT_TRAIT_MEDIBOTCOMINGTHROUGH" = TRAIT_MEDIBOTCOMINGTHROUGH,
@@ -237,7 +299,10 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_UNSTABLE" = TRAIT_UNSTABLE,
 		"TRAIT_USED_DNA_VAULT" = TRAIT_USED_DNA_VAULT,
 		"TRAIT_USES_SKINTONES" = TRAIT_USES_SKINTONES,
+		"TRAIT_VENTCRAWLER_ALWAYS" = TRAIT_VENTCRAWLER_ALWAYS,
+		"TRAIT_VENTCRAWLER_NUDE" = TRAIT_VENTCRAWLER_NUDE,
 		"TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE,
+		"TRAIT_VIRUS_RESISTANCE" = TRAIT_VIRUS_RESISTANCE,
 		"TRAIT_VORACIOUS" = TRAIT_VORACIOUS,
 		"TRAIT_WOUND_LICKER" = TRAIT_WOUND_LICKER,
 		"TRAIT_WEAK_SOUL" = TRAIT_WEAK_SOUL,
@@ -248,6 +313,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_XENO_IMMUNE" = TRAIT_XENO_IMMUNE,
 		"TRAIT_XRAY_HEARING" = TRAIT_XRAY_HEARING,
 		"TRAIT_XRAY_VISION" = TRAIT_XRAY_VISION,
+		"TRAIT_MINING_PARRYING" = TRAIT_MINING_PARRYING,
 	),
 	/obj/item = list(
 		"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 4e9777ae9cd8d..a2dda93f4011f 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -31,7 +31,10 @@
 		MiddleClickOn(A, params)
 		return
 	if(LAZYACCESS(modifiers, ALT_CLICK)) // alt and alt-gr (rightalt)
-		A.borg_click_alt(src)
+		if(LAZYACCESS(modifiers, RIGHT_CLICK))
+			AltClickSecondaryOn(A)
+		else
+			A.borg_click_alt(src)
 		return
 	if(LAZYACCESS(modifiers, CTRL_CLICK))
 		CtrlClickOn(A)
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index b4dcfd64d5785..dab8b67350f97 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -549,9 +549,9 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 		construct_owner = null
 
 	// construct track
-	if(construct_owner?.seeking && construct_owner.master)
-		blood_target = construct_owner.master
-		desc = "Your blood sense is leading you to [construct_owner.master]"
+	if(construct_owner?.seeking && construct_owner.construct_master)
+		blood_target = construct_owner.construct_master
+		desc = "Your blood sense is leading you to [construct_owner.construct_master]"
 
 	// cult track
 	var/datum/antagonist/cult/antag = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
index c3b91173a45f5..476140acb1edd 100644
--- a/code/_onclick/hud/alien.dm
+++ b/code/_onclick/hud/alien.dm
@@ -79,6 +79,7 @@
 	using = new /atom/movable/screen/resist(null, src)
 	using.icon = ui_style
 	using.screen_loc = ui_above_movement
+	using.update_appearance()
 	hotkeybuttons += using
 
 	throw_icon = new /atom/movable/screen/throw_catch(null, src)
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 7a0937974bd36..2910a9f0cc829 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -6,7 +6,7 @@
 
 
 //Movable Screen Object
-//Not tied to the grid, places it's center where the cursor is
+//Not tied to the grid, places its center where the cursor is
 
 /atom/movable/screen/movable
 	mouse_drag_pointer = 'icons/effects/mouse_pointers/screen_drag.dmi'
diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm
index 5fa44b7f0542b..371341aec0bf5 100644
--- a/code/_onclick/hud/new_player.dm
+++ b/code/_onclick/hud/new_player.dm
@@ -63,8 +63,7 @@
 
 ///Set the HUD in New, as lobby screens are made before Atoms are Initialized.
 /atom/movable/screen/lobby/New(loc, datum/hud/our_hud, ...)
-	if(our_hud)
-		hud = our_hud
+	set_new_hud(our_hud)
 	return ..()
 
 ///Run sleeping actions after initialize
diff --git a/code/_onclick/hud/parallax/parallax.dm b/code/_onclick/hud/parallax/parallax.dm
index bcdcd0e74fed1..0a3732e134fc4 100644
--- a/code/_onclick/hud/parallax/parallax.dm
+++ b/code/_onclick/hud/parallax/parallax.dm
@@ -275,7 +275,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer)
 	. = ..()
 	// Parallax layers are independant of hud, they care about client
 	// Not doing this will just create a bunch of hard deletes
-	hud = null
+	set_new_hud(hud_owner = null)
 
 	if(template)
 		return
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index 6c7377c382543..dc425083ad896 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -7,6 +7,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	icon = 'icons/hud/radial.dmi'
 	plane = ABOVE_HUD_PLANE
 	vis_flags = VIS_INHERIT_PLANE
+	var/click_on_hover = FALSE
 	var/datum/radial_menu/parent
 
 /atom/movable/screen/radial/proc/set_parent(new_value)
@@ -39,6 +40,8 @@ GLOBAL_LIST_EMPTY(radial_menus)
 		icon_state = "[parent.radial_slice_icon]_focus"
 	if(tooltips)
 		openToolTip(usr, src, params, title = name)
+	if (click_on_hover && !isnull(usr) && !isnull(parent))
+		Click(location, control, params)
 
 /atom/movable/screen/radial/slice/MouseExited(location, control, params)
 	. = ..()
@@ -146,7 +149,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 			starting_angle = 180
 			ending_angle = 45
 
-/datum/radial_menu/proc/setup_menu(use_tooltips, set_page = 1)
+/datum/radial_menu/proc/setup_menu(use_tooltips, set_page = 1, click_on_hover = FALSE)
 	if(ending_angle > starting_angle)
 		zone = ending_angle - starting_angle
 	else
@@ -183,18 +186,26 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	page_data[page] = current
 	pages = page
 	current_page = clamp(set_page, 1, pages)
-	update_screen_objects(anim = entry_animation)
+	update_screen_objects(entry_animation, click_on_hover)
 
-/datum/radial_menu/proc/update_screen_objects(anim = FALSE)
+/datum/radial_menu/proc/update_screen_objects(anim = FALSE, click_on_hover = FALSE)
 	var/list/page_choices = page_data[current_page]
 	var/angle_per_element = round(zone / page_choices.len)
 	for(var/i in 1 to elements.len)
-		var/atom/movable/screen/radial/E = elements[i]
+		var/atom/movable/screen/radial/element = elements[i]
 		var/angle = WRAP(starting_angle + (i - 1) * angle_per_element,0,360)
 		if(i > page_choices.len)
-			HideElement(E)
+			HideElement(element)
+			element.click_on_hover = FALSE
 		else
-			SetElement(E,page_choices[i],angle,anim = anim,anim_order = i)
+			SetElement(element,page_choices[i],angle,anim = anim,anim_order = i)
+			// Only activate click on hover after the animation plays
+			if (!click_on_hover)
+				continue
+			if (anim)
+				addtimer(VARSET_CALLBACK(element, click_on_hover, TRUE), i * 0.5)
+			else
+				element.click_on_hover = TRUE
 
 /datum/radial_menu/proc/HideElement(atom/movable/screen/radial/slice/E)
 	E.cut_overlays()
@@ -272,7 +283,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 /datum/radial_menu/proc/get_next_id()
 	return "c_[choices.len]"
 
-/datum/radial_menu/proc/set_choices(list/new_choices, use_tooltips, set_page = 1)
+/datum/radial_menu/proc/set_choices(list/new_choices, use_tooltips, click_on_hover = FALSE, set_page = 1)
 	if(choices.len)
 		Reset()
 	for(var/E in new_choices)
@@ -286,7 +297,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 
 			if (istype(new_choices[E], /datum/radial_menu_choice))
 				choice_datums[id] = new_choices[E]
-	setup_menu(use_tooltips, set_page)
+	setup_menu(use_tooltips, set_page, click_on_hover)
 
 /datum/radial_menu/proc/extract_image(to_extract_from)
 	if (istype(to_extract_from, /datum/radial_menu_choice))
@@ -345,7 +356,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	Choices should be a list where list keys are movables or text used for element names and return value
 	and list values are movables/icons/images used for element icons
 */
-/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check, require_near = FALSE, tooltips = FALSE, no_repeat_close = FALSE, radial_slice_icon = "radial_slice", autopick_single_option = TRUE)
+/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check, require_near = FALSE, tooltips = FALSE, no_repeat_close = FALSE, radial_slice_icon = "radial_slice", autopick_single_option = TRUE, entry_animation = TRUE, click_on_hover = FALSE)
 	if(!user || !anchor || !length(choices))
 		return
 
@@ -362,6 +373,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 		return
 
 	var/datum/radial_menu/menu = new
+	menu.entry_animation = entry_animation
 	GLOB.radial_menus[uniqueid] = menu
 	if(radius)
 		menu.radius = radius
@@ -370,7 +382,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	menu.anchor = anchor
 	menu.radial_slice_icon = radial_slice_icon
 	menu.check_screen_border(user) //Do what's needed to make it look good near borders or on hud
-	menu.set_choices(choices, tooltips)
+	menu.set_choices(choices, tooltips, click_on_hover)
 	menu.show_to(user)
 	menu.wait(user, anchor, require_near)
 	var/answer = menu.selected_choice
diff --git a/code/_onclick/hud/rendering/_render_readme.md b/code/_onclick/hud/rendering/_render_readme.md
index 2c1cd559a58db..2c5e9875801b6 100644
--- a/code/_onclick/hud/rendering/_render_readme.md
+++ b/code/_onclick/hud/rendering/_render_readme.md
@@ -8,7 +8,7 @@
 ## Byond internal functionality
 This part of the guide will assume that you have read the byond reference entry for rendering at www.byond.com/docs/ref//#/{notes}/renderer
 
-When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriosly slow, but we can see it's tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag.
+When you create an atom, this will always create an internal byond structure called an "appearance". This appearance you will likely be familiar with, as it is exposed through the /atom/var/appearance var. This appearance var holds data on how to render the object, ie what icon/icon_state/color etc it is using. Note that appearance vars will always copy, and do not hold a reference. When you update a var, for example lets pretend we add a filter, the appearance will be updated to include the filter. Note that, however, vis_contents objets are uniquely excluded from appearances. Then, when the filter is updated, the appearance will be recreated, and the atom marked as "dirty". After it has been updated, the SendMaps() function (sometimes also called maptick), which is a internal byond function that iterates over all objects in a clients view and in the clients.mob.contents, checks for "dirty" atoms, then resends any "dirty" appearances to clients as needed and unmarks them as dirty. This function is notoriosly slow, but we can see its tick usage through the world.map_cpu var. We can also avoid more complex checks checking whether an object is visible on a clients screen by using the TILE_BOUND appearance flag.
 
 Finally, we arrive at clientside behavior, where we have two main clientside functions: GetMapIcons, and Render. GetMapIcons is repsonsible for actual rendering calculations on the clientside, such as "Group Icons and Set bounds", which performs clientside calculations for transform matrixes. Note that particles here are handled in a separate thread and are not diplayed in the clientside profiler. Render handles the actual drawing of the screen.
 
diff --git a/code/_onclick/hud/rendering/render_plate.dm b/code/_onclick/hud/rendering/render_plate.dm
index e84663529825b..e4cdc41ca1cfb 100644
--- a/code/_onclick/hud/rendering/render_plate.dm
+++ b/code/_onclick/hud/rendering/render_plate.dm
@@ -6,7 +6,7 @@
 
 
 /**
- * Render relay object assigned to a plane master to be able to relay it's render onto other planes that are not it's own
+ * Render relay object assigned to a plane master to be able to relay its render onto other planes that are not its own
  */
 /atom/movable/render_plane_relay
 	screen_loc = "CENTER"
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 8cc29740870ca..d0f6426254936 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -45,8 +45,9 @@
 
 /atom/movable/screen/Initialize(mapload, datum/hud/hud_owner)
 	. = ..()
-	if(hud_owner && istype(hud_owner))
-		hud = hud_owner
+	if(isnull(hud_owner)) //some screens set their hud owners on /new, this prevents overriding them with null post atoms init
+		return
+	set_new_hud(hud_owner)
 
 /atom/movable/screen/Destroy()
 	master_ref = null
@@ -72,10 +73,25 @@
 /atom/movable/screen/proc/component_click(atom/movable/screen/component_button/component, params)
 	return
 
+///setter used to set our new hud
+/atom/movable/screen/proc/set_new_hud(datum/hud/hud_owner)
+	if(hud)
+		UnregisterSignal(hud, COMSIG_QDELETING)
+	if(isnull(hud_owner))
+		hud = null
+		return
+	hud = hud_owner
+	RegisterSignal(hud, COMSIG_QDELETING, PROC_REF(on_hud_delete))
+
 /// Returns the mob this is being displayed to, if any
 /atom/movable/screen/proc/get_mob()
 	return hud?.mymob
 
+/atom/movable/screen/proc/on_hud_delete(datum/source)
+	SIGNAL_HANDLER
+
+	set_new_hud(hud_owner = null)
+
 /atom/movable/screen/text
 	icon = null
 	icon_state = null
@@ -466,8 +482,26 @@
 
 	return TRUE
 
+/atom/movable/screen/storage/cell
+
+/atom/movable/screen/storage/cell/mouse_drop_receive(atom/target, mob/living/user, params)
+	var/datum/storage/storage = master_ref?.resolve()
+
+	if (isnull(storage) || !istype(user) || storage != user.active_storage)
+		return
+
+	if (!user.can_perform_action(storage.parent, FORBID_TELEKINESIS_REACH))
+		return
+
+	if (target.loc != storage.real_location)
+		return
+
+	/// Due to items in storage ignoring transparency for click hitboxes, this only can happen if we drag onto a free cell - aka after all current contents
+	storage.real_location.contents -= target
+	storage.real_location.contents += target
+	storage.refresh_views()
+
 /atom/movable/screen/storage/corner
-	name = "storage"
 	icon_state = "storage_corner_topleft"
 
 /atom/movable/screen/storage/corner/top_right
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index a5c2035b9394d..17de9f9d5cb77 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -200,14 +200,12 @@
  * * params - Click params of this attack
  */
 /obj/item/proc/attack(mob/living/target_mob, mob/living/user, params)
-	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params)
+	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, target_mob, user, params) || SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
 	if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return TRUE
 	if(signal_return & COMPONENT_SKIP_ATTACK)
 		return FALSE
 
-	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, target_mob, user, params)
-
 	if(item_flags & NOBLUDGEON)
 		return FALSE
 
@@ -253,7 +251,7 @@
 
 /// The equivalent of the standard version of [/obj/item/proc/attack] but for non mob targets.
 /obj/item/proc/attack_atom(atom/attacked_atom, mob/living/user, params)
-	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_ATOM, attacked_atom, user)
+	var/signal_return = SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_ATOM, attacked_atom, user) | SEND_SIGNAL(user, COMSIG_LIVING_ATTACK_ATOM, attacked_atom)
 	if(signal_return & COMPONENT_SKIP_ATTACK)
 		return TRUE
 	if(signal_return & COMPONENT_CANCEL_ATTACK_CHAIN)
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 0dd8ee0a582f6..2f1465ac4ffe2 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -200,7 +200,8 @@
 /atom/proc/attack_paw(mob/user, list/modifiers)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
 		return TRUE
-	return FALSE
+	if(interaction_flags_atom & INTERACT_ATOM_ATTACK_PAW)
+		. = _try_interact(user)
 
 
 /*
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 30fdfe389ffe4..72df7ceeb9777 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -70,6 +70,7 @@
 /// Determines how fast traitors scale in general.
 /datum/config_entry/number/traitor_scaling_multiplier
 	default = 1
+	integer = FALSE
 	min_val = 0.01
 
 /// Determines how many potential objectives a traitor can have.
@@ -265,7 +266,7 @@
 /datum/config_entry/flag/roundstart_away //Will random away mission be loaded.
 
 /datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled.
-	default = 18000
+	default = 30 MINUTES
 	integer = FALSE
 	min_val = 0
 
@@ -274,6 +275,16 @@
 	min_val = 0
 	max_val = 100
 
+///An override to gateway_delay for specific maps or start points
+/datum/config_entry/keyed_list/gateway_delays_by_id
+	default = list(
+		AWAYSTART_BEACH = 5 MINUTES, //Chill RP zone
+		AWAYSTART_MUSEUM = 12 MINUTES, //Chill place with some cool puzzles and effects.
+	)
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+	lowercase_key = FALSE //The macros are written the exact same way as their values, only without the quotation marks.
+
 /datum/config_entry/flag/ghost_interaction
 
 /datum/config_entry/flag/near_death_experience //If carbons can hear ghosts when unconscious and very close to death
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index a7dbc38f68bcd..109a82a697e47 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -278,7 +278,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie
 		Initialize(20, TRUE, FALSE)
 
 // Please don't stuff random bullshit here,
-// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize()
+// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in its Initialize()
 /datum/controller/master/Initialize(delay, init_sss, tgs_prime)
 	set waitfor = 0
 
diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm
index be70843f930ec..080343de01058 100644
--- a/code/controllers/subsystem/blackbox.dm
+++ b/code/controllers/subsystem/blackbox.dm
@@ -190,7 +190,7 @@ feedback data can be recorded in 5 formats:
 	used to track the number of occurances of multiple related values i.e. how many times each type of gun is fired
 	further calls to the same key will:
 		add or subtract from the saved value of the data key if it already exists
-		append the key and it's value if it doesn't exist
+		append the key and its value if it doesn't exist
 	calls: SSblackbox.record_feedback("tally", "example", 1, "sample data")
 			SSblackbox.record_feedback("tally", "example", 4, "sample data")
 			SSblackbox.record_feedback("tally", "example", 2, "other data")
@@ -202,7 +202,7 @@ feedback data can be recorded in 5 formats:
 	all data list elements must be strings
 	further calls to the same key will:
 		add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position
-		append the key and it's value if it doesn't exist
+		append the key and its value if it doesn't exist
 	calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot"))
 			SSblackbox.record_feedback("nested tally", "example", 2, list("fruit", "orange", "orange"))
 			SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange", "apricot"))
diff --git a/code/controllers/subsystem/discord.dm b/code/controllers/subsystem/discord.dm
index 7efdbfcda6a55..5fd1db1fd074d 100644
--- a/code/controllers/subsystem/discord.dm
+++ b/code/controllers/subsystem/discord.dm
@@ -140,9 +140,9 @@ SUBSYSTEM_DEF(discord)
  * ```
  *
  * Notes:
- * * The token is guaranteed to unique during it's validity period
+ * * The token is guaranteed to unique during its validity period
  * * The validity period is currently set at 4 hours
- * * a token may not be unique outside it's validity window (to reduce conflicts)
+ * * a token may not be unique outside its validity window (to reduce conflicts)
  *
  * Arguments:
  * * ckey_for a string representing the ckey this token is for
diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm
index 42db40c948ca5..6fe31e962d109 100644
--- a/code/controllers/subsystem/dynamic/dynamic.dm
+++ b/code/controllers/subsystem/dynamic/dynamic.dm
@@ -530,6 +530,8 @@ SUBSYSTEM_DEF(dynamic)
 	//To new_player and such, and we want the datums to just free when the roundstart work is done
 	var/list/roundstart_rules = init_rulesets(/datum/dynamic_ruleset/roundstart)
 
+	var/security = 0 // BANDASTATION EDIT - Force players to play Sec
+
 	SSjob.DivideOccupations(pure = TRUE, allow_all = TRUE)
 	for(var/i in GLOB.new_player_list)
 		var/mob/dead/new_player/player = i
@@ -545,12 +547,26 @@ SUBSYSTEM_DEF(dynamic)
 			else
 				roundstart_pop_ready++
 				candidates.Add(player)
+				// BANDASTATION EDIT START - Force players to play Sec
+				if(player.mind?.assigned_role?.departments_list?.Find(/datum/job_department/security))
+					security++
+				// BANDASTATION EDIT END
 	SSjob.ResetOccupations()
 	log_dynamic("Listing [roundstart_rules.len] round start rulesets, and [candidates.len] players ready.")
 	if (candidates.len <= 0)
 		log_dynamic("[candidates.len] candidates.")
 		return TRUE
 
+	// BANDASTATION EDIT START - Force players to play Sec
+	if(security < CONFIG_GET(number/roundstart_security_for_threat))
+		var/roundstart_budget_low_sec = security / CONFIG_GET(number/roundstart_security_for_threat) * round_start_budget
+		var/transfer_to_midround = round_start_budget - roundstart_budget_low_sec
+		mid_round_budget += transfer_to_midround
+		round_start_budget = roundstart_budget_low_sec
+		initial_round_start_budget = roundstart_budget_low_sec
+		log_dynamic("Not enough security; forcing roundstart budget to [roundstart_budget_low_sec]")
+	// BANDASTATION EDIT END
+
 	if(GLOB.dynamic_forced_roundstart_ruleset.len > 0)
 		rigged_roundstart()
 	else
@@ -1003,7 +1019,7 @@ SUBSYSTEM_DEF(dynamic)
 #define MAXIMUM_DYN_DISTANCE 5
 
 /**
- * Returns the comulative distribution of threat centre and width, and a random location of -0.5 to 0.5
+ * Returns the comulative distribution of threat centre and width, and a random location of -5 to 5
  * plus or minus the otherwise unattainable lower and upper percentiles. All multiplied by the maximum
  * threat and then rounded to the nearest interval.
  * rand() calls without arguments returns a value between 0 and 1, allowing for smaller intervals.
diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
index e19855f6fd114..30c572dba7716 100644
--- a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
+++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
@@ -327,7 +327,7 @@
 	new_malf_ai.mind.special_role = antag_flag
 	new_malf_ai.mind.add_antag_datum(malf_antag_datum)
 	if(prob(MALF_ION_PROB))
-		priority_announce("Вблизи станции обнаружен ионный шторм. Пожалуйста, проверьте все оборудование, управляемое ИИ, на наличие ошибок.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_IONSTORM)
+		priority_announce("Вблизи станции обнаружен ионный шторм. Пожалуйста, проверьте все оборудование, управляемое ИИ, на наличие ошибок.", "Обнаружена аномалия", ANNOUNCER_IONSTORM)
 		if(prob(REPLACE_LAW_WITH_ION_PROB))
 			new_malf_ai.replace_random_law(generate_ion_law(), list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION), LAW_ION)
 		else
@@ -615,7 +615,7 @@
 	playsound(S, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
 	message_admins("[ADMIN_LOOKUPFLW(S)] has been made into a Space Dragon by the midround ruleset.")
 	log_dynamic("[key_name(S)] was spawned as a Space Dragon by the midround ruleset.")
-	priority_announce("Зафиксирован большой поток органической энергии вблизи станции [station_name()]. Будьте наготове.", "Внимание: неопознанные формы жизни")
+	priority_announce("Зафиксирован большой поток органической энергии вблизи станции [station_name()]. Будьте наготове.", "Неопознанные формы жизни")
 	return S
 
 /datum/dynamic_ruleset/midround/from_ghosts/abductors
@@ -949,3 +949,44 @@
 
 #undef MALF_ION_PROB
 #undef REPLACE_LAW_WITH_ION_PROB
+
+/// Midround Voidwalker Ruleset (From Ghosts)
+/datum/dynamic_ruleset/midround/from_ghosts/voidwalker
+	name = "Voidwalker"
+	midround_ruleset_style = MIDROUND_RULESET_STYLE_LIGHT
+	antag_datum = /datum/antagonist/voidwalker
+	antag_flag = ROLE_VOIDWALKER
+	antag_flag_override = ROLE_VOIDWALKER
+	ruleset_category = parent_type::ruleset_category |  RULESET_CATEGORY_NO_WITTING_CREW_ANTAGONISTS
+	required_enemies = list(2,2,1,1,1,1,1,0,0,0)
+	required_candidates = 1
+	weight = 2
+	cost = 5
+	minimum_players = 40
+	repeatable = TRUE
+	signup_item_path = /obj/item/cosmic_skull
+	ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_VOIDWALKER_VOID)
+	/// The space turf we find in acceptable(), cached for ease
+	var/space_turf
+
+/datum/dynamic_ruleset/midround/from_ghosts/voidwalker/acceptable(population = 0, threat_level = 0)
+	space_turf = find_space_spawn()
+	// Space only antag and will die on planetary gravity.
+	if(SSmapping.is_planetary() || !space_turf)
+		return FALSE
+	return ..()
+
+/datum/dynamic_ruleset/midround/from_ghosts/voidwalker/generate_ruleset_body(mob/applicant)
+	var/datum/mind/player_mind = new /datum/mind(applicant.key)
+	player_mind.active = TRUE
+
+	var/mob/living/carbon/human/voidwalker = new (space_turf)
+	player_mind.transfer_to(voidwalker)
+	player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/voidwalker))
+	player_mind.special_role = antag_flag
+	player_mind.add_antag_datum(antag_datum)
+
+	playsound(voidwalker, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
+	message_admins("[ADMIN_LOOKUPFLW(voidwalker)] has been made into a Voidwalker by the midround ruleset.")
+	log_dynamic("[key_name(voidwalker)] was spawned as a Voidwalker by the midround ruleset.")
+	return voidwalker
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index b117a35718196..897bf0c4549ba 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -66,7 +66,7 @@ SUBSYSTEM_DEF(events)
 	scheduled = world.time + rand(frequency_lower, max(frequency_lower,frequency_upper))
 
 /**
- * Selects a random event based on whether it can occur and it's 'weight'(probability)
+ * Selects a random event based on whether it can occur and its 'weight'(probability)
  *
  * Arguments:
  * * excluded_event - The event path we will be foregoing, if present.
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index 706b4e51d690f..ad1b9e4132fed 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -346,6 +346,7 @@ SUBSYSTEM_DEF(garbage)
 /// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
 /proc/qdel(datum/to_delete, force = FALSE)
 	if(!istype(to_delete))
+		DREAMLUAU_CLEAR_REF_USERDATA(to_delete)
 		del(to_delete)
 		return
 
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 697beaee19b39..b1629237dc6bf 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -741,9 +741,11 @@ SUBSYSTEM_DEF(job)
 	if(!spawn_turf)
 		SendToLateJoin(living_mob)
 	else
-		var/obj/structure/closet/supplypod/centcompod/toLaunch = new()
-		living_mob.forceMove(toLaunch)
-		new /obj/effect/pod_landingzone(spawn_turf, toLaunch)
+		podspawn(list(
+			"target" = spawn_turf,
+			"path" = /obj/structure/closet/supplypod/centcompod,
+			"spawn" = living_mob
+		))
 
 /// Returns a list of minds of all heads of staff who are alive
 /datum/controller/subsystem/job/proc/get_living_heads()
diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm
index 59ff294e959a2..24d871d2f09c4 100644
--- a/code/controllers/subsystem/lighting.dm
+++ b/code/controllers/subsystem/lighting.dm
@@ -26,6 +26,19 @@ SUBSYSTEM_DEF(lighting)
 
 	return SS_INIT_SUCCESS
 
+
+/datum/controller/subsystem/lighting/proc/create_all_lighting_objects()
+	for(var/area/area as anything in GLOB.areas)
+		if(!area.static_lighting)
+			continue
+		for (var/list/zlevel_turfs as anything in area.get_zlevel_turf_lists())
+			for(var/turf/area_turf as anything in zlevel_turfs)
+				if(area_turf.space_lit)
+					continue
+				new /datum/lighting_object(area_turf)
+			CHECK_TICK
+		CHECK_TICK
+
 /datum/controller/subsystem/lighting/fire(resumed, init_tick_checks)
 	MC_SPLIT_TICK_INIT(3)
 	if(!init_tick_checks)
diff --git a/code/controllers/subsystem/lua.dm b/code/controllers/subsystem/lua.dm
index 1ab88a01746b7..99df8cf335490 100644
--- a/code/controllers/subsystem/lua.dm
+++ b/code/controllers/subsystem/lua.dm
@@ -2,7 +2,6 @@ SUBSYSTEM_DEF(lua)
 	name = "Lua Scripting"
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	wait = 0.1 SECONDS
-	flags = SS_OK_TO_FAIL_INIT
 
 	/// A list of all lua states
 	var/list/datum/lua_state/states = list()
@@ -18,31 +17,19 @@ SUBSYSTEM_DEF(lua)
 	var/list/current_run = list()
 	var/list/current_states_run = list()
 
-	/// Protects return values from getting GCed before getting converted to lua values
-	/// Gets cleared every tick.
-	var/list/gc_guard = list()
+	var/list/needs_gc_cycle = list()
 
 /datum/controller/subsystem/lua/Initialize()
-	if(!CONFIG_GET(flag/auxtools_enabled))
-		warning("SSlua requires auxtools to be enabled to run.")
-		return SS_INIT_NO_NEED
-
-	try
-		// Initialize the auxtools library
-		AUXTOOLS_CHECK(AUXLUA)
-
-		// Set the wrappers for setting vars and calling procs
-		__lua_set_set_var_wrapper("/proc/wrap_lua_set_var")
-		__lua_set_datum_proc_call_wrapper("/proc/wrap_lua_datum_proc_call")
-		__lua_set_global_proc_call_wrapper("/proc/wrap_lua_global_proc_call")
-		__lua_set_print_wrapper("/proc/wrap_lua_print")
-		return SS_INIT_SUCCESS
-	catch(var/exception/e)
-		// Something went wrong, best not allow the subsystem to run
-		var/crash_message = "Error initializing SSlua: [e.name]"
-		initialization_failure_message = crash_message
-		warning(crash_message)
-		return SS_INIT_FAILURE
+	DREAMLUAU_SET_EXECUTION_LIMIT_SECS(5)
+	// Set wrappers to ensure that lua scripts are subject to the same safety restrictions as other admin tooling
+	DREAMLUAU_SET_NEW_WRAPPER("/proc/_new")
+	DREAMLUAU_SET_VAR_GET_WRAPPER("/proc/wrap_lua_get_var")
+	DREAMLUAU_SET_VAR_SET_WRAPPER("/proc/wrap_lua_set_var")
+	DREAMLUAU_SET_OBJECT_CALL_WRAPPER("/proc/wrap_lua_datum_proc_call")
+	DREAMLUAU_SET_GLOBAL_CALL_WRAPPER("/proc/wrap_lua_global_proc_call")
+	// Set the print wrapper, as otherwise, the print function is meaningless
+	DREAMLUAU_SET_PRINT_WRAPPER("/proc/wrap_lua_print")
+	return SS_INIT_SUCCESS
 
 /datum/controller/subsystem/lua/OnConfigLoad()
 	// Read the paths from the config file
@@ -52,9 +39,6 @@ SUBSYSTEM_DEF(lua)
 		lua_path += path
 	world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";"))
 
-/datum/controller/subsystem/lua/Shutdown()
-	AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
-
 /datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments)
 	if(!initialized)
 		return
@@ -64,36 +48,33 @@ SUBSYSTEM_DEF(lua)
 		arguments = list()
 	else if(!islist(arguments))
 		arguments = list(arguments)
+	else
+		var/list/args_list = arguments
+		arguments = args_list.Copy()
 	resumes += list(list("state" = state, "index" = index, "arguments" = arguments))
 
-/datum/controller/subsystem/lua/proc/kill_task(datum/lua_state/state, list/task_info)
+/datum/controller/subsystem/lua/proc/kill_task(datum/lua_state/state, is_sleep, index)
 	if(!istype(state))
 		return
-	if(!islist(task_info))
-		return
-	if(!(istext(task_info["name"]) && istext(task_info["status"]) && isnum(task_info["index"])))
-		return
-	switch(task_info["status"])
-		if("sleep")
-			var/task_index = task_info["index"]
-			var/state_index = 1
-
-			// Get the nth sleep in the sleep list corresponding to the target state
-			for(var/i in 1 to length(sleeps))
-				var/datum/lua_state/sleeping_state = sleeps[i]
-				if(sleeping_state == state)
-					if(state_index == task_index)
-						sleeps.Cut(i, i+1)
-						break
-					state_index++
-		if("yield")
-			// Remove the resumt from the resumt list
-			for(var/i in 1 to length(resumes))
-				var/resume = resumes[i]
-				if(resume["state"] == state && resume["index"] == task_info["index"])
-					resumes.Cut(i, i+1)
+	if(is_sleep)
+		var/state_index = 1
+
+		// Get the nth sleep in the sleep list corresponding to the target state
+		for(var/i in 1 to length(sleeps))
+			var/datum/lua_state/sleeping_state = sleeps[i]
+			if(sleeping_state == state)
+				if(state_index == index)
+					sleeps.Cut(i, i+1)
 					break
-	state.kill_task(task_info)
+				state_index++
+	else
+		// Remove the resumt from the resumt list
+		for(var/i in 1 to length(resumes))
+			var/resume = resumes[i]
+			if(resume["state"] == state && resume["index"] == index)
+				resumes.Cut(i, i+1)
+				break
+	state.kill_task(is_sleep, index)
 
 /datum/controller/subsystem/lua/fire(resumed)
 	// Each fire of SSlua awakens every sleeping task in the order they slept,
@@ -104,7 +85,6 @@ SUBSYSTEM_DEF(lua)
 		sleeps.Cut()
 		resumes.Cut()
 
-	gc_guard.Cut()
 	var/list/current_sleeps = current_run["sleeps"]
 	var/list/affected_states = list()
 	while(length(current_sleeps))
@@ -147,6 +127,32 @@ SUBSYSTEM_DEF(lua)
 		if(MC_TICK_CHECK)
 			break
 
+	while(length(needs_gc_cycle))
+		var/datum/lua_state/state = needs_gc_cycle[needs_gc_cycle.len]
+		needs_gc_cycle.len--
+		state.collect_garbage()
+
 	// Update every lua editor TGUI open for each state that had a task awakened or resumed
 	for(var/datum/lua_state/state in affected_states)
 		INVOKE_ASYNC(state, TYPE_PROC_REF(/datum/lua_state, update_editors))
+
+/datum/controller/subsystem/lua/proc/log_involved_runtime(exception/runtime, list/desclines, list/lua_stacks)
+	var/list/json_data = list("status" = "runtime", "file" = runtime.file, "line" = runtime.line, "message" = runtime.name, "stack" = list())
+	var/level = 1
+	for(var/line in desclines)
+		line = copytext(line, 3)
+		if(starts_with_any(line, list(
+				"/datum/lua_state (/datum/lua_state): load script",
+				"/datum/lua_state (/datum/lua_state): call function",
+				"/datum/lua_state (/datum/lua_state): awaken",
+				"/datum/lua_state (/datum/lua_state): resume"
+			)))
+			json_data["stack"] += lua_stacks[level]
+			level++
+		json_data["stack"] += line
+	for(var/datum/weakref/state_ref as anything in GLOB.lua_state_stack)
+		var/datum/lua_state/state = state_ref.resolve()
+		if(!state)
+			continue
+		state.log_result(json_data)
+	return
diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm
index 3e07eca8a2e87..a9950f1f4d865 100644
--- a/code/controllers/subsystem/machines.dm
+++ b/code/controllers/subsystem/machines.dm
@@ -11,10 +11,19 @@ SUBSYSTEM_DEF(machines)
 	VAR_PRIVATE/list/all_machines = list()
 
 	var/list/processing = list()
+	var/list/processing_early = list()
+	var/list/processing_late = list()
+	var/list/processing_apcs = list()
+
 	var/list/currentrun = list()
-	var/list/apc_early_processing = list()
-	var/list/apc_late_processing = list()
-	var/current_part = SSMACHINES_APCS_EARLY
+	var/current_part = SSMACHINES_MACHINES_EARLY
+	var/list/apc_steps = list(
+		SSMACHINES_APCS_EARLY,
+		SSMACHINES_APCS_ENVIRONMENT,
+		SSMACHINES_APCS_LIGHTS,
+		SSMACHINES_APCS_EQUIPMENT,
+		SSMACHINES_APCS_LATE
+		)
 	///List of all powernets on the server.
 	var/list/datum/powernet/powernets = list()
 
@@ -82,25 +91,53 @@ SUBSYSTEM_DEF(machines)
 	if (!resumed)
 		for(var/datum/powernet/powernet as anything in powernets)
 			powernet.reset() //reset the power state.
-		current_part = SSMACHINES_APCS_EARLY
-		src.currentrun = apc_early_processing.Copy()
+		current_part = SSMACHINES_MACHINES_EARLY
+		src.currentrun = processing_early.Copy()
 
-	//APC early processing. Draws static power usages from their grids.
-	if(current_part == SSMACHINES_APCS_EARLY)
+	//Processing machines that get the priority power draw
+	if(current_part == SSMACHINES_MACHINES_EARLY)
+		//cache for sanic speed (lists are references anyways)
+		var/list/currentrun = src.currentrun
+		while(currentrun.len)
+			var/obj/machinery/thing = currentrun[currentrun.len]
+			currentrun.len--
+			if(QDELETED(thing) || thing.process_early(wait * 0.1) == PROCESS_KILL)
+				processing_early -= thing
+				thing.datum_flags &= ~DF_ISPROCESSING
+			if (MC_TICK_CHECK)
+				return
+		current_part = apc_steps[1]
+		src.currentrun = processing_apcs.Copy()
+
+	//Processing APCs
+	while(current_part in apc_steps)
 		//cache for sanic speed (lists are references anyways)
 		var/list/currentrun = src.currentrun
 		while(currentrun.len)
 			var/obj/machinery/power/apc/apc = currentrun[currentrun.len]
 			currentrun.len--
-			if(QDELETED(apc) || apc.early_process(wait * 0.1) == PROCESS_KILL)
-				apc_early_processing -= apc
+			if(QDELETED(apc))
+				processing_apcs -= apc
 				apc.datum_flags &= ~DF_ISPROCESSING
+			switch(current_part)
+				if(SSMACHINES_APCS_EARLY)
+					apc.early_process(wait * 0.1)
+				if(SSMACHINES_APCS_LATE)
+					apc.charge_channel(null, wait * 0.1)
+					apc.late_process(wait * 0.1)
+				else
+					apc.charge_channel(current_part, wait * 0.1)
 			if(MC_TICK_CHECK)
 				return
-		current_part = SSMACHINES_MACHINES
-		src.currentrun = processing.Copy()
-
-	//General machine processing. Their power usage can be dynamic and based on surplus power, so they come after static power usage have been applied.
+		var/next_index = apc_steps.Find(current_part) + 1
+		if (next_index > apc_steps.len)
+			current_part = SSMACHINES_MACHINES
+			src.currentrun = processing.Copy()
+			break
+		current_part = apc_steps[next_index]
+		src.currentrun = processing_apcs.Copy()
+
+	//Processing all machines
 	if(current_part == SSMACHINES_MACHINES)
 		//cache for sanic speed (lists are references anyways)
 		var/list/currentrun = src.currentrun
@@ -112,21 +149,20 @@ SUBSYSTEM_DEF(machines)
 				thing.datum_flags &= ~DF_ISPROCESSING
 			if (MC_TICK_CHECK)
 				return
-		current_part = SSMACHINES_APCS_LATE
-		src.currentrun = apc_late_processing.Copy()
+		current_part = SSMACHINES_MACHINES_LATE
+		src.currentrun = processing_late.Copy()
 
-	//APC late processing. APCs will use the remaining power on the grid to charge their cells if needed.
-	//This is applied at the end so charging APCs don't cause others to discharge by taking all the power from the grid before machines use power.
-	if(current_part == SSMACHINES_APCS_LATE)
+	//Processing machines that record the power usage statistics
+	if(current_part == SSMACHINES_MACHINES_LATE)
 		//cache for sanic speed (lists are references anyways)
 		var/list/currentrun = src.currentrun
 		while(currentrun.len)
-			var/obj/machinery/power/apc/apc = currentrun[currentrun.len]
+			var/obj/machinery/thing = currentrun[currentrun.len]
 			currentrun.len--
-			if(QDELETED(apc) || apc.late_process(wait * 0.1) == PROCESS_KILL)
-				apc_late_processing -= apc
-				apc.datum_flags &= ~DF_ISPROCESSING
-			if(MC_TICK_CHECK)
+			if(QDELETED(thing) || thing.process_late(wait * 0.1) == PROCESS_KILL)
+				processing_late -= thing
+				thing.datum_flags &= ~DF_ISPROCESSING
+			if (MC_TICK_CHECK)
 				return
 
 /datum/controller/subsystem/machines/proc/setup_template_powernets(list/cables)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 548bd2cf1ed7e..5c1a32d099c1e 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -407,14 +407,22 @@ Used by the AI doomsday and the self-destruct nuke.
 		add_new_zlevel("[name][i ? " [i + 1]" : ""]", level, contain_turfs = FALSE)
 		++i
 
+	SSautomapper.preload_templates_from_toml(files) // BANDASTATION EDIT ADDITION - We need to load our templates AFTER the Z level exists, otherwise, there is no z level to preload.
+	var/turf_blacklist = SSautomapper.get_turf_blacklists(files) // BANDASTATION EDIT ADDITION - We use blacklisted turfs to carve out places for our templates.
+
 	// load the maps
 	for (var/P in parsed_maps)
 		var/datum/parsed_map/pm = P
+		pm.turf_blacklist = turf_blacklist // BANDASTATION EDIT ADDITION - apply blacklist
 		var/bounds = pm.bounds
 		var/x_offset = bounds ? round(world.maxx / 2 - bounds[MAP_MAXX] / 2) + 1 : 1
 		var/y_offset = bounds ? round(world.maxy / 2 - bounds[MAP_MAXY] / 2) + 1 : 1
 		if (!pm.load(x_offset, y_offset, start_z + parsed_maps[P], no_changeturf = TRUE, new_z = TRUE))
 			errorList |= pm.original_path
+	// BANDASTATION EDIT ADDITION BEGIN - We need to load our templates from cache after our space has been carved out.
+	if(!LAZYLEN(errorList))
+		SSautomapper.load_templates_from_cache(files)
+	// BANDASTATION EDIT ADDITION END
 	if(!silent)
 		INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
 	return parsed_maps
diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/market.dm
similarity index 65%
rename from code/controllers/subsystem/blackmarket.dm
rename to code/controllers/subsystem/market.dm
index 5c88177583b2f..0c134d5691570 100644
--- a/code/controllers/subsystem/blackmarket.dm
+++ b/code/controllers/subsystem/market.dm
@@ -1,5 +1,5 @@
-SUBSYSTEM_DEF(blackmarket)
-	name = "Blackmarket"
+SUBSYSTEM_DEF(market)
+	name = "Market"
 	flags = SS_BACKGROUND
 	init_order = INIT_ORDER_DEFAULT
 
@@ -18,27 +18,27 @@ SUBSYSTEM_DEF(blackmarket)
 	/// Currently queued purchases.
 	var/list/queued_purchases = list()
 
-/datum/controller/subsystem/blackmarket/Initialize()
+/datum/controller/subsystem/market/Initialize()
 	for(var/market in subtypesof(/datum/market))
 		markets[market] += new market
 
-	for(var/datum/market_item/item as anything in subtypesof(/datum/market_item))
-		if(!initial(item.item))
-			continue
-		if(!prob(initial(item.availability_prob)))
-			continue
-
-		var/datum/market_item/item_instance = new item()
-		for(var/potential_market in item_instance.markets)
-			if(!markets[potential_market])
-				stack_trace("SSblackmarket: Item [item_instance] available in market that does not exist.")
-				continue
-			// If this fails the market item will just be GC'd
-			markets[potential_market].add_item(item_instance)
+	for(var/path in subtypesof(/datum/market_item))
+		initialize_item(path)
 
 	return SS_INIT_SUCCESS
 
-/datum/controller/subsystem/blackmarket/fire(resumed)
+/datum/controller/subsystem/market/proc/initialize_item(datum/market_item/path, list/market_whitelist)
+	if(!path::item || !prob(path::availability_prob))
+		return
+	var/datum/market_item/item_instance = new path()
+	for(var/potential_market in item_instance.markets)
+		if(!markets[potential_market])
+			stack_trace("SSmarket: Item [item_instance] available in market that does not exist.")
+			continue
+		if(isnull(market_whitelist) || (potential_market in market_whitelist))
+			markets[potential_market].add_item(item_instance)
+
+/datum/controller/subsystem/market/fire(resumed)
 	while(length(queued_purchases))
 		var/datum/market_purchase/purchase = queued_purchases[1]
 		queued_purchases.Cut(1,2)
@@ -55,9 +55,9 @@ SUBSYSTEM_DEF(blackmarket)
 				// The time left of the shortest cooldown amongst all telepads.
 				var/lowest_timeleft = INFINITY
 				for(var/obj/machinery/ltsrbt/pad as anything in telepads)
-					if(!COOLDOWN_FINISHED(pad, recharge_cooldown))
-						var/timeleft = COOLDOWN_TIMELEFT(pad, recharge_cooldown)
-						if(timeleft < lowest_timeleft)
+					if(!COOLDOWN_FINISHED(pad, recharge_cooldown) || (pad.machine_stat & NOPOWER))
+						var/timeleft = pad.machine_stat & NOPOWER ? INFINITY - 1 : COOLDOWN_TIMELEFT(pad, recharge_cooldown)
+						if(timeleft <= lowest_timeleft)
 							lowest_cd_pad = pad
 							lowest_timeleft = timeleft
 						continue
@@ -79,7 +79,7 @@ SUBSYSTEM_DEF(blackmarket)
 				to_chat(buyer, span_notice("[purchase.uplink] flashes a message noting that the order is being teleported to [get_area(targetturf)] in 60 seconds."))
 
 				// do_teleport does not want to teleport items from nullspace, so it just forceMoves and does sparks.
-				addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/controller/subsystem/blackmarket, fake_teleport), purchase, targetturf), 60 SECONDS)
+				addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/controller/subsystem/market, fake_teleport), purchase, targetturf), 60 SECONDS)
 
 			// Get the current location of the uplink if it exists, then throws the item from space at the station from a random direction.
 			if(SHIPPING_METHOD_LAUNCH)
@@ -95,9 +95,11 @@ SUBSYSTEM_DEF(blackmarket)
 				qdel(purchase)
 
 			if(SHIPPING_METHOD_SUPPLYPOD)
-				var/obj/structure/closet/supplypod/back_to_station/pod = new()
-				purchase.entry.spawn_item(pod, purchase)
-				new /obj/effect/pod_landingzone(get_turf(purchase.uplink), pod)
+				var/obj/structure/closet/supplypod/spawned_pod = podspawn(list(
+					"target" = get_turf(purchase.uplink),
+					"path" = /obj/structure/closet/supplypod/back_to_station,
+				))
+				purchase.entry.spawn_item(spawned_pod, purchase)
 
 				to_chat(buyer, span_notice("[purchase.uplink] flashes a message noting the order is being launched at your location. Right here, right now!"))
 				qdel(purchase)
@@ -106,7 +108,7 @@ SUBSYSTEM_DEF(blackmarket)
 			break
 
 /// Used to make a teleportation effect as do_teleport does not like moving items from nullspace.
-/datum/controller/subsystem/blackmarket/proc/fake_teleport(datum/market_purchase/purchase, turf/target)
+/datum/controller/subsystem/market/proc/fake_teleport(datum/market_purchase/purchase, turf/target)
 	// Oopsie, whoopsie, the item is gone. So long, and thanks for all the money.
 	if(QDELETED(purchase))
 		return
@@ -119,9 +121,31 @@ SUBSYSTEM_DEF(blackmarket)
 	qdel(purchase)
 
 /// Used to add /datum/market_purchase to queued_purchases var. Returns TRUE when queued.
-/datum/controller/subsystem/blackmarket/proc/queue_item(datum/market_purchase/purchase)
+/datum/controller/subsystem/market/proc/queue_item(datum/market_purchase/purchase)
 	if((purchase.method == SHIPPING_METHOD_LTSRBT && !telepads.len) || isnull(purchase.uplink))
 		qdel(purchase)
 		return FALSE
 	queued_purchases += purchase
 	return TRUE
+
+///A proc that restocks one or more markets, or all if the market_whitelist is null.
+/datum/controller/subsystem/market/proc/restock(list/market_whitelist)
+	var/market_name = "Markets"
+	if(market_whitelist && !islist(market_whitelist))
+		var/datum/market/market_path = market_whitelist
+		market_name = market_path::name
+		market_whitelist = list(market_path)
+
+	var/list/existing_types = list()
+	for(var/path in markets)
+		if(isnull(market_whitelist) || (path in market_whitelist))
+			markets[path].restock(existing_types)
+
+	for(var/datum/market_item/path as anything in (subtypesof(/datum/market_item) - existing_types))
+		if(!path::restockable)
+			continue
+		initialize_item(path, market_whitelist)
+
+	for(var/obj/machinery/ltsrbt/pad as anything in telepads)
+		pad.say("[market_name] restocked!")
+		playsound(src, 'sound/effects/cashregister.ogg', 40, FALSE)
diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm
index 6acbbc1894e25..4aed29be350b6 100644
--- a/code/controllers/subsystem/minor_mapping.dm
+++ b/code/controllers/subsystem/minor_mapping.dm
@@ -49,6 +49,8 @@ SUBSYSTEM_DEF(minor_mapping)
 	///List of areas where satchels should not be placed.
 	var/list/blacklisted_area_types = list(
 		/area/station/holodeck,
+		/area/space/nearstation,
+		/area/station/solars,
 		)
 
 	while(turfs.len && satchel_amount > 0)
diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm
index 50864f731e21a..ec0136bc8c178 100644
--- a/code/controllers/subsystem/movement/movement_types.dm
+++ b/code/controllers/subsystem/movement/movement_types.dm
@@ -703,7 +703,7 @@
 		y_rate = 1
 
 /**
- * Wrapper for walk_towards, not reccomended, as it's movement ends up being a bit stilted
+ * Wrapper for walk_towards, not reccomended, as its movement ends up being a bit stilted
  *
  * Returns TRUE if the loop sucessfully started, or FALSE if it failed
  *
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index 212af9076bda6..28ebd80560f82 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -97,4 +97,12 @@ SUBSYSTEM_DEF(parallax)
 /datum/controller/subsystem/parallax/proc/post_station_setup()
 	random_layer?.apply_global_effects()
 
+/// Return the most dominant color, if we have a colored background (mostly nebula gas)
+/datum/controller/subsystem/parallax/proc/get_parallax_color()
+	var/atom/movable/screen/parallax_layer/random/space_gas/gas = random_layer
+	if(!istype(gas))
+		return
+
+	return gas.parallax_color
+
 #undef PARALLAX_NONE
diff --git a/code/controllers/subsystem/persistence/counter_tram_hits.dm b/code/controllers/subsystem/persistence/counter_tram_hits.dm
index 806d5d5b5c2cc..8f1db7dd1524f 100644
--- a/code/controllers/subsystem/persistence/counter_tram_hits.dm
+++ b/code/controllers/subsystem/persistence/counter_tram_hits.dm
@@ -58,7 +58,7 @@
 	tram_hits_last_round = text2num(file2text(TRAM_COUNT_FILEPATH))
 
 /datum/controller/subsystem/persistence/proc/save_tram_counter()
-		rustg_file_write("[tram_hits_this_round]", TRAM_COUNT_FILEPATH)
+	rustg_file_write("[tram_hits_this_round]", TRAM_COUNT_FILEPATH)
 
 #undef TRAM_COUNT_FILEPATH
 #undef MAX_TRAM_SAVES
diff --git a/code/controllers/subsystem/persistent_paintings.dm b/code/controllers/subsystem/persistent_paintings.dm
index af0644a9a0d52..7da30fd477239 100644
--- a/code/controllers/subsystem/persistent_paintings.dm
+++ b/code/controllers/subsystem/persistent_paintings.dm
@@ -1,14 +1,5 @@
 #define PAINTINGS_DATA_FORMAT_VERSION 3
 
-// Patronage thresholds for paintings. Different cosmetic frames become available as more credits are spent on the patronage.
-#define PATRONAGE_OK_FRAME (PAYCHECK_CREW * 3) // 150 credits, as of march 2022
-#define PATRONAGE_NICE_FRAME (PATRONAGE_OK_FRAME * 2.5)
-#define PATRONAGE_GREAT_FRAME (PATRONAGE_NICE_FRAME * 2)
-#define PATRONAGE_EXCELLENT_FRAME (PATRONAGE_GREAT_FRAME * 2)
-#define PATRONAGE_AMAZING_FRAME (PATRONAGE_EXCELLENT_FRAME * 2)
-#define PATRONAGE_SUPERB_FRAME (PATRONAGE_AMAZING_FRAME * 2)
-#define PATRONAGE_LEGENDARY_FRAME (PATRONAGE_SUPERB_FRAME * 2)
-
 /*
 {
 	"version":2
@@ -334,11 +325,3 @@ SUBSYSTEM_DEF(persistent_paintings)
 	cache_paintings()
 
 #undef PAINTINGS_DATA_FORMAT_VERSION
-#undef PATRONAGE_OK_FRAME
-#undef PATRONAGE_NICE_FRAME
-#undef PATRONAGE_GREAT_FRAME
-#undef PATRONAGE_EXCELLENT_FRAME
-#undef PATRONAGE_AMAZING_FRAME
-#undef PATRONAGE_SUPERB_FRAME
-#undef PATRONAGE_LEGENDARY_FRAME
-
diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm
index cbbcca59fa6e2..fa219cd3da9f0 100644
--- a/code/controllers/subsystem/polling.dm
+++ b/code/controllers/subsystem/polling.dm
@@ -206,6 +206,12 @@ SUBSYSTEM_DEF(polling)
 		return
 	for(var/mob/dead/observer/ghost_player in GLOB.player_list)
 		candidates += ghost_player
+
+#ifdef TESTING
+	for(var/mob/dude in GLOB.player_list)
+		candidates |= dude
+#endif
+
 	return poll_candidates(question, role, check_jobban, poll_time, ignore_category, flashwindow, candidates, alert_pic, jump_target, role_name_text, custom_response_messages, start_signed_up, amount_to_pick, chat_text_border_icon, announce_chosen)
 
 /datum/controller/subsystem/polling/proc/poll_ghosts_for_target(
diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm
index db3f9aa3a0db5..7bb83fa133d50 100644
--- a/code/controllers/subsystem/research.dm
+++ b/code/controllers/subsystem/research.dm
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(research)
 	var/list/techweb_nodes_experimental = list()
 	///path = list(point type = value)
 	var/list/techweb_point_items = list(
-		/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
+		/obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
 	)
 	var/list/errored_datums = list()
 	///Associated list of all point types that techwebs will have and their respective 'abbreviated' name.
@@ -102,6 +102,14 @@ SUBSYSTEM_DEF(research)
 
 		techweb_list.last_income = world.time
 
+		if(length(techweb_list.research_queue_nodes))
+			techweb_list.research_node_id(techweb_list.research_queue_nodes[1]) // Attempt to research the first node in queue if possible
+
+			for(var/node_id in techweb_list.research_queue_nodes)
+				var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id)
+				if(node.is_free(techweb_list)) // Automatically research all free nodes in queue if any
+					techweb_list.research_node(node)
+
 /datum/controller/subsystem/research/proc/autosort_categories()
 	for(var/i in techweb_nodes)
 		var/datum/techweb_node/I = techweb_nodes[i]
diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm
index 76aa484bf92ce..65bcb0ec365b0 100644
--- a/code/controllers/subsystem/spatial_gridmap.dm
+++ b/code/controllers/subsystem/spatial_gridmap.dm
@@ -412,7 +412,7 @@ SUBSYSTEM_DEF(spatial_grid)
 	return intersecting_cell
 
 /**
- * find the spatial map cell that target used to belong to, then remove the target (and sometimes it's important_recusive_contents) from it.
+ * find the spatial map cell that target used to belong to, then remove the target (and sometimes its important_recusive_contents) from it.
  * make sure to provide the turf old_target used to be "in"
  *
  * * old_target - the thing we want to remove from the spatial grid cell
diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm
index f381df80df6da..21bafd5330c97 100644
--- a/code/controllers/subsystem/sprite_accessories.dm
+++ b/code/controllers/subsystem/sprite_accessories.dm
@@ -87,23 +87,23 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
 
 	socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST]
 
-	lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings)[DEFAULT_SPRITE_LIST]
+	lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	tails_list_human = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
-	tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
-	tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard)[DEFAULT_SPRITE_LIST]
+	tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey)[DEFAULT_SPRITE_LIST]
 	snouts_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts)[DEFAULT_SPRITE_LIST]
-	horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns)[DEFAULT_SPRITE_LIST]
-	ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears)[DEFAULT_SPRITE_LIST]
-	wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings)[DEFAULT_SPRITE_LIST]
+	horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	wings_open_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings_open)[DEFAULT_SPRITE_LIST]
-	frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills)[DEFAULT_SPRITE_LIST]
-	spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines)[DEFAULT_SPRITE_LIST]
-	tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines)[DEFAULT_SPRITE_LIST]
+	frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	legs_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/legs)[DEFAULT_SPRITE_LIST]
 	caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST]
 	moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST]
 	moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST]
-	moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings)[DEFAULT_SPRITE_LIST]
+	moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST]
 
 /// This proc just intializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
diff --git a/code/controllers/subsystem/stock_market.dm b/code/controllers/subsystem/stock_market.dm
index e486776a082c9..7d0e0ea9262ee 100644
--- a/code/controllers/subsystem/stock_market.dm
+++ b/code/controllers/subsystem/stock_market.dm
@@ -9,7 +9,7 @@ SUBSYSTEM_DEF(stock_market)
 	var/list/materials_prices = list()
 	/// Associated list of materials alongside their market trends. 1 is up, 0 is stable, -1 is down.
 	var/list/materials_trends = list()
-	/// Associated list of materials alongside the life of it's current trend. After it's life is up, it will change to a new trend.
+	/// Associated list of materials alongside the life of its current trend. After its life is up, it will change to a new trend.
 	var/list/materials_trend_life = list()
 	/// Associated list of materials alongside their available quantity. This is used to determine how much of a material is available to buy, and how much buying and selling affects the price.
 	var/list/materials_quantity = list()
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 6990a142e4e2d..fc0375f4f0b6a 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(throwing)
 	var/target_zone
 	///The initial direction of the thrower of the thrownthing for building the trajectory of the throw.
 	var/init_dir
-	///The maximum number of turfs that the thrownthing will travel to reach it's target.
+	///The maximum number of turfs that the thrownthing will travel to reach its target.
 	var/maxrange
 	///Turfs to travel per tick
 	var/speed
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index efca8dd19b5cc..ff76464bee56a 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(ticker)
 
 	var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking.
 
-	var/delay_end = FALSE //if set true, the round will not restart on it's own
+	var/delay_end = FALSE //if set true, the round will not restart on its own
 	var/admin_delay_notice = "" //a message to display to anyone who tries to restart the world after a delay
 	var/ready_for_reboot = FALSE //all roundend preparation done with, all that's left is reboot
 
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index bc894de9beee8..8ecb0c9dc6a56 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -645,7 +645,7 @@ SUBSYSTEM_DEF(timer)
 				hash_timer.hash = null // but keep it from accidentally deleting us
 			else
 				if (flags & TIMER_OVERRIDE)
-					hash_timer.hash = null // no need having it delete it's hash if we are going to replace it
+					hash_timer.hash = null // no need having it delete its hash if we are going to replace it
 					qdel(hash_timer)
 				else
 					if (hash_timer.flags & TIMER_STOPPABLE)
diff --git a/code/controllers/subsystem/transport.dm b/code/controllers/subsystem/transport.dm
index 2f870eb674035..928b6a03d58f2 100644
--- a/code/controllers/subsystem/transport.dm
+++ b/code/controllers/subsystem/transport.dm
@@ -98,7 +98,7 @@ PROCESSING_SUBSYSTEM_DEF(transport)
 	// We've made it this far, tram is physically fine so let's trip plan
 	// This is based on the destination nav beacon, the logical location
 	// If Something Happens and the location the controller thinks it's at
-	// gets out of sync with it's actual physical location, it can be reset
+	// gets out of sync with its actual physical location, it can be reset
 
 	// Since players can set the platform ID themselves, make sure it's a valid platform we're aware of
 	var/network = LAZYACCESS(nav_beacons, transport_id)
diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm
index 43fcbd57f69ba..43cbb05c939ff 100644
--- a/code/datums/actions/mobs/charge.dm
+++ b/code/datums/actions/mobs/charge.dm
@@ -227,14 +227,19 @@
 	id = "tired_post_charge"
 	duration = 1 SECONDS
 	alert_type = null
+	var/tired_movespeed = /datum/movespeed_modifier/status_effect/tired_post_charge
 
 /datum/status_effect/tired_post_charge/on_apply()
 	. = ..()
-	owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/tired_post_charge)
+	owner.add_movespeed_modifier(tired_movespeed)
 
 /datum/status_effect/tired_post_charge/on_remove()
 	. = ..()
-	owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/tired_post_charge)
+	owner.remove_movespeed_modifier(tired_movespeed)
+
+/datum/status_effect/tired_post_charge/lesser
+	id = "tired_post_charge_easy"
+	tired_movespeed = /datum/movespeed_modifier/status_effect/tired_post_charge/lesser
 
 /datum/action/cooldown/mob_cooldown/charge/triple_charge
 	name = "Triple Charge"
diff --git a/code/datums/actions/mobs/ground_slam.dm b/code/datums/actions/mobs/ground_slam.dm
index e00799196b589..4adadef04e7c7 100644
--- a/code/datums/actions/mobs/ground_slam.dm
+++ b/code/datums/actions/mobs/ground_slam.dm
@@ -6,7 +6,7 @@
 	cooldown_time = 10 SECONDS
 	/// The range of the slam
 	var/range = 5
-	/// The delay before the shockwave expands it's range
+	/// The delay before the shockwave expands its range
 	var/delay = 3
 	/// How far hit targets are thrown
 	var/throw_range = 8
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm
index 2d2ad013aa2c6..c2e9fe515c40f 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeted_mob_ability.dm
@@ -50,8 +50,8 @@
  * Attempts to move into the provided range and then use a mob's cooldown ability on a target
  */
 /datum/ai_behavior/targeted_mob_ability/min_range
-	required_distance = 6
 	behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+	required_distance = 6
 
 /datum/ai_behavior/targeted_mob_ability/min_range/setup(datum/ai_controller/controller, ability_key, target_key)
 	. = ..()
@@ -59,3 +59,6 @@
 	if(QDELETED(target))
 		return FALSE
 	set_movement_target(controller, target)
+
+/datum/ai_behavior/targeted_mob_ability/min_range/short
+	required_distance = 3
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm
index 4cf04039e8535..7673551a65319 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/targeting.dm
@@ -152,3 +152,15 @@ GLOBAL_LIST_INIT(target_interested_atoms, typecacheof(list(/mob, /obj/machinery/
 /// Returns the desired final target from the filtered list of targets
 /datum/ai_behavior/find_potential_targets/proc/pick_final_target(datum/ai_controller/controller, list/filtered_targets)
 	return pick(filtered_targets)
+
+/// Targets with the trait specified by the BB_TARGET_PRIORITY_TRAIT blackboard key will be prioritized over the rest.
+/datum/ai_behavior/find_potential_targets/prioritize_trait
+
+/datum/ai_behavior/find_potential_targets/prioritize_trait/pick_final_target(datum/ai_controller/controller, list/filtered_targets)
+	var/priority_targets = list()
+	for(var/atom/target as anything in filtered_targets)
+		if(HAS_TRAIT(target, controller.blackboard[BB_TARGET_PRIORITY_TRAIT]))
+			priority_targets += target
+	if(length(priority_targets))
+		return pick(priority_targets)
+	return ..()
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/find_targets_prioritize_traits.dm b/code/datums/ai/basic_mobs/basic_subtrees/find_targets_prioritize_traits.dm
new file mode 100644
index 0000000000000..6c83469960ad3
--- /dev/null
+++ b/code/datums/ai/basic_mobs/basic_subtrees/find_targets_prioritize_traits.dm
@@ -0,0 +1,6 @@
+/// Find something with a specific trait to run from
+/datum/ai_planning_subtree/find_target_prioritize_traits
+
+/datum/ai_planning_subtree/find_target_prioritize_traits/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	. = ..()
+	controller.queue_behavior(/datum/ai_behavior/find_potential_targets/prioritize_trait, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETING_STRATEGY, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION, BB_TARGET_PRIORITY_TRAIT)
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm
index 4a2f5b476c759..3ed8b2df2b26d 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/flee_target.dm
@@ -10,7 +10,7 @@
 /datum/ai_planning_subtree/flee_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	. = ..()
 	var/atom/flee_from = controller.blackboard[target_key]
-	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING] || QDELETED(flee_from))
+	if(!should_flee(controller, flee_from))
 		return
 	var/flee_distance = controller.blackboard[BB_BASIC_MOB_FLEE_DISTANCE] || DEFAULT_BASIC_FLEE_DISTANCE
 	if (get_dist(controller.pawn, flee_from) >= flee_distance)
@@ -19,8 +19,21 @@
 	controller.queue_behavior(flee_behaviour, target_key, hiding_place_key)
 	return SUBTREE_RETURN_FINISH_PLANNING //we gotta get out of here.
 
+/datum/ai_planning_subtree/flee_target/proc/should_flee(datum/ai_controller/controller, atom/flee_from)
+	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING] || QDELETED(flee_from))
+		return FALSE
+	return TRUE
+
 /// Try to escape from your current target, without performing any other actions.
 /// Reads from some fleeing-specific targeting keys rather than the current mob target.
 /datum/ai_planning_subtree/flee_target/from_flee_key
 	target_key = BB_BASIC_MOB_FLEE_TARGET
 	hiding_place_key = BB_BASIC_MOB_FLEE_TARGET_HIDING_LOCATION
+
+/// A subtype that forces the mob to flee from targets with the scary fisherman trait anyway.
+/datum/ai_planning_subtree/flee_target/from_fisherman
+
+/datum/ai_planning_subtree/flee_target/from_fisherman/should_flee(datum/ai_controller/controller, atom/flee_from)
+	if (!QDELETED(flee_from) && HAS_TRAIT(flee_from, TRAIT_SCARY_FISHERMAN))
+		return TRUE
+	return ..()
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm
index 5b1f5ffbff9ed..f764568d4ba74 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_attack_target.dm
@@ -22,3 +22,12 @@
 		return
 	controller.queue_behavior(ranged_attack_behavior, BB_BASIC_MOB_CURRENT_TARGET, BB_TARGETING_STRATEGY, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
 	return SUBTREE_RETURN_FINISH_PLANNING //we are going into battle...no distractions.
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman
+
+/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	var/atom/movable/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+	if(QDELETED(target))
+		return ..()
+	if(!HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+		return ..()
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
index 1c7d8de9120ba..42608730f9891 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
@@ -12,4 +12,3 @@
 		if(watcher.stat != DEAD)
 			return
 	return ..()
-
diff --git a/code/datums/ai/basic_mobs/pet_commands/pet_use_targeted_ability.dm b/code/datums/ai/basic_mobs/pet_commands/pet_use_targeted_ability.dm
index 3c8c06b009962..c90ffa785900f 100644
--- a/code/datums/ai/basic_mobs/pet_commands/pet_use_targeted_ability.dm
+++ b/code/datums/ai/basic_mobs/pet_commands/pet_use_targeted_ability.dm
@@ -22,3 +22,18 @@
 /datum/ai_behavior/pet_use_ability/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
 	. = ..()
 	controller.clear_blackboard_key(target_key)
+
+/datum/ai_behavior/pet_use_ability/then_attack
+
+/datum/ai_behavior/pet_use_ability/then_attack/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
+	. = ..()
+	if(succeeded)
+		controller.queue_behavior(/datum/ai_behavior/basic_melee_attack, target_key, BB_PET_TARGETING_STRATEGY)
+
+/datum/ai_behavior/pet_use_ability/then_attack/short_ranged
+	behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+	required_distance = 4
+
+/datum/ai_behavior/pet_use_ability/then_attack/long_ranged
+	behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT
+	required_distance = 8
diff --git a/code/datums/ai/basic_mobs/targeting_strategies/_targeting_strategy.dm b/code/datums/ai/basic_mobs/targeting_strategies/_targeting_strategy.dm
new file mode 100644
index 0000000000000..dbd2028081b7e
--- /dev/null
+++ b/code/datums/ai/basic_mobs/targeting_strategies/_targeting_strategy.dm
@@ -0,0 +1,20 @@
+///Datum for basic mobs to define what they can attack,
+///Global, just like ai_behaviors
+/datum/targeting_strategy
+
+///Returns true or false depending on if the target can be attacked by the mob
+/datum/targeting_strategy/proc/can_attack(mob/living/living_mob, atom/target, vision_range)
+	return
+
+///Returns something the target might be hiding inside of
+/datum/targeting_strategy/proc/find_hidden_mobs(mob/living/living_mob, atom/target)
+	var/atom/target_hiding_location
+	if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper))
+		target_hiding_location = target.loc
+	return target_hiding_location
+
+///A very simple targeting strategy that checks that the target is a valid fishing spot.
+/datum/targeting_strategy/fishing
+
+/datum/targeting_strategy/fishing/can_attack(mob/living/living_mob, atom/target, vision_range)
+	return HAS_TRAIT(target, TRAIT_FISHING_SPOT)
diff --git a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
index 07b544bc0a296..2394f2a38623b 100644
--- a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
+++ b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
@@ -1,18 +1,3 @@
-///Datum for basic mobs to define what they can attack.GET_TARGETING_STRATEGY\((/[^,]*)\),
-///Global, just like ai_behaviors
-/datum/targeting_strategy
-
-///Returns true or false depending on if the target can be attacked by the mob
-/datum/targeting_strategy/proc/can_attack(mob/living/living_mob, atom/target, vision_range)
-	return
-
-///Returns something the target might be hiding inside of
-/datum/targeting_strategy/proc/find_hidden_mobs(mob/living/living_mob, atom/target)
-	var/atom/target_hiding_location
-	if(istype(target.loc, /obj/structure/closet) || istype(target.loc, /obj/machinery/disposal) || istype(target.loc, /obj/machinery/sleeper))
-		target_hiding_location = target.loc
-	return target_hiding_location
-
 /datum/targeting_strategy/basic
 	/// When we do our basic faction check, do we look for exact faction matches?
 	var/check_factions_exactly = FALSE
diff --git a/code/datums/ai/hunting_behavior/hunting_behaviors.dm b/code/datums/ai/hunting_behavior/hunting_behaviors.dm
index 609138c113270..ba2da1c2d04e8 100644
--- a/code/datums/ai/hunting_behavior/hunting_behaviors.dm
+++ b/code/datums/ai/hunting_behavior/hunting_behaviors.dm
@@ -139,6 +139,10 @@
 /datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target
 	always_reset_target = TRUE
 
+/datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target_combat_mode
+	always_reset_target = TRUE
+	switch_combat_mode = TRUE
+
 /datum/ai_behavior/hunt_target/use_ability_on_target
 	always_reset_target = TRUE
 	///the ability we will use
diff --git a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm
index d6310bfc9f3b1..d0c4f68db5c6f 100644
--- a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm
+++ b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm
@@ -23,10 +23,10 @@
 /datum/ai_behavior/vendor_crush/proc/tiltonmob(datum/ai_controller/controller, turf/target_turf)
 	var/obj/machinery/vending/vendor_pawn = controller.pawn
 	if(vendor_pawn.tilt(target_turf, 0) & SUCCESSFULLY_CRUSHED_MOB) //We hit something
-		vendor_pawn.say(pick("Supersize this!", "Eat my shiny metal ass!", "Want to consume some of my products?", "SMASH!", "Don't you love these smashing prices!"))
+		vendor_pawn.say(pick("Как тебе размерчик?!", "Поцелуй мой блестящий металлический зад!", "Хочешь попробовать мои товары?", "В ЛЕПЁШКУ!", "Разве вам не нравятся эти сногсшибательные цены?!"))
 		controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, TRUE)
 	else
-		vendor_pawn.say(pick("Get back here!", "Don't you want my well priced love?"))
+		vendor_pawn.say(pick("А ну вернись!", "Разве тебе не хочется моей хорошо оценённой любви?"))
 		controller.set_blackboard_key(BB_VENDING_LAST_HIT_SUCCESFUL, FALSE)
 	finish_action(controller, TRUE)
 
diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm
index 22f2b15f2ccd0..15b1e01114943 100644
--- a/code/datums/bodypart_overlays/bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/bodypart_overlay.dm
@@ -9,11 +9,22 @@
 	///Key of the icon states of all the sprite_datums for easy caching
 	var/cache_key = ""
 
+	/// Whether the overlay blocks emissive light
+	var/blocks_emissive = EMISSIVE_BLOCK_UNIQUE
+
 ///Wrapper for getting the proper image, colored and everything
 /datum/bodypart_overlay/proc/get_overlay(layer, obj/item/bodypart/limb)
 	layer = bitflag_to_layer(layer)
-	. = get_image(layer, limb)
-	color_image(., layer, limb)
+	var/image/main_image = get_image(layer, limb)
+	color_image(main_image, layer, limb)
+	if(blocks_emissive == EMISSIVE_BLOCK_NONE || !limb)
+		return main_image
+
+	var/list/all_images = list(
+		main_image,
+		emissive_blocker(main_image.icon, main_image.icon_state, limb, layer = main_image.layer, alpha = main_image.alpha)
+	)
+	return all_images
 
 ///Generate the image. Needs to be overriden
 /datum/bodypart_overlay/proc/get_image(layer, obj/item/bodypart/limb)
@@ -68,3 +79,7 @@
 ///Generate a unique identifier to cache with. If you change something about the image, but the icon cache stays the same, it'll simply pull the unchanged image out of the cache
 /datum/bodypart_overlay/proc/generate_icon_cache()
 	return list()
+
+/// Additionally color or texture the limb
+/datum/bodypart_overlay/proc/modify_bodypart_appearance(datum/appearance)
+	return
diff --git a/code/datums/bodypart_overlays/markings_bodypart_overlay.dm b/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
index c2c6f54d861d3..5c11fe9f70334 100644
--- a/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
@@ -15,7 +15,7 @@
 
 /datum/bodypart_overlay/simple/body_marking/get_image(layer, obj/item/bodypart/limb)
 	var/gender_string = (use_gender && limb.is_dimorphic) ? (limb.gender == MALE ? MALE : FEMALE + "_") : "" //we only got male and female sprites
-	return image(icon, gender_string + icon_state + "_" + limb.body_zone, layer = layer)
+	return mutable_appearance(icon, gender_string + icon_state + "_" + limb.body_zone, layer = layer)
 
 /datum/bodypart_overlay/simple/body_marking/moth
 	dna_feature_key = "moth_markings"
diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
index 57c11814c022d..3115e3ad62ea2 100644
--- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
@@ -8,7 +8,7 @@
 
 	///The color this organ draws with. Updated by bodypart/inherit_color()
 	var/draw_color
-	///Where does this organ inherit it's color from?
+	///Where does this organ inherit its color from?
 	var/color_source = ORGAN_COLOR_INHERIT
 	///Take on the dna/preference from whoever we're gonna be inserted in
 	var/imprint_on_next_insertion = TRUE
@@ -28,13 +28,16 @@
 	sprite_datum = get_random_appearance()
 
 ///Grab a random appearance datum (thats not locked)
-/datum/bodypart_overlay/mutant/proc/get_random_appearance()
+/datum/bodypart_overlay/mutant/proc/get_random_appearance() as /datum/sprite_accessory
+	RETURN_TYPE(/datum/sprite_accessory)
 	var/list/valid_restyles = list()
 	var/list/feature_list = get_global_feature_list()
 	for(var/accessory in feature_list)
 		var/datum/sprite_accessory/accessory_datum = feature_list[accessory]
 		if(initial(accessory_datum.locked)) //locked is for stuff that shouldn't appear here
 			continue
+		if(!initial(accessory_datum.natural_spawn))
+			continue
 		valid_restyles += accessory_datum
 	return pick(valid_restyles)
 
diff --git a/code/datums/bodypart_overlays/simple_bodypart_overlay.dm b/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
index 7f52d21de5398..6c9eb4240ecd0 100644
--- a/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/simple_bodypart_overlay.dm
@@ -9,7 +9,7 @@
 	var/draw_color
 
 /datum/bodypart_overlay/simple/get_image(layer, obj/item/bodypart/limb)
-	return image(icon, icon_state, layer = layer)
+	return mutable_appearance(icon, icon_state, layer = layer)
 
 /datum/bodypart_overlay/simple/color_image(image/overlay, layer, obj/item/bodypart/limb)
 
diff --git a/code/datums/bodypart_overlays/texture_bodypart_overlay.dm b/code/datums/bodypart_overlays/texture_bodypart_overlay.dm
new file mode 100644
index 0000000000000..83c8ce5f12121
--- /dev/null
+++ b/code/datums/bodypart_overlays/texture_bodypart_overlay.dm
@@ -0,0 +1,24 @@
+/// Bodypart overlays focused on texturing limbs
+/datum/bodypart_overlay/texture
+	/// icon file for the texture
+	var/texture_icon
+	/// icon state for the texture
+	var/texture_icon_state
+	/// Cache the icon so we dont have to make a new one each time
+	var/cached_texture_icon
+
+/datum/bodypart_overlay/texture/New()
+	. = ..()
+
+	cached_texture_icon = icon(texture_icon, texture_icon_state)
+
+/datum/bodypart_overlay/texture/modify_bodypart_appearance(datum/appearance)
+	appearance.add_filter("bodypart_texture_[texture_icon_state]", 1, layering_filter(icon = cached_texture_icon,blend_mode = BLEND_INSET_OVERLAY))
+
+/datum/bodypart_overlay/texture/generate_icon_cache()
+	return "[type]"
+
+/datum/bodypart_overlay/texture/spacey
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+	texture_icon_state = "spacey"
+	texture_icon = 'icons/mob/human/textures.dmi'
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index cf90582115dd6..c2941c9202986 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -26,7 +26,7 @@
  * ## PROC TYPEPATH SHORTCUTS
  * (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...)
  *
- * ### proc defined on current(src) object OR overridden at src or any of it's parents:
+ * ### proc defined on current(src) object OR overridden at src or any of its parents:
  * PROC_REF(procname)
  *
  * `CALLBACK(src, PROC_REF(some_proc_here))`
@@ -111,7 +111,7 @@
 		else
 			calling_arguments = args
 	if(datum_flags & DF_VAR_EDITED)
-		if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback
+		if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback
 			return HandleUserlessProcCall(usr, object, delegate, calling_arguments)
 		return WrapAdminProcCall(object, delegate, calling_arguments)
 	if (object == GLOBAL_PROC)
@@ -148,7 +148,7 @@
 		else
 			calling_arguments = args
 	if(datum_flags & DF_VAR_EDITED)
-		if(usr != GLOB.AdminProcCallHandler && !usr?.client?.ckey) //This happens when a timer or the MC invokes a callback
+		if(usr != GLOB.AdminProcCallHandler && !(usr && usr?.client?.ckey)) //This happens when a timer or the MC invokes a callback
 			return HandleUserlessProcCall(usr, object, delegate, calling_arguments)
 		return WrapAdminProcCall(object, delegate, calling_arguments)
 	if (object == GLOBAL_PROC)
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index d300fcc371349..998c10a3b9b44 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -324,59 +324,6 @@
 	else
 		new /datum/chatmessage(raw_message, speaker, src, message_language, spans)
 
-// Tweak these defines to change the available color ranges
-#define CM_COLOR_SAT_MIN 0.6
-#define CM_COLOR_SAT_MAX 0.7
-#define CM_COLOR_LUM_MIN 0.65
-#define CM_COLOR_LUM_MAX 0.75
-
-/**
- * Gets a color for a name, will return the same color for a given string consistently within a round.atom
- *
- * Note that this proc aims to produce pastel-ish colors using the HSL colorspace. These seem to be favorable for displaying on the map.
- *
- * Arguments:
- * * name - The name to generate a color for
- * * sat_shift - A value between 0 and 1 that will be multiplied against the saturation
- * * lum_shift - A value between 0 and 1 that will be multiplied against the luminescence
- */
-/datum/chatmessage/proc/colorize_string(name, sat_shift = 1, lum_shift = 1)
-	// seed to help randomness
-	var/static/rseed = rand(1,26)
-
-	// get hsl using the selected 6 characters of the md5 hash
-	var/hash = copytext(md5(name + GLOB.round_id), rseed, rseed + 6)
-	var/h = hex2num(copytext(hash, 1, 3)) * (360 / 255)
-	var/s = (hex2num(copytext(hash, 3, 5)) >> 2) * ((CM_COLOR_SAT_MAX - CM_COLOR_SAT_MIN) / 63) + CM_COLOR_SAT_MIN
-	var/l = (hex2num(copytext(hash, 5, 7)) >> 2) * ((CM_COLOR_LUM_MAX - CM_COLOR_LUM_MIN) / 63) + CM_COLOR_LUM_MIN
-
-	// adjust for shifts
-	s *= clamp(sat_shift, 0, 1)
-	l *= clamp(lum_shift, 0, 1)
-
-	// convert to rgb
-	var/h_int = round(h/60) // mapping each section of H to 60 degree sections
-	var/c = (1 - abs(2 * l - 1)) * s
-	var/x = c * (1 - abs((h / 60) % 2 - 1))
-	var/m = l - c * 0.5
-	x = (x + m) * 255
-	c = (c + m) * 255
-	m *= 255
-	switch(h_int)
-		if(0)
-			return "#[num2hex(c, 2)][num2hex(x, 2)][num2hex(m, 2)]"
-		if(1)
-			return "#[num2hex(x, 2)][num2hex(c, 2)][num2hex(m, 2)]"
-		if(2)
-			return "#[num2hex(m, 2)][num2hex(c, 2)][num2hex(x, 2)]"
-		if(3)
-			return "#[num2hex(m, 2)][num2hex(x, 2)][num2hex(c, 2)]"
-		if(4)
-			return "#[num2hex(x, 2)][num2hex(m, 2)][num2hex(c, 2)]"
-		if(5)
-			return "#[num2hex(c, 2)][num2hex(m, 2)][num2hex(x, 2)]"
-
-
 #undef CHAT_LAYER_MAX_Z
 #undef CHAT_LAYER_Z_STEP
 #undef CHAT_MESSAGE_APPROX_LHEIGHT
@@ -388,7 +335,3 @@
 #undef CHAT_MESSAGE_LIFESPAN
 #undef CHAT_MESSAGE_SPAWN_TIME
 #undef CHAT_MESSAGE_WIDTH
-#undef CM_COLOR_LUM_MAX
-#undef CM_COLOR_LUM_MIN
-#undef CM_COLOR_SAT_MAX
-#undef CM_COLOR_SAT_MIN
diff --git a/code/datums/components/README.md b/code/datums/components/README.md
index db8bf10a327f6..34aea1176e430 100644
--- a/code/datums/components/README.md
+++ b/code/datums/components/README.md
@@ -2,8 +2,8 @@
 
 ## Concept
 
-Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward it's arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening.
+Loosely adapted from /vg/. This is an entity component system for adding behaviours to datums when inheritance doesn't quite cut it. By using signals and events instead of direct inheritance, you can inject behaviours without hacky overloads. It requires a different method of thinking, but is not hard to use correctly. If a behaviour can have application across more than one thing. Make it generic, make it a component. Atom/mob/obj event? Give it a signal, and forward its arguments with a `SendSignal()` call. Now every component that want's to can also know about this happening.
 
-### [HackMD page for an introduction to the system as a whole.](https://hackmd.io/@tgstation/SignalsComponentsElements) 
+### [HackMD page for an introduction to the system as a whole.](https://hackmd.io/@tgstation/SignalsComponentsElements)
 
 ### See/Define signals and their arguments in [__DEFINES\components.dm](../../__DEFINES/components.dm)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index b258abed65dda..f78e2af6be17d 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -4,7 +4,7 @@
  * The component datum
  *
  * A component should be a single standalone unit
- * of functionality, that works by receiving signals from it's parent
+ * of functionality, that works by receiving signals from its parent
  * object to provide some single functionality (i.e a slippery component)
  * that makes the object it's attached to cause people to slip over.
  * Useful when you want shared behaviour independent of type inheritance
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index 48e5b10b25f19..e7d18f8208173 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -41,13 +41,27 @@
 		datum/callback/expiration,
 	)
 
-	if(isitem(parent))
-		RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
-		RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
-		RegisterSignals(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_ATOM), PROC_REF(on_attack))
-	else if(ismob(parent))
-		register_antimagic_signals(parent)
-	else
+
+	var/atom/movable/movable = parent
+	if(!istype(movable))
+		return COMPONENT_INCOMPATIBLE
+
+	var/compatible = FALSE
+	if(isitem(movable))
+		RegisterSignal(movable, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+		RegisterSignal(movable, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+		RegisterSignals(movable, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_ATOM), PROC_REF(on_attack))
+		compatible = TRUE
+	else if(ismob(movable))
+		register_antimagic_signals(movable)
+		compatible = TRUE
+
+	if(movable.can_buckle)
+		RegisterSignal(movable, COMSIG_MOVABLE_BUCKLE, PROC_REF(on_buckle))
+		RegisterSignal(movable, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(on_unbuckle))
+		compatible = TRUE
+
+	if(!compatible)
 		return COMPONENT_INCOMPATIBLE
 
 	src.antimagic_flags = antimagic_flags
@@ -68,6 +82,14 @@
 /datum/component/anti_magic/proc/unregister_antimagic_signals(datum/on_what)
 	UnregisterSignal(on_what, list(COMSIG_MOB_RECEIVE_MAGIC, COMSIG_MOB_RESTRICT_MAGIC))
 
+/datum/component/anti_magic/proc/on_buckle(atom/movable/source, mob/living/bucklee)
+	SIGNAL_HANDLER
+	register_antimagic_signals(bucklee)
+
+/datum/component/anti_magic/proc/on_unbuckle(atom/movable/source, mob/living/bucklee)
+	SIGNAL_HANDLER
+	unregister_antimagic_signals(bucklee)
+
 /datum/component/anti_magic/proc/on_equip(atom/movable/source, mob/equipper, slot)
 	SIGNAL_HANDLER
 
diff --git a/code/datums/components/banned_from_space.dm b/code/datums/components/banned_from_space.dm
new file mode 100644
index 0000000000000..ae1d6701dd701
--- /dev/null
+++ b/code/datums/components/banned_from_space.dm
@@ -0,0 +1,37 @@
+/// Following recent tomfoolery, we've decided to ban you from space.
+/datum/component/banned_from_space
+	/// List of recent tiles we walked on that aren't space
+	var/list/tiles = list()
+	/// The max amount of tiles we store
+	var/max_tile_list_size = 4
+
+/datum/component/banned_from_space/Initialize(...)
+	if(!ismovable(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(check_if_space))
+
+/datum/component/banned_from_space/proc/check_if_space(atom/source, atom/new_location)
+	SIGNAL_HANDLER
+
+	if(!isturf(new_location))
+		return
+
+	if(isspaceturf(new_location))
+		send_back(parent)
+
+	else
+		tiles.Add(new_location)
+		if(tiles.len > max_tile_list_size)
+			tiles.Cut(1, 2)
+
+/datum/component/banned_from_space/proc/send_back(atom/movable/parent)
+	var/new_turf
+
+	if(tiles.len)
+		new_turf = tiles[1]
+		new /obj/effect/temp_visual/portal_animation(parent.loc, new_turf, parent)
+	else
+		new_turf = get_random_station_turf()
+
+	parent.forceMove(new_turf)
diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm
index eec7b4112aa69..23dd63d146712 100644
--- a/code/datums/components/boomerang.dm
+++ b/code/datums/components/boomerang.dm
@@ -1,7 +1,7 @@
-///The cooldown period between last_boomerang_throw and it's methods of implementing a rebound proc.
+///The cooldown period between last_boomerang_throw and its methods of implementing a rebound proc.
 #define BOOMERANG_REBOUND_INTERVAL (1 SECONDS)
 /**
- * If an ojvect is given the boomerang component, it should be thrown back to the thrower after either hitting it's target, or landing on the thrown tile.
+ * If an ojvect is given the boomerang component, it should be thrown back to the thrower after either hitting its target, or landing on the thrown tile.
  * Thrown objects should be thrown back to the original thrower with this component, a number of tiles defined by boomerang_throw_range.
  */
 /datum/component/boomerang
diff --git a/code/datums/components/callouts.dm b/code/datums/components/callouts.dm
new file mode 100644
index 0000000000000..24e7f081fbe78
--- /dev/null
+++ b/code/datums/components/callouts.dm
@@ -0,0 +1,177 @@
+#define CALLOUT_TIME (5 SECONDS)
+#define CALLOUT_COOLDOWN 3 SECONDS
+
+/// Component that allows its owner/owner's wearer to use callouts system - their pointing is replaced with a fancy radial which allows them to summon glowing markers
+/datum/component/callouts
+	/// If parent is clothing, slot on which this component activates
+	var/item_slot
+	/// If we are currently active
+	var/active = TRUE
+	/// Current user of this component
+	var/mob/cur_user
+	/// Whenever the user should shout the voiceline
+	var/voiceline = FALSE
+	/// If voiceline is true, what prefix the user should use
+	var/radio_prefix = null
+	/// List of all callout options
+	var/static/list/callout_options = typecacheof(subtypesof(/datum/callout_option))
+	/// Text displayed when parent is examined
+	var/examine_text = null
+	/// Cooldown for callouts
+	COOLDOWN_DECLARE(callout_cooldown)
+
+/datum/component/callouts/Initialize(item_slot = null, voiceline = FALSE, radio_prefix = null, examine_text = null)
+	if (!isitem(parent) && !ismob(parent))
+		return COMPONENT_INCOMPATIBLE
+	src.item_slot = item_slot
+	src.voiceline = voiceline
+	src.radio_prefix = radio_prefix
+	src.examine_text = examine_text
+
+	if (ismob(parent))
+		cur_user = parent
+		return
+
+	var/atom/atom_parent = parent
+
+	if (!ismob(atom_parent.loc))
+		return
+
+	var/mob/user = atom_parent.loc
+	if (!isnull(item_slot) && user.get_item_by_slot(item_slot) != parent)
+		return
+
+	RegisterSignal(atom_parent.loc, COMSIG_MOB_CLICKON, PROC_REF(on_click))
+	cur_user = atom_parent.loc
+
+/datum/component/callouts/Destroy(force)
+	cur_user = null
+	. = ..()
+
+/datum/component/callouts/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(on_click))
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped))
+	RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examines))
+	RegisterSignal(parent, COMSIG_CLICK_CTRL, PROC_REF(on_ctrl_click))
+
+/datum/component/callouts/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ATOM_EXAMINE, COMSIG_CLICK_CTRL))
+
+/datum/component/callouts/proc/on_ctrl_click(datum/source, mob/living/user)
+	SIGNAL_HANDLER
+
+	if(!isitem(parent))
+		return
+
+	var/obj/item/item_parent = parent
+	active = !active
+	item_parent.balloon_alert(user, active ? "callouts enabled" : "callouts disabled")
+
+/datum/component/callouts/proc/on_equipped(datum/source, mob/equipper, slot)
+	SIGNAL_HANDLER
+
+	if (item_slot & slot)
+		RegisterSignal(equipper, COMSIG_MOB_CLICKON, PROC_REF(on_click))
+		cur_user = equipper
+	else if (cur_user == equipper)
+		UnregisterSignal(cur_user, COMSIG_MOB_CLICKON, PROC_REF(on_click))
+		cur_user = null
+
+/datum/component/callouts/proc/on_dropped(datum/source, mob/user)
+	SIGNAL_HANDLER
+
+	if (cur_user == user)
+		UnregisterSignal(cur_user, COMSIG_MOB_CLICKON, PROC_REF(on_click))
+		cur_user = null
+
+/datum/component/callouts/proc/on_examines(mob/source, mob/user, list/examine_list)
+	SIGNAL_HANDLER
+	if (!isnull(examine_text))
+		examine_list += examine_text
+
+/datum/component/callouts/proc/on_click(mob/user, atom/clicked_atom, list/modifiers)
+	SIGNAL_HANDLER
+
+	if (!LAZYACCESS(modifiers, SHIFT_CLICK) || !LAZYACCESS(modifiers, MIDDLE_CLICK))
+		return
+
+	if (!active)
+		return
+
+	if (!COOLDOWN_FINISHED(src, callout_cooldown))
+		clicked_atom.balloon_alert(user, "callout is on cooldown!")
+		return COMSIG_MOB_CANCEL_CLICKON
+
+	INVOKE_ASYNC(src, PROC_REF(callout_picker), user, clicked_atom)
+	return COMSIG_MOB_CANCEL_CLICKON
+
+/datum/component/callouts/proc/callout_picker(mob/user, atom/clicked_atom)
+	var/list/callout_items = list()
+	for(var/datum/callout_option/callout_option as anything in callout_options)
+		callout_items[callout_option] = image(icon = 'icons/hud/radial.dmi', icon_state = callout_option::icon_state)
+
+	var/datum/callout_option/selection = show_radial_menu(user, get_turf(clicked_atom), callout_items, entry_animation = FALSE, click_on_hover = TRUE)
+	if (!selection)
+		return
+
+	COOLDOWN_START(src, callout_cooldown, CALLOUT_COOLDOWN)
+	new /obj/effect/temp_visual/callout(get_turf(user), user, selection, clicked_atom)
+	SEND_SIGNAL(user, COMSIG_MOB_CREATED_CALLOUT, selection, clicked_atom)
+	if (voiceline)
+		user.say((!isnull(radio_prefix) ? radio_prefix : "") + selection::voiceline, forced = src)
+
+/obj/effect/temp_visual/callout
+	name = "callout"
+	icon = 'icons/effects/callouts.dmi'
+	icon_state = "point"
+	plane = ABOVE_LIGHTING_PLANE
+	duration = CALLOUT_TIME
+
+/obj/effect/temp_visual/callout/Initialize(mapload, mob/creator, datum/callout_option/callout, atom/target)
+	. = ..()
+	if (isnull(creator))
+		return
+	icon_state = callout::icon_state
+	color = colorize_string(creator.GetVoice(), 2, 0.9)
+	update_appearance()
+	var/turf/target_loc = get_turf(target)
+	animate(src, pixel_x = (target_loc.x - loc.x) * world.icon_size + target.pixel_x, pixel_y = (target_loc.y - loc.y) * world.icon_size + target.pixel_y, time = 0.2 SECONDS, easing = EASE_OUT)
+
+/datum/callout_option
+	var/name = "ERROR"
+	var/icon_state = "point"
+	var/voiceline = "Something has gone wrong!"
+
+/datum/callout_option/point
+	name = "Point"
+	icon_state = "point"
+	voiceline = "Here!"
+
+/datum/callout_option/danger
+	name = "Danger"
+	icon_state = "danger"
+	voiceline = "Danger there!"
+
+/datum/callout_option/guard
+	name = "Guard"
+	icon_state = "guard"
+	voiceline = "Hold this position!"
+
+/datum/callout_option/attack
+	name = "Attack"
+	icon_state = "attack"
+	voiceline = "Attack there!"
+
+/datum/callout_option/mine
+	name = "Mine"
+	icon_state = "mine"
+	voiceline = "Dig here!"
+
+/datum/callout_option/move
+	name = "Move"
+	icon_state = "move"
+	voiceline = "Reposition there!"
+
+#undef CALLOUT_TIME
+#undef CALLOUT_COOLDOWN
diff --git a/code/datums/components/chuunibyou.dm b/code/datums/components/chuunibyou.dm
index 57428bc422358..4e06f0fd47486 100644
--- a/code/datums/components/chuunibyou.dm
+++ b/code/datums/components/chuunibyou.dm
@@ -47,6 +47,7 @@
 	RegisterSignal(parent, COMSIG_MOB_PRE_INVOCATION, PROC_REF(on_pre_invocation))
 	RegisterSignal(parent, COMSIG_MOB_TRY_SPEECH, PROC_REF(on_try_speech))
 	RegisterSignal(parent, COMSIG_MOB_AFTER_SPELL_CAST, PROC_REF(on_after_spell_cast))
+	ADD_TRAIT(parent, TRAIT_CHUUNIBYOU, REF(src))
 
 /datum/component/chuunibyou/UnregisterFromParent()
 	. = ..()
@@ -56,6 +57,7 @@
 		COMSIG_MOB_TRY_SPEECH,
 		COMSIG_MOB_AFTER_SPELL_CAST,
 	))
+	REMOVE_TRAIT(parent, TRAIT_CHUUNIBYOU, REF(src))
 
 /// signal sent when the parent tries to speak. we let speech pass if we are casting a spell so mimes still chuuni their spellcasts
 /// (this may end in the mime dying)
diff --git a/code/datums/components/crafting/atmospheric.dm b/code/datums/components/crafting/atmospheric.dm
index b2993012e82b0..6674ee1059a9f 100644
--- a/code/datums/components/crafting/atmospheric.dm
+++ b/code/datums/components/crafting/atmospheric.dm
@@ -359,3 +359,26 @@
 		/obj/item/stack/sheet/iron = 30,
 	)
 	category = CAT_STRUCTURE
+
+/datum/crafting_recipe/airlock_pump
+	name = "External Airlock Pump"
+	tool_behaviors = list(TOOL_WRENCH, TOOL_WELDER)
+	result = /obj/item/pipe/directional/airlock_pump
+	reqs = list(
+		/obj/item/pipe = 1,
+		/obj/item/stack/sheet/iron = 5,
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/analyzer = 1,
+	)
+	time = 2 SECONDS
+	category = CAT_ATMOSPHERIC
+
+/datum/crafting_recipe/airlock_pump/check_requirements(mob/user, list/collected_requirements)
+	return atmos_pipe_check(user, collected_requirements)
+
+/datum/crafting_recipe/airlock_pump/on_craft_completion(mob/user, atom/result)
+	var/obj/item/pipe/crafted_pipe = result
+	crafted_pipe.pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump
+	crafted_pipe.pipe_color = COLOR_VERY_LIGHT_GRAY
+	crafted_pipe.setDir(user.dir)
+	crafted_pipe.update()
diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm
index eeea4205a4d29..75b257156084e 100644
--- a/code/datums/components/crafting/equipment.dm
+++ b/code/datums/components/crafting/equipment.dm
@@ -23,6 +23,17 @@
 	time = 4 SECONDS
 	category = CAT_EQUIPMENT
 
+/datum/crafting_recipe/improvisedshield
+	name = "Moonflower Shield"
+	result = /obj/item/shield/buckler/moonflower
+	reqs = list(
+		/obj/item/seeds/sunflower/moonflower = 3,
+		/obj/item/grown/log/steel = 3,
+	)
+	time = 4 SECONDS
+	category = CAT_EQUIPMENT
+
+
 /datum/crafting_recipe/radiogloves
 	name = "Radio Gloves"
 	result = /obj/item/clothing/gloves/radio
diff --git a/code/datums/components/crafting/melee_weapon.dm b/code/datums/components/crafting/melee_weapon.dm
index 594ff7aefd387..018d99d870352 100644
--- a/code/datums/components/crafting/melee_weapon.dm
+++ b/code/datums/components/crafting/melee_weapon.dm
@@ -191,3 +191,13 @@
 	)
 	time = 10 SECONDS
 	category = CAT_WEAPON_MELEE
+
+/datum/crafting_recipe/bambostaff
+	name = "Bamboo Bo Staff"
+	result = /obj/item/bambostaff
+	reqs = list(
+		/obj/item/stack/sheet/mineral/bamboo = 4,
+		/obj/item/grown/log/steel = 2,
+	)
+	time = 8 SECONDS
+	category = CAT_WEAPON_MELEE
diff --git a/code/datums/components/crafting/misc.dm b/code/datums/components/crafting/misc.dm
index 606cf1fc29262..52c66253e824b 100644
--- a/code/datums/components/crafting/misc.dm
+++ b/code/datums/components/crafting/misc.dm
@@ -35,6 +35,17 @@
 	tool_paths = list(/obj/item/stamp/head/captain)
 	category = CAT_MISC
 
+/datum/crafting_recipe/clipboard
+	name = "Clipboard"
+	result = /obj/item/clipboard
+	time = 3 SECONDS
+	reqs = list(
+		/obj/item/stack/sheet/mineral/wood = 1,
+		/obj/item/stack/rods = 1,
+	)
+	tool_behaviors = list(TOOL_WIRECUTTER)
+	category = CAT_MISC
+
 /datum/crafting_recipe/cardboard_id
 	name = "Cardboard ID Card"
 	tool_behaviors = list(TOOL_WIRECUTTER)
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index 2bcec49aeb504..3c498f74416bd 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -6,6 +6,61 @@
 	time = 5 SECONDS
 	category = CAT_CLOTHING
 
+/datum/crafting_recipe/durathread_robe
+	name = "Durathread Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread
+	reqs = list(
+		/obj/item/stack/sheet/durathread = 3,
+		/obj/item/stack/sheet/leather = 6,
+	)
+	time = 5 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_robe_fire
+	name = "Durathread Pyromancer Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread/fire
+	reqs = list(/obj/item/clothing/suit/wizrobe/durathread = 1,
+				/obj/item/grown/novaflower = 1,
+				/obj/item/seeds/chili = 3)
+	time = 2 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_robe_ice
+	name = "Durathread Ice-o-mancer Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread/ice
+	reqs = list(/obj/item/clothing/suit/wizrobe/durathread = 1,
+				/obj/item/seeds/chili/ice = 1,
+				/obj/item/food/grown/herbs = 3)
+	time = 2 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_robe_electric
+	name = "Durathread Electromancer Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread/electric
+	reqs = list(/obj/item/clothing/suit/wizrobe/durathread = 1,
+				/obj/item/food/grown/mushroom/jupitercup = 1,
+				/obj/item/food/grown/sunflower = 3)
+	time = 2 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_robe_earth
+	name = "Durathread Geomancer Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread/earth
+	reqs = list(/obj/item/clothing/suit/wizrobe/durathread = 1,
+				/obj/item/food/grown/cahnroot = 1,
+				/obj/item/food/grown/potato = 3)
+	time = 2 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_robe_necro
+	name = "Durathread Necromancer Robe"
+	result = /obj/item/clothing/suit/wizrobe/durathread/necro
+	reqs = list(/obj/item/clothing/suit/wizrobe/durathread = 1,
+				/obj/item/food/grown/cannabis/death = 2,
+				/obj/item/food/grown/mushroom/angel = 2)
+	time = 2 SECONDS
+	category = CAT_CLOTHING
+
 /datum/crafting_recipe/durathread_helmet
 	name = "Durathread Helmet"
 	result = /obj/item/clothing/head/helmet/durathread
@@ -14,6 +69,62 @@
 	time = 4 SECONDS
 	category = CAT_CLOTHING
 
+/datum/crafting_recipe/watermelon_armour
+	name = "Watermelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/watermelon
+	reqs = list(/obj/item/clothing/head/helmet/durability/watermelon = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/watermelon_armour_fr
+	name = "Watermelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/watermelon/fire_resist
+	reqs = list(/obj/item/clothing/head/helmet/durability/watermelon/fire_resist = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/holymelon_armour
+	name = "Holymelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/holymelon
+	reqs = list(/obj/item/clothing/head/helmet/durability/holymelon = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/holymelonmelon_armour_fr
+	name = "Holymelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/holymelon/fire_resist
+	reqs = list(/obj/item/clothing/head/helmet/durability/holymelon/fire_resist = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/barrelmelon_armour
+	name = "Barrelmelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/barrelmelon
+	reqs = list(/obj/item/clothing/head/helmet/durability/barrelmelon = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/barrelmelon_armour_fr
+	name = "Barrelmelon Armour"
+	result = /obj/item/clothing/suit/armor/durability/barrelmelon/fire_resist
+	reqs = list(/obj/item/clothing/head/helmet/durability/barrelmelon/fire_resist = 3,
+				/obj/item/stack/sheet/durathread = 1)
+	time = 4 SECONDS
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/grass_sheath
+	name = "Grass Sabre Sheath"
+	result = /obj/item/storage/belt/grass_sabre
+	reqs = list(/obj/item/food/grown/grass = 4,
+				/obj/item/food/grown/grass/fairy = 2)
+	time = 4 SECONDS
+	category = CAT_CONTAINERS
+
 /datum/crafting_recipe/fannypack
 	name = "Fannypack"
 	result = /obj/item/storage/belt/fannypack
diff --git a/code/datums/components/crafting/weapon_ammo.dm b/code/datums/components/crafting/weapon_ammo.dm
index 2ba01802e7cdd..9a3448bc803a3 100644
--- a/code/datums/components/crafting/weapon_ammo.dm
+++ b/code/datums/components/crafting/weapon_ammo.dm
@@ -127,6 +127,28 @@
 	category = CAT_WEAPON_AMMO
 	crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_MUST_BE_LEARNED
 
+/datum/crafting_recipe/sticky_arrow
+	name = "Sticky arrow"
+	result = /obj/item/ammo_casing/arrow/sticky
+	reqs = list(
+		/obj/item/ammo_casing/arrow = 1,
+		/obj/item/food/honeycomb = 3,
+	)
+	time = 5 SECONDS
+	category = CAT_WEAPON_AMMO
+	crafting_flags = CRAFT_CHECK_DENSITY
+
+/datum/crafting_recipe/poison_arrow
+	name = "Poison arrow"
+	result = /obj/item/ammo_casing/arrow/poison
+	reqs = list(
+		/obj/item/ammo_casing/arrow = 1,
+		/obj/item/food/grown/berries/poison = 5,
+	)
+	time = 5 SECONDS
+	category = CAT_WEAPON_AMMO
+	crafting_flags = CRAFT_CHECK_DENSITY
+
 /datum/crafting_recipe/plastic_arrow
 	name = "Plastic Arrow"
 	result = /obj/item/ammo_casing/arrow/plastic
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
index c7b3e3f2ff55b..8a1902526c42a 100644
--- a/code/datums/components/dejavu.dm
+++ b/code/datums/components/dejavu.dm
@@ -85,7 +85,7 @@
 			master.forceMove(starting_turf)
 
 	rewinds_remaining --
-	if(rewinds_remaining)
+	if(rewinds_remaining || rewinds_remaining < 0)
 		addtimer(CALLBACK(src, rewind_type), rewind_interval)
 	else
 		to_chat(parent, span_notice(no_rewinds_message))
diff --git a/code/datums/components/echolocation.dm b/code/datums/components/echolocation.dm
index 020c47ad875e1..51ab89a2be564 100644
--- a/code/datums/components/echolocation.dm
+++ b/code/datums/components/echolocation.dm
@@ -32,7 +32,7 @@
 	/// Cooldown for the echolocation.
 	COOLDOWN_DECLARE(cooldown_last)
 
-/datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon = "echo", color_path)
+/datum/component/echolocation/Initialize(echo_range, cooldown_time, image_expiry_time, fade_in_time, fade_out_time, images_are_static, blocking_trait, echo_group, echo_icon, color_path)
 	. = ..()
 	var/mob/living/echolocator = parent
 	if(!istype(echolocator))
diff --git a/code/datums/components/fish_growth.dm b/code/datums/components/fish_growth.dm
new file mode 100644
index 0000000000000..bc7c8a9869e44
--- /dev/null
+++ b/code/datums/components/fish_growth.dm
@@ -0,0 +1,57 @@
+///A simple component that manages raising things from aquarium fish.
+/datum/component/fish_growth
+	dupe_mode = COMPONENT_DUPE_SELECTIVE
+	///the type of the movable that's spawned when the fish grows up.
+	var/result_type
+	///The progress, from 0 to 100
+	var/maturation
+	///How much maturation is gained per tick
+	var/growth_rate
+	///Is the result moved on the nearest drop location?
+	var/use_drop_loc
+	///Is the parent deleted once the result is spawned?
+	var/del_on_grow
+
+/datum/component/fish_growth/Initialize(result_type, growth_rate, use_drop_loc = TRUE, del_on_grow = TRUE)
+	. = ..()
+	if(!isfish(parent))
+		return COMPONENT_INCOMPATIBLE
+	RegisterSignal(parent, COMSIG_FISH_LIFE, PROC_REF(on_fish_life))
+	src.result_type = result_type
+	src.growth_rate = growth_rate
+	src.use_drop_loc = use_drop_loc
+	src.del_on_grow = del_on_grow
+
+/datum/component/fish_growth/CheckDupeComponent(result_type, growth_rate, use_drop_loc = TRUE, del_on_grow = TRUE)
+	if(result_type == src.result_type)
+		src.growth_rate = growth_rate
+		return TRUE //copy the growth rate and kill the new component
+	return FALSE
+
+/datum/component/fish_growth/proc/on_fish_life(obj/item/fish/source, seconds_per_tick)
+	SIGNAL_HANDLER
+	if(SEND_SIGNAL(source, COMSIG_FISH_BEFORE_GROWING, seconds_per_tick) & COMPONENT_DONT_GROW)
+		return
+	maturation += growth_rate * seconds_per_tick
+	if(maturation >= 100)
+		finish_growing(source)
+
+/datum/component/fish_growth/proc/finish_growing(obj/item/fish/source)
+	var/atom/location = use_drop_loc ? source.drop_location() : source.loc
+	var/atom/movable/result = new result_type (location)
+	if(location != source.loc)
+		result.visible_message(span_boldnotice("\A [result] jumps out of [source.loc]!"))
+		playsound(result, 'sound/effects/fish_splash.ogg', 60)
+	if(isbasicmob(result))
+		for(var/trait_type in source.fish_traits)
+			var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+			trait.apply_to_mob(result)
+
+		addtimer(CALLBACK(result, TYPE_PROC_REF(/mob/living/basic, hop_on_nearby_turf)), 0.1 SECONDS)
+
+	SEND_SIGNAL(source, COMSIG_FISH_FINISH_GROWING, result)
+
+	if(del_on_grow)
+		qdel(parent)
+	else
+		maturation = 0
diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm
index 481f965059f52..6638c822ff6a5 100644
--- a/code/datums/components/fishing_spot.dm
+++ b/code/datums/components/fishing_spot.dm
@@ -17,6 +17,8 @@
 	RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast))
 	RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
 	RegisterSignal(parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examined_more))
+	RegisterSignal(parent, COMSIG_NPC_FISHING, PROC_REF(return_fishing_spot))
+	RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(explosive_fishing))
 	ADD_TRAIT(parent, TRAIT_FISHING_SPOT, REF(src))
 
 /datum/component/fishing_spot/Destroy()
@@ -95,3 +97,10 @@
 	var/datum/fishing_challenge/challenge = new(src, result, rod, user)
 	fish_source.pre_challenge_started(rod, user, challenge)
 	challenge.start(user)
+
+/datum/component/fishing_spot/proc/return_fishing_spot(datum/source, list/fish_spot_container)
+	fish_spot_container[NPC_FISHING_SPOT] = fish_source
+
+/datum/component/fishing_spot/proc/explosive_fishing(atom/location, severity)
+	SIGNAL_HANDLER
+	fish_source.spawn_reward_from_explosion(location, severity)
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index d4b80ea1dd8ab..056f1e5791e6c 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -641,6 +641,7 @@ Behavior that's still missing from this component that original food items had t
 ///Delete the item when it is fully eaten
 /datum/component/edible/proc/On_Consume(mob/living/eater, mob/living/feeder)
 	SEND_SIGNAL(parent, COMSIG_FOOD_CONSUMED, eater, feeder)
+	SEND_SIGNAL(eater, COMSIG_LIVING_FINISH_EAT, parent, feeder)
 
 	on_consume?.Invoke(eater, feeder)
 	if (QDELETED(parent)) // might be destroyed by the callback
diff --git a/code/datums/components/glass_passer.dm b/code/datums/components/glass_passer.dm
new file mode 100644
index 0000000000000..f96300341b0c4
--- /dev/null
+++ b/code/datums/components/glass_passer.dm
@@ -0,0 +1,50 @@
+/// Allows us to move through glass but not electrified glass. Can also do a little slowdown before passing through
+/datum/component/glass_passer
+	/// How long does it take us to move into glass?
+	var/pass_time = 0 SECONDS
+
+/datum/component/glass_passer/Initialize(pass_time)
+	if(!ismob(parent)) //if its not a mob then just directly use passwindow
+		return COMPONENT_INCOMPATIBLE
+
+	src.pass_time = pass_time
+
+	if(!pass_time)
+		passwindow_on(parent, type)
+	else
+		RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(bumped))
+
+	var/mob/mobbers = parent
+	mobbers.generic_canpass = FALSE
+	RegisterSignal(parent, COMSIG_MOVABLE_CROSS_OVER, PROC_REF(cross_over))
+
+/datum/component/glass_passer/Destroy()
+	. = ..()
+	if(parent)
+		passwindow_off(parent, type)
+
+/datum/component/glass_passer/proc/cross_over(mob/passer, atom/crosser)
+	SIGNAL_HANDLER
+
+	if(istype(crosser, /obj/structure/grille))
+		var/obj/structure/grille/grillefriend = crosser
+		if(grillefriend.is_shocked()) //prevent passage of shocked
+			crosser.balloon_alert(passer, "is shocked!")
+			return COMPONENT_BLOCK_CROSS
+
+	return null
+
+/datum/component/glass_passer/proc/bumped(mob/living/owner, atom/bumpee)
+	SIGNAL_HANDLER
+
+	if(!istype(bumpee, /obj/structure/window))
+		return
+
+	INVOKE_ASYNC(src, PROC_REF(phase_through_glass), owner, bumpee)
+
+/datum/component/glass_passer/proc/phase_through_glass(mob/living/owner, atom/bumpee)
+	if(!do_after(owner, pass_time, bumpee))
+		return
+	passwindow_on(owner, type)
+	try_move_adjacent(owner, get_dir(owner, bumpee))
+	passwindow_off(owner, type)
diff --git a/code/datums/components/growth_and_differentiation.dm b/code/datums/components/growth_and_differentiation.dm
index bcf6722492251..182fd9b28ef48 100644
--- a/code/datums/components/growth_and_differentiation.dm
+++ b/code/datums/components/growth_and_differentiation.dm
@@ -11,6 +11,8 @@
 	var/growth_time
 	/// Integer - Probability we grow per SPT_PROB
 	var/growth_probability
+	/// Stores the growth_probability the component had when it was Initialized
+	var/initial_growth_probability
 	/// Integer - The lower bound for the percentage we have to grow before we can differentiate.
 	var/lower_growth_value
 	/// Integer - The upper bound for the percentage we have to grow before we can differentiate.
@@ -47,7 +49,7 @@
 
 	src.growth_path = growth_path
 	src.growth_time = growth_time
-	src.growth_probability = growth_probability
+	initial_growth_probability = src.growth_probability = growth_probability
 	src.lower_growth_value = lower_growth_value
 	src.upper_growth_value = upper_growth_value
 	src.optional_checks = optional_checks
@@ -56,10 +58,9 @@
 	if(islist(signals_to_kill_on))
 		src.signals_to_kill_on = signals_to_kill_on
 		RegisterSignals(parent, src.signals_to_kill_on, PROC_REF(stop_component_processing_entirely))
-	
+
 	if(scale_with_happiness)
-		if(!HAS_TRAIT(parent, TRAIT_MOB_RELAY_HAPPINESS))
-			AddComponent(/datum/component/happiness)
+		parent.AddComponent(/datum/component/happiness)
 		RegisterSignal(parent, COMSIG_MOB_HAPPINESS_CHANGE, PROC_REF(on_happiness_change))
 
 	// If we haven't started the round, we can't do timer stuff. Let's wait in case we're mapped in or something.
@@ -117,13 +118,16 @@
 		return
 
 	if(SPT_PROB(growth_probability, seconds_per_tick))
-		percent_grown += rand(lower_growth_value, upper_growth_value)
+		if(lower_growth_value == upper_growth_value)
+			percent_grown += upper_growth_value
+		else
+			percent_grown += rand(lower_growth_value, upper_growth_value)
 
 /datum/component/growth_and_differentiation/proc/on_happiness_change(datum/source, happiness_percentage)
 	SIGNAL_HANDLER
 
-	var/probability_to_add = initial(growth_probability) * happiness_percentage
-	growth_probability = min(initial(growth_probability) + probability_to_add, 100)
+	var/probability_to_add = initial_growth_probability * happiness_percentage
+	growth_probability = min(initial_growth_probability + probability_to_add, 100)
 
 /// Grows the mob into its new form.
 /datum/component/growth_and_differentiation/proc/grow(silent)
diff --git a/code/datums/components/happiness.dm b/code/datums/components/happiness.dm
index 0a6274611923b..a131e86960eb3 100644
--- a/code/datums/components/happiness.dm
+++ b/code/datums/components/happiness.dm
@@ -6,6 +6,7 @@
  * A component that allows mobs to have happiness levels
  */
 /datum/component/happiness
+	dupe_mode = COMPONENT_DUPE_UNIQUE //Prioritize the old comp over, which may have callbacks and stuff specific to the mob.
 	///our current happiness level
 	var/happiness_level
 	///our maximum happiness level
@@ -53,11 +54,9 @@
 	if(on_eat_change)
 		RegisterSignal(parent, COMSIG_MOB_ATE, PROC_REF(on_eat))
 	RegisterSignal(parent, COMSIG_SHIFT_CLICKED_ON, PROC_REF(view_happiness))
-	ADD_TRAIT(parent, TRAIT_MOB_RELAY_HAPPINESS, REF(src))
 
 /datum/component/happiness/UnregisterFromParent()
 	UnregisterSignal(parent, list(COMSIG_HOSTILE_PRE_ATTACKINGTARGET, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_MOB_ATE))
-	REMOVE_TRAIT(parent, TRAIT_MOB_RELAY_HAPPINESS, REF(src))
 	happiness_callback = null
 
 /datum/component/happiness/proc/on_eat(datum/source)
@@ -69,6 +68,11 @@
 	SIGNAL_HANDLER
 	if(!COOLDOWN_FINISHED(src, groom_cooldown))
 		return
+
+	var/mob/living/living_parent = parent
+	if (living_parent.stat != CONSCIOUS)
+		return
+
 	COOLDOWN_START(src, groom_cooldown, GROOM_COOLDOWN)
 	increase_happiness_level(on_groom_change)
 
@@ -76,15 +80,12 @@
 	SIGNAL_HANDLER
 	if(!LAZYACCESS(modifiers, LEFT_CLICK) || petter.combat_mode)
 		return
-	pet_animal()
 
-/datum/component/happiness/proc/on_animal_petted(datum/source, mob/living/petter)
-	SIGNAL_HANDLER
-
-	if(petter.combat_mode)
+	var/mob/living/living_parent = parent
+	if (living_parent.stat != CONSCIOUS)
 		return
+
 	pet_animal()
-	return COMSIG_BASIC_ATTACK_CANCEL_CHAIN
 
 /datum/component/happiness/proc/pet_animal()
 	if(!COOLDOWN_FINISHED(src, pet_cooldown))
@@ -95,13 +96,14 @@
 
 /datum/component/happiness/proc/increase_happiness_level(amount)
 	happiness_level = min(happiness_level + amount, maximum_happiness)
-	var/mob/living/living_parent = parent
-	new /obj/effect/temp_visual/heart(living_parent.loc)
-	living_parent.spin(spintime = 2 SECONDS, speed = 1)
+	if(!HAS_TRAIT(parent, TRAIT_MOB_HIDE_HAPPINESS))
+		var/mob/living/living_parent = parent
+		new /obj/effect/temp_visual/heart(living_parent.loc)
+		living_parent.spin(spintime = 2 SECONDS, speed = 1)
 	START_PROCESSING(SSprocessing, src)
 
 /datum/component/happiness/proc/view_happiness(mob/living/source, mob/living/clicker)
-	if(!istype(clicker) || !COOLDOWN_FINISHED(src, happiness_inspect) || !clicker.CanReach(source))
+	if(HAS_TRAIT(source, TRAIT_MOB_HIDE_HAPPINESS) || !istype(clicker) || !COOLDOWN_FINISHED(src, happiness_inspect) || !clicker.CanReach(source))
 		return
 	var/list/offset_to_add = get_icon_dimensions(source.icon)
 	var/y_position = offset_to_add["height"] + 1
diff --git a/code/datums/components/heart_eater.dm b/code/datums/components/heart_eater.dm
new file mode 100644
index 0000000000000..507090b9452b0
--- /dev/null
+++ b/code/datums/components/heart_eater.dm
@@ -0,0 +1,121 @@
+/datum/component/heart_eater
+	/// Check if we fully ate whole heart and reset when we start eat new one.
+	var/bites_taken = 0
+	/// Remember the number of species damage_modifier.
+	var/remember_modifier = 0
+	/// Remember last heart we ate and reset bites_taken counter if we start eat new one
+	var/datum/weakref/last_heart_we_ate
+	/// List of all mutations allowed to get.
+	var/static/list/datum/mutation/human/mutations_list = list(
+		/datum/mutation/human/adaptation/cold,
+		/datum/mutation/human/adaptation/heat,
+		/datum/mutation/human/adaptation/pressure,
+		/datum/mutation/human/adaptation/thermal,
+		/datum/mutation/human/chameleon,
+		/datum/mutation/human/cryokinesis,
+		/datum/mutation/human/cryokinesis/pyrokinesis,
+		/datum/mutation/human/dwarfism,
+		/datum/mutation/human/geladikinesis/ash,
+		/datum/mutation/human/insulated,
+		/datum/mutation/human/telekinesis,
+		/datum/mutation/human/telepathy,
+		/datum/mutation/human/thermal,
+		/datum/mutation/human/tongue_spike,
+		/datum/mutation/human/webbing,
+		/datum/mutation/human/xray,
+	)
+
+/datum/component/heart_eater/Initialize(...)
+	. = ..()
+	if(!ishuman(parent))
+		return COMPONENT_INCOMPATIBLE
+	prepare_species(parent)
+
+/datum/component/heart_eater/RegisterWithParent()
+	. = ..()
+	RegisterSignal(parent, COMSIG_SPECIES_GAIN, PROC_REF(on_species_change))
+	RegisterSignal(parent, COMSIG_LIVING_FINISH_EAT, PROC_REF(eat_eat_eat))
+
+/datum/component/heart_eater/UnregisterFromParent()
+	. = ..()
+	UnregisterSignal(parent, COMSIG_LIVING_FINISH_EAT)
+	UnregisterSignal(parent, COMSIG_SPECIES_GAIN)
+
+/datum/component/heart_eater/proc/prepare_species(mob/living/carbon/human/eater)
+	if(eater.get_liked_foodtypes() & GORE)
+		return
+	var/obj/item/organ/internal/tongue/eater_tongue = eater.get_organ_slot(ORGAN_SLOT_TONGUE)
+	if(!eater_tongue)
+		return
+	eater_tongue.disliked_foodtypes &= ~GORE
+	eater_tongue.liked_foodtypes |= GORE
+
+/datum/component/heart_eater/proc/on_species_change(mob/living/carbon/human/eater, datum/species/new_species, datum/species/old_species)
+	SIGNAL_HANDLER
+
+	eater.dna?.species?.damage_modifier += remember_modifier
+	prepare_species(eater)
+
+/// Proc called when we finish eat somthing.
+/datum/component/heart_eater/proc/eat_eat_eat(mob/living/carbon/human/eater, datum/what_we_ate)
+	SIGNAL_HANDLER
+
+	if(get_area(eater) == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	if(!istype(what_we_ate, /obj/item/organ/internal/heart))
+		return
+	var/obj/item/organ/internal/heart/we_ate_heart = what_we_ate
+	var/obj/item/organ/internal/heart/previous_heart = last_heart_we_ate?.resolve()
+	if(we_ate_heart == previous_heart)
+		return
+	if (!HAS_TRAIT(we_ate_heart, TRAIT_USED_ORGAN))
+		to_chat(eater, span_warning("This heart is utterly lifeless, you won't receive any boons from consuming it!"))
+		return
+	bites_taken = 0
+
+	last_heart_we_ate = WEAKREF(we_ate_heart)
+	bites_taken++
+	if(bites_taken < (we_ate_heart.reagents.total_volume/2))
+		return
+	if(prob(50))
+		perfect_heart(eater)
+		return
+	not_perfect_heart(eater)
+
+///Perfect heart give our +10 damage modifier(Max. 80).
+/datum/component/heart_eater/proc/perfect_heart(mob/living/carbon/human/eater)
+	if(eater.dna?.species?.damage_modifier >= 80)
+		healing_heart(eater)
+		return
+	eater.dna?.species?.damage_modifier += 10
+	remember_modifier += 10
+	healing_heart(eater)
+	to_chat(eater, span_warning("This heart is perfect. You feel a surge of vital energy."))
+
+///Not Perfect heart give random mutation.
+/datum/component/heart_eater/proc/not_perfect_heart(mob/living/carbon/human/eater)
+	var/datum/mutation/human/new_mutation
+	var/list/datum/mutation/human/shuffle_mutation_list = shuffle(mutations_list)
+	for(var/mutation_in_list in shuffle_mutation_list)
+		if(is_type_in_list(mutation_in_list, eater.dna.mutations))
+			continue
+		new_mutation = mutation_in_list
+		break
+	if(isnull(new_mutation))
+		healing_heart(eater)
+		return
+	eater.dna.add_mutation(new_mutation)
+	healing_heart(eater)
+	to_chat(eater, span_warning("This heart is not right for you. You now have [new_mutation.name] mutation."))
+
+///Heart eater give also strong healing from hearts.
+/datum/component/heart_eater/proc/healing_heart(mob/living/carbon/human/eater)
+	for(var/heal_organ in eater.organs)
+		eater.adjustOrganLoss(heal_organ, -50)
+	for(var/datum/wound/heal_wound in eater.all_wounds)
+		heal_wound.remove_wound()
+	eater.adjustBruteLoss(-50)
+	eater.adjustFireLoss(-50)
+	eater.adjustToxLoss(-50)
+	eater.adjustOxyLoss(-50)
+	eater.adjustStaminaLoss(-50)
diff --git a/code/datums/components/jukebox.dm b/code/datums/components/jukebox.dm
index 545b9daab0b1e..7d453f8033db9 100644
--- a/code/datums/components/jukebox.dm
+++ b/code/datums/components/jukebox.dm
@@ -130,7 +130,7 @@
 		var/datum/track/one_song = songs[song_name]
 		UNTYPED_LIST_ADD(songs_data, list( \
 			"name" = song_name, \
-			"length" = DisplayTimeText(one_song.song_length), \
+			"length" = one_song.song_length  /* BANDASTATION EDIT - ORIGINAL: DisplayTimeText(one_song.song_length) */, \
 			"beat" = one_song.song_beat, \
 		))
 
diff --git a/code/datums/components/mob_chain.dm b/code/datums/components/mob_chain.dm
index a258fe3f5be60..e2f90eed16ee8 100644
--- a/code/datums/components/mob_chain.dm
+++ b/code/datums/components/mob_chain.dm
@@ -88,7 +88,7 @@
 	var/mob/living/body = parent
 	body.update_appearance(UPDATE_ICON_STATE)
 
-/// Called when something sets us as IT'S front
+/// Called when something sets us as ITS front
 /datum/component/mob_chain/proc/on_gained_tail(mob/living/body, mob/living/tail)
 	SIGNAL_HANDLER
 	back = tail
diff --git a/code/datums/components/object_possession.dm b/code/datums/components/object_possession.dm
index c62f0905068b1..2a423e0016c79 100644
--- a/code/datums/components/object_possession.dm
+++ b/code/datums/components/object_possession.dm
@@ -8,7 +8,7 @@
 	/**
 	  * back up of the real name during user possession
 	  *
-	  * When a user possesses an object it's real name is set to the user name and this
+	  * When a user possesses an object its real name is set to the user name and this
 	  * stores whatever the real name was previously. When possession ends, the real name
 	  * is reset to this value
 	  */
diff --git a/code/datums/components/on_hit_effect.dm b/code/datums/components/on_hit_effect.dm
deleted file mode 100644
index 9d1d047429069..0000000000000
--- a/code/datums/components/on_hit_effect.dm
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * ## On Hit Effect Component!
- *
- * Component for other elements/components to rely on for on-hit effects without duplicating the on-hit code.
- * See Lifesteal, or bane for examples.
- *
- * THIS COULD EASILY SUPPORT COMPONENT_DUPE_ALLOWED but the getcomponent makes it throw errors. if you can figure that out feel free to readd the dupe types
- */
-/datum/component/on_hit_effect
-	///callback used by other components to apply effects
-	var/datum/callback/on_hit_callback
-	///callback optionally used for more checks
-	var/datum/callback/extra_check_callback
-	///optionally should we also apply the effect if thrown at something?
-	var/thrown_effect
-
-/datum/component/on_hit_effect/Initialize(on_hit_callback, extra_check_callback, thrown_effect = FALSE)
-	src.on_hit_callback = on_hit_callback
-	src.extra_check_callback = extra_check_callback
-	if(!(ismachinery(parent) || isstructure(parent) || isgun(parent) || isprojectilespell(parent) || isitem(parent) || isanimal_or_basicmob(parent) || isprojectile(parent)))
-		return ELEMENT_INCOMPATIBLE
-	src.thrown_effect = thrown_effect
-
-/datum/component/on_hit_effect/Destroy(force)
-	on_hit_callback = null
-	extra_check_callback = null
-	return ..()
-
-/datum/component/on_hit_effect/RegisterWithParent()
-	if(ismachinery(parent) || isstructure(parent) || isgun(parent) || isprojectilespell(parent))
-		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit))
-	else if(isitem(parent))
-		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
-	else if(isanimal_or_basicmob(parent))
-		RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
-	else if(isprojectile(parent))
-		RegisterSignal(parent, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_projectile_self_hit))
-
-	if(thrown_effect)
-		RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(on_thrown_hit))
-
-/datum/component/on_hit_effect/UnregisterFromParent()
-	UnregisterSignal(parent, list(
-		COMSIG_PROJECTILE_ON_HIT,
-		COMSIG_ITEM_AFTERATTACK,
-		COMSIG_HOSTILE_POST_ATTACKINGTARGET,
-		COMSIG_PROJECTILE_SELF_ON_HIT,
-		COMSIG_MOVABLE_IMPACT,
-	))
-
-/datum/component/on_hit_effect/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
-	SIGNAL_HANDLER
-
-	if(!proximity_flag)
-		return
-
-	if(extra_check_callback)
-		if(!extra_check_callback.Invoke(user, target, source))
-			return
-	on_hit_callback.Invoke(source, user, target, user.zone_selected)
-
-/datum/component/on_hit_effect/proc/hostile_attackingtarget(mob/living/attacker, atom/target, success)
-	SIGNAL_HANDLER
-
-	if(!success)
-		return
-
-	if(extra_check_callback)
-		if(!extra_check_callback.Invoke(attacker, target))
-			return
-	on_hit_callback.Invoke(attacker, attacker, target, attacker.zone_selected)
-
-/datum/component/on_hit_effect/proc/on_projectile_hit(datum/fired_from, atom/movable/firer, atom/target, angle, body_zone)
-	SIGNAL_HANDLER
-
-	if(extra_check_callback)
-		if(!extra_check_callback.Invoke(firer, target))
-			return
-	on_hit_callback.Invoke(fired_from, firer, target, body_zone)
-
-/datum/component/on_hit_effect/proc/on_projectile_self_hit(datum/source, mob/firer, atom/target, angle, body_zone)
-	SIGNAL_HANDLER
-
-	if(extra_check_callback)
-		if(!extra_check_callback.Invoke(firer, target))
-			return
-	on_hit_callback.Invoke(source, firer, target, body_zone)
-
-/datum/component/on_hit_effect/proc/on_thrown_hit(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum)
-	SIGNAL_HANDLER
-	if(extra_check_callback && !extra_check_callback.Invoke(source, hit_atom))
-		return
-	on_hit_callback.Invoke(source, source, hit_atom, null)
diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm
index 19c7528db8bf3..258b8f87972e0 100644
--- a/code/datums/components/overlay_lighting.dm
+++ b/code/datums/components/overlay_lighting.dm
@@ -62,7 +62,7 @@
 	var/directional = FALSE
 	///Whether we're a beam light
 	var/beam = FALSE
-	///A cone overlay for directional light, it's alpha and color are dependant on the light
+	///A cone overlay for directional light, its alpha and color are dependant on the light
 	var/image/cone
 	///Current tracked direction for the directional cast behaviour
 	var/current_direction
diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm
index fedfcb77d15ea..a2cfe789cba4f 100644
--- a/code/datums/components/parry.dm
+++ b/code/datums/components/parry.dm
@@ -1,38 +1,121 @@
-/// Add to a living mob to allow them to "parry" projectiles by clicking on their tile, sending them back at the firer.
-/datum/component/projectile_parry
-	/// typecache of valid projectiles to be able to parry
-	var/list/parryable_projectiles
+/// Add to a projectile to allow it to be parried by mobs with a certain trait (TRAIT_MINING_PARRYING by default)
+/datum/component/parriable_projectile
+	/// List of all turfs the projectile passed on its last loop and we assigned comsigs to
+	var/list/turf/parry_turfs = list()
+	/// List of all mobs who have clicked on a parry turf in last moveloop
+	var/list/mob/parriers = list()
+	/// When the projectile was created
+	var/fire_time = 0
+	/// If this projectile has been parried
+	var/parried = FALSE
+	/// How much this projectile is sped up when parried
+	var/parry_speed_mult
+	/// How much this projectile's damage is increased when parried
+	var/parry_damage_mult
+	/// How much this projectile is sped up when boosted (parried by owner)
+	var/boost_speed_mult
+	/// How much this projectile's damage is increased when boosted (parried by owner)
+	var/boost_damage_mult
+	/// Trait required to be able to parry this projectile
+	var/parry_trait
+	/// For how long do valid tiles persist? Acts as clientside lag compensation
+	var/grace_period
+	/// Callback for special effects upon parrying
+	var/datum/callback/parry_callback
 
-
-/datum/component/projectile_parry/Initialize(list/projectiles_to_parry)
-	if(!isliving(parent))
+/datum/component/parriable_projectile/Initialize(parry_speed_mult = 0.8, parry_damage_mult = 1.15, boost_speed_mult = 0.6, boost_damage_mult = 1.5, parry_trait = TRAIT_MINING_PARRYING, grace_period = 0.25 SECONDS, datum/callback/parry_callback = null)
+	if(!isprojectile(parent))
 		return COMPONENT_INCOMPATIBLE
+	src.parry_speed_mult = parry_speed_mult
+	src.parry_damage_mult = parry_damage_mult
+	src.boost_speed_mult = boost_speed_mult
+	src.boost_damage_mult = boost_damage_mult
+	src.parry_trait = parry_trait
+	src.grace_period = grace_period
+	src.parry_callback = parry_callback
+	fire_time = world.time
+
+/datum/component/parriable_projectile/Destroy(force)
+	for (var/turf/parry_turf as anything in parry_turfs)
+		UnregisterSignal(parry_turf, COMSIG_CLICK)
+	. = ..()
 
-	parryable_projectiles = typecacheof(projectiles_to_parry)
+/datum/component/parriable_projectile/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_PROJECTILE_PIXEL_STEP, PROC_REF(on_moved))
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(before_move))
+	RegisterSignal(parent, COMSIG_PROJECTILE_BEFORE_MOVE, PROC_REF(before_move))
+	RegisterSignal(parent, COMSIG_PROJECTILE_SELF_PREHIT, PROC_REF(before_hit))
 
+/datum/component/parriable_projectile/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_PROJECTILE_PIXEL_STEP, COMSIG_MOVABLE_MOVED, COMSIG_PROJECTILE_BEFORE_MOVE, COMSIG_PROJECTILE_SELF_PREHIT))
 
-/datum/component/projectile_parry/RegisterWithParent()
-	RegisterSignal(parent, COMSIG_LIVING_PROJECTILE_PARRYING, PROC_REF(parrying_projectile))
-	RegisterSignal(parent, COMSIG_LIVING_PROJECTILE_PARRIED, PROC_REF(parried_projectile))
+/datum/component/parriable_projectile/proc/before_move(obj/projectile/source)
+	SIGNAL_HANDLER
 
+	var/list/turfs_to_remove = list()
+	for (var/turf/parry_turf as anything in parry_turfs)
+		if (parry_turfs[parry_turf] < world.time)
+			turfs_to_remove += parry_turf
 
-/datum/component/projectile_parry/UnregisterFromParent()
-	UnregisterSignal(parent, list(COMSIG_LIVING_PROJECTILE_PARRYING, COMSIG_LIVING_PROJECTILE_PARRIED))
+	for (var/turf/parry_turf as anything in turfs_to_remove)
+		parry_turfs -= parry_turf
+		UnregisterSignal(parry_turf, COMSIG_CLICK)
 
+	var/list/parriers_to_remove = list()
+	for (var/mob/parrier as anything in parriers)
+		if (parriers[parrier] < world.time)
+			parriers_to_remove += parrier
 
-/datum/component/projectile_parry/proc/parrying_projectile(datum/source, obj/projectile/parried_projectile)
-	SIGNAL_HANDLER
+	for (var/mob/parrier as anything in parriers_to_remove)
+		parriers_to_remove -= parrier
 
-	if(is_type_in_typecache(parried_projectile, parryable_projectiles))
-		return ALLOW_PARRY
+/datum/component/parriable_projectile/proc/on_moved(obj/projectile/source)
+	SIGNAL_HANDLER
+	if (!isturf(source.loc))
+		return
+	parry_turfs[source.loc] = world.time + grace_period
+	RegisterSignal(source.loc, COMSIG_CLICK, PROC_REF(on_turf_click))
 
+/datum/component/parriable_projectile/proc/on_turf_click(turf/source, atom/location, control, list/params, mob/user)
+	SIGNAL_HANDLER
+	if (!HAS_TRAIT(user, parry_trait))
+		return
+	var/obj/projectile/proj_parent = parent
+	if (proj_parent.firer == user && (fire_time + grace_period > world.time) && !parried)
+		attempt_parry(proj_parent, user)
+		return
+	parriers[user] = world.time + grace_period
 
-/datum/component/projectile_parry/proc/parried_projectile(datum/source, obj/projectile/parried_projectile)
+/datum/component/parriable_projectile/proc/before_hit(obj/projectile/source, list/bullet_args)
 	SIGNAL_HANDLER
 
-	var/mob/living/living_parent = parent
+	var/mob/user = bullet_args[2]
+	if (!istype(user) || !parriers[user] || parried)
+		return
+	parriers -= user
+	attempt_parry(source, user)
+
+/datum/component/parriable_projectile/proc/attempt_parry(obj/projectile/source, mob/user)
+	if (SEND_SIGNAL(user, COMSIG_LIVING_PROJECTILE_PARRIED, source) & INTERCEPT_PARRY_EFFECTS)
+		return
+
+	parried = TRUE
+	if (source.firer != user)
+		if (abs(source.Angle - dir2angle(user)) < 15)
+			source.set_angle((source.Angle + 180) % 360 + rand(-3, 3))
+		else
+			source.set_angle(dir2angle(user) + rand(-3, 3))
+		user.visible_message(span_warning("[user] expertly parries [source] with [user.p_their()] bare hand!"), span_warning("You parry [source] with your hand!"))
+	else
+		user.visible_message(span_warning("[user] boosts [source] with [user.p_their()] bare hand!"), span_warning("You boost [source] with your hand!"))
+	source.firer = user
+	source.speed *= (source.firer == user) ? boost_speed_mult : parry_speed_mult
+	source.damage *= (source.firer == user) ? boost_damage_mult : parry_damage_mult
+	source.add_atom_colour(COLOR_RED_LIGHT, TEMPORARY_COLOUR_PRIORITY)
+	if (!isnull(parry_callback))
+		parry_callback.Invoke(user)
 
-	living_parent.playsound_local(get_turf(parried_projectile), 'sound/effects/parry.ogg', 50, TRUE)
-	living_parent.overlay_fullscreen("projectile_parry", /atom/movable/screen/fullscreen/crit/projectile_parry, 2)
-	addtimer(CALLBACK(living_parent, TYPE_PROC_REF(/mob, clear_fullscreen), "projectile_parry"), 0.25 SECONDS)
-	living_parent.visible_message(span_warning("[living_parent] expertly parries [parried_projectile] with [living_parent.p_their()] bare hand!"), span_warning("You parry [parried_projectile] with your hand!"))
+	user.playsound_local(source.loc, 'sound/effects/parry.ogg', 50, TRUE)
+	user.overlay_fullscreen("projectile_parry", /atom/movable/screen/fullscreen/crit/projectile_parry, 2)
+	addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, clear_fullscreen), "projectile_parry"), 0.25 SECONDS)
+	return PROJECTILE_INTERRUPT_HIT
diff --git a/code/datums/components/pet_commands/pet_command.dm b/code/datums/components/pet_commands/pet_command.dm
index cf376b21001e8..5d5691a10a344 100644
--- a/code/datums/components/pet_commands/pet_command.dm
+++ b/code/datums/components/pet_commands/pet_command.dm
@@ -18,6 +18,8 @@
 	var/radial_icon_state
 	/// Speech strings to listen out for
 	var/list/speech_commands = list()
+	/// Callout that triggers this command
+	var/callout_type
 	/// Shown above the mob's head when it hears you
 	var/command_feedback
 	/// How close a mob needs to be to a target to respond to a command
@@ -31,10 +33,11 @@
 /datum/pet_command/proc/add_new_friend(mob/living/tamer)
 	RegisterSignal(tamer, COMSIG_MOB_SAY, PROC_REF(respond_to_command))
 	RegisterSignal(tamer, COMSIG_MOB_AUTOMUTE_CHECK, PROC_REF(waive_automute))
+	RegisterSignal(tamer, COMSIG_MOB_CREATED_CALLOUT, PROC_REF(respond_to_callout))
 
 /// Stop listening to a guy
 /datum/pet_command/proc/remove_friend(mob/living/unfriended)
-	UnregisterSignal(unfriended, list(COMSIG_MOB_SAY, COMSIG_MOB_AUTOMUTE_CHECK))
+	UnregisterSignal(unfriended, list(COMSIG_MOB_SAY, COMSIG_MOB_AUTOMUTE_CHECK, COMSIG_MOB_CREATED_CALLOUT))
 
 /// Stop the automute from triggering for commands (unless the spoken text is suspiciously longer than the command)
 /datum/pet_command/proc/waive_automute(mob/living/speaker, client/client, last_message, mute_type)
@@ -59,15 +62,43 @@
 
 	try_activate_command(speaker)
 
+/// Respond to a callout
+/datum/pet_command/proc/respond_to_callout(mob/living/caller, datum/callout_option/callout, atom/target)
+	SIGNAL_HANDLER
+
+	if (isnull(callout_type) || !ispath(callout, callout_type))
+		return
+
+	var/mob/living/parent = weak_parent.resolve()
+	if (!parent)
+		return
+
+	if (!valid_callout_target(caller, callout, target))
+		var/found_new_target = FALSE
+		for (var/atom/new_target in range(2, target))
+			if (valid_callout_target(caller, callout, new_target))
+				target = new_target
+				found_new_target = TRUE
+
+		if (!found_new_target)
+			return
+
+	if (try_activate_command(caller))
+		look_for_target(parent, target)
+
+/// Does this callout with this target trigger this command?
+/datum/pet_command/proc/valid_callout_target(mob/living/caller, datum/callout_option/callout, atom/target)
+	return TRUE
+
 /**
  * Returns true if we find any of our spoken commands in the text.
  * if check_verbosity is true, skip the match if there spoken_text is way longer than the match
  */
 /datum/pet_command/proc/find_command_in_text(spoken_text, check_verbosity = FALSE)
 	for (var/command as anything in speech_commands)
-		if (!findtext(spoken_text, command))
+		if (!findtext_char(spoken_text, command))
 			continue
-		if(check_verbosity && length(spoken_text) > length(command) + MAX_NAME_LEN)
+		if(check_verbosity && length_char(spoken_text) > length_char(command) + MAX_NAME_LEN)
 			continue
 		return TRUE
 	return FALSE
@@ -76,14 +107,35 @@
 /datum/pet_command/proc/try_activate_command(mob/living/commander)
 	var/mob/living/parent = weak_parent.resolve()
 	if (!parent)
-		return
+		return FALSE
 	if (!parent.ai_controller) // We stopped having a brain at some point
-		return
+		return FALSE
 	if (IS_DEAD_OR_INCAP(parent)) // Probably can't hear them if we're dead
-		return
+		return FALSE
 	if (parent.ai_controller.blackboard[BB_ACTIVE_PET_COMMAND] == src) // We're already doing it
-		return
+		return FALSE
 	set_command_active(parent, commander)
+	return TRUE
+
+/// Target the pointed atom for actions
+/datum/pet_command/proc/look_for_target(mob/living/friend, atom/pointed_atom)
+	var/mob/living/parent = weak_parent.resolve()
+	if (!parent)
+		return FALSE
+	if (!parent.ai_controller)
+		return FALSE
+	if (IS_DEAD_OR_INCAP(parent))
+		return FALSE
+	if (parent.ai_controller.blackboard[BB_ACTIVE_PET_COMMAND] != src) // We're not listening right now
+		return FALSE
+	if (parent.ai_controller.blackboard[BB_CURRENT_PET_TARGET] == pointed_atom) // That's already our target
+		return FALSE
+	if (!can_see(parent, pointed_atom, sense_radius))
+		return FALSE
+
+	parent.ai_controller.CancelActions()
+	set_command_target(parent, pointed_atom)
+	return TRUE
 
 /// Activate the command, extend to add visible messages and the like
 /datum/pet_command/proc/set_command_active(mob/living/parent, mob/living/commander)
@@ -97,6 +149,7 @@
 /// Store the target for the AI blackboard
 /datum/pet_command/proc/set_command_target(mob/living/parent, atom/target)
 	parent.ai_controller.set_blackboard_key(BB_CURRENT_PET_TARGET, target)
+	return TRUE
 
 /// Provide information about how to display this command in a radial menu
 /datum/pet_command/proc/provide_radial_data()
@@ -133,33 +186,22 @@
 
 /datum/pet_command/point_targeting/add_new_friend(mob/living/tamer)
 	. = ..()
-	RegisterSignal(tamer, COMSIG_MOB_POINTED, PROC_REF(look_for_target))
+	RegisterSignal(tamer, COMSIG_MOB_POINTED, PROC_REF(on_point))
 
 /datum/pet_command/point_targeting/remove_friend(mob/living/unfriended)
 	. = ..()
 	UnregisterSignal(unfriended, COMSIG_MOB_POINTED)
 
 /// Target the pointed atom for actions
-/datum/pet_command/point_targeting/proc/look_for_target(mob/living/friend, atom/pointed_atom)
+/datum/pet_command/point_targeting/proc/on_point(mob/living/friend, atom/pointed_atom)
 	SIGNAL_HANDLER
 
 	var/mob/living/parent = weak_parent.resolve()
 	if (!parent)
 		return FALSE
-	if (!parent.ai_controller)
-		return FALSE
-	if (IS_DEAD_OR_INCAP(parent))
-		return FALSE
-	if (parent.ai_controller.blackboard[BB_ACTIVE_PET_COMMAND] != src) // We're not listening right now
-		return FALSE
-	if (parent.ai_controller.blackboard[BB_CURRENT_PET_TARGET] == pointed_atom) // That's already our target
-		return FALSE
-	if (!can_see(parent, pointed_atom, sense_radius))
-		return FALSE
 
 	parent.ai_controller.CancelActions()
-	// Deciding if they can actually do anything with this target is the behaviour's job
-	set_command_target(parent, pointed_atom)
-	// These are usually hostile actions so should have a record in chat
-	parent.visible_message(span_warning("[parent] follows [friend]'s gesture towards [pointed_atom] [pointed_reaction]!"))
-	return TRUE
+	if (look_for_target(friend, pointed_atom) && set_command_target(parent, pointed_atom))
+		parent.visible_message(span_warning("[parent] follows [friend]'s gesture towards [pointed_atom] [pointed_reaction]!"))
+		return TRUE
+	return FALSE
diff --git a/code/datums/components/pet_commands/pet_commands_basic.dm b/code/datums/components/pet_commands/pet_commands_basic.dm
index 77b9efaab54b4..dbc63320598d7 100644
--- a/code/datums/components/pet_commands/pet_commands_basic.dm
+++ b/code/datums/components/pet_commands/pet_commands_basic.dm
@@ -41,6 +41,7 @@
 	radial_icon = 'icons/testing/turf_analysis.dmi'
 	radial_icon_state = "red_arrow"
 	speech_commands = list("heel", "follow", "за мной", "след", "охран", "к ноге", "ко мне")
+	callout_type = /datum/callout_option/move
 	///the behavior we use to follow
 	var/follow_behavior = /datum/ai_behavior/pet_follow_friend
 
@@ -124,6 +125,7 @@
 	radial_icon = 'icons/effects/effects.dmi'
 	radial_icon_state = "bite"
 
+	callout_type = /datum/callout_option/attack
 	speech_commands = list("attack", "sic", "kill", "апорт", "фас", "бить", "атак")
 	command_feedback = "growl"
 	pointed_reaction = "and growls"
@@ -202,6 +204,8 @@
 	pointed_reaction = "and growls"
 	/// Blackboard key where a reference to some kind of mob ability is stored
 	var/pet_ability_key
+	/// The AI behavior to use for the ability
+	var/ability_behavior = /datum/ai_behavior/pet_use_ability
 
 /datum/pet_command/point_targeting/use_ability/execute_action(datum/ai_controller/controller)
 	if (!pet_ability_key)
@@ -211,13 +215,14 @@
 		return
 	// We don't check if the target exists because we want to 'sit attentively' if we've been instructed to attack but not given one yet
 	// We also don't check if the cooldown is over because there's no way a pet owner can know that, the behaviour will handle it
-	controller.queue_behavior(/datum/ai_behavior/pet_use_ability, pet_ability_key, BB_CURRENT_PET_TARGET)
+	controller.queue_behavior(ability_behavior, pet_ability_key, BB_CURRENT_PET_TARGET)
 	return SUBTREE_RETURN_FINISH_PLANNING
 
 /datum/pet_command/protect_owner
 	command_name = "Protect owner"
 	command_desc = "Your pet will run to your aid."
 	hidden = TRUE
+	callout_type = /datum/callout_option/guard
 	///the range our owner needs to be in for us to protect him
 	var/protect_range = 9
 	///the behavior we will use when he is attacked
@@ -248,6 +253,9 @@
 	. = ..()
 	set_command_target(parent, victim)
 
+/datum/pet_command/protect_owner/valid_callout_target(mob/living/caller, datum/callout_option/callout, atom/target)
+	return target == caller || get_dist(caller, target) <= 1
+
 /datum/pet_command/protect_owner/proc/set_attacking_target(atom/source, mob/living/attacker)
 	SIGNAL_HANDLER
 
@@ -266,3 +274,29 @@
 		return
 	if(isliving(attacker) && can_see(owner, attacker, protect_range))
 		set_command_active(owner, attacker)
+
+/**
+ * # Fish command: command the mob to fish at the next fishing spot you point at. Requires the profound fisher component
+ */
+/datum/pet_command/point_targeting/fish
+	command_name = "Fish"
+	command_desc = "Command your pet to try fishing at a nearby fishing spot."
+	radial_icon = 'icons/obj/aquarium/fish.dmi'
+	radial_icon_state = "goldfish"
+	speech_commands = list("fish")
+
+// Refuse to target things we can't target, chiefly other friends
+/datum/pet_command/point_targeting/fish/set_command_target(mob/living/parent, atom/target)
+	if (!target)
+		return
+	if(!parent.ai_controller || !HAS_TRAIT(parent, TRAIT_PROFOUND_FISHER))
+		return
+	var/datum/targeting_strategy/targeter = GET_TARGETING_STRATEGY(/datum/targeting_strategy/fishing)
+	if (!targeter?.can_attack(parent, target))
+		parent.balloon_alert_to_viewers("shakes head!")
+		return
+	return ..()
+
+/datum/pet_command/point_targeting/fish/execute_action(datum/ai_controller/controller)
+	controller.queue_behavior(/datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target_combat_mode, BB_CURRENT_PET_TARGET)
+	return SUBTREE_RETURN_FINISH_PLANNING
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
index 490f88d39b25e..c59be2ed27651 100644
--- a/code/datums/components/plumbing/_plumbing.dm
+++ b/code/datums/components/plumbing/_plumbing.dm
@@ -302,7 +302,7 @@
 		demand_connects = new_demand_connects
 		supply_connects = new_supply_connects
 
-///Give the direction of a pipe, and it'll return wich direction it originally was when it's object pointed SOUTH
+///Give the direction of a pipe, and it'll return wich direction it originally was when its object pointed SOUTH
 /datum/component/plumbing/proc/get_original_direction(dir)
 	var/atom/movable/parent_movable = parent
 	return turn(dir, dir2angle(parent_movable.dir) - 180)
diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm
index ec839e265f2f0..4485115db06e6 100644
--- a/code/datums/components/profound_fisher.dm
+++ b/code/datums/components/profound_fisher.dm
@@ -2,14 +2,11 @@
 /datum/component/profound_fisher
 	///the fishing rod this mob will use
 	var/obj/item/fishing_rod/mob_fisher/our_rod
-	///if controlled by an AI, the things this mob can "pretend" fish
-	var/list/npc_fishing_preset
 
 /datum/component/profound_fisher/Initialize(list/npc_fishing_preset = list())
 	if(!isliving(parent))
 		return
 	our_rod = new(parent)
-	src.npc_fishing_preset = npc_fishing_preset
 	ADD_TRAIT(parent, TRAIT_PROFOUND_FISHER, REF(src))
 
 /datum/component/profound_fisher/RegisterWithParent()
@@ -29,7 +26,7 @@
 	if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT))
 		return NONE
 	var/mob/living/living_parent = parent
-	if(!living_parent.CanReach(target))
+	if(living_parent.combat_mode || !living_parent.CanReach(target))
 		return NONE
 	if(living_parent.client)
 		INVOKE_ASYNC(our_rod, TYPE_PROC_REF(/obj/item, melee_attack_chain), parent, target)
@@ -38,27 +35,29 @@
 	return COMPONENT_HOSTILE_NO_ATTACK
 
 /datum/component/profound_fisher/proc/pretend_fish(atom/target)
-	var/fishing_type
-	for(var/type in npc_fishing_preset)
-		if(!istype(target, type))
-			continue
-		fishing_type = npc_fishing_preset[type]
-		break
-	var/datum/fish_source/fish_spot = GLOB.preset_fish_sources[fishing_type]
+	var/mob/living/living_parent = parent
+	if(DOING_INTERACTION_WITH_TARGET(living_parent, target))
+		return
+	var/list/fish_spot_container[NPC_FISHING_SPOT]
+	SEND_SIGNAL(target, COMSIG_NPC_FISHING, fish_spot_container)
+	var/datum/fish_source/fish_spot = fish_spot_container[NPC_FISHING_SPOT]
 	if(isnull(fish_spot))
 		return null
 	var/obj/effect/fishing_lure/lure = new(get_turf(target), target)
-	var/mob/living/living_parent = parent
-	if(!do_after(living_parent, 10 SECONDS, target = target))
+	playsound(lure, 'sound/effects/splash.ogg', 100)
+	var/happiness_percentage = living_parent.ai_controller?.blackboard[BB_BASIC_HAPPINESS] / 100
+	var/fishing_speed = 10 SECONDS - round(4 SECONDS * happiness_percentage)
+	if(!do_after(living_parent, fishing_speed, target = target) && !QDELETED(fish_spot))
 		qdel(lure)
 		return
 	var/reward_loot = fish_spot.roll_reward(our_rod, parent)
-	if(ispath(reward_loot))
-		fish_spot.dispense_reward(reward_loot, parent, target)
+	fish_spot.dispense_reward(reward_loot, parent, target)
+	playsound(lure, 'sound/effects/bigsplash.ogg', 100)
 	qdel(lure)
 
 /obj/item/fishing_rod/mob_fisher
 	display_fishing_line = FALSE
 	line = /obj/item/fishing_line/reinforced
+	bait = /obj/item/food/bait/doughball/synthetic/unconsumable
 
 
diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm
index 561d0c87218d3..5555369c67ae8 100644
--- a/code/datums/components/riding/riding_vehicle.dm
+++ b/code/datums/components/riding/riding_vehicle.dm
@@ -243,14 +243,53 @@
 /datum/component/riding/vehicle/scooter/skateboard/hover/proc/hover_check(is_moving = FALSE)
 	var/atom/movable/movable = parent
 	if(!is_space_or_openspace(movable.loc))
-		override_allow_spacemove = TRUE
+		on_hover_enabled()
 		return
 	var/turf/open/our_turf = movable.loc
-	var/turf/turf_below = GET_TURF_BELOW(our_turf)
-	if(our_turf.zPassOut(DOWN) && (isnull(turf_below) || (is_space_or_openspace(turf_below) && turf_below.zPassIn(DOWN) && turf_below.zPassOut(DOWN))))
-		override_allow_spacemove = FALSE
-		if(turf_below)
-			our_turf.zFall(movable, falling_from_move = is_moving)
+	var/turf/below = GET_TURF_BELOW(our_turf)
+
+	if(!check_space_turf(our_turf))
+		on_hover_fail()
+		return
+	//it's open space without support and the turf below is null or space without lattice, or if it'd fall several z-levels.
+	if(isopenspaceturf(our_turf) && our_turf.zPassOut(DOWN) && (isnull(below) || !check_space_turf(below) || (below.zPassOut(DOWN) && below.zPassIn(DOWN))))
+		on_hover_fail(our_turf, below, is_moving)
+		return
+	on_hover_enabled()
+
+///Part of the hover_check proc that returns false if it's a space turf without lattice or such.
+/datum/component/riding/vehicle/scooter/skateboard/hover/proc/check_space_turf(turf/turf)
+	if(!isspaceturf(turf))
+		return TRUE
+	for(var/obj/object in turf.contents)
+		if(object.obj_flags & BLOCK_Z_OUT_DOWN)
+			return TRUE
+	return FALSE
+
+///Called by hover_check() when the hoverboard is on a valid turf.
+/datum/component/riding/vehicle/scooter/skateboard/hover/proc/on_hover_enabled()
+	override_allow_spacemove = TRUE
+
+///Called by hover_check() when the hoverboard is on space or open space turf without a support underneath it.
+/datum/component/riding/vehicle/scooter/skateboard/hover/proc/on_hover_fail(turf/open/our_turf, turf/turf_below, is_moving)
+	override_allow_spacemove = FALSE
+	if(turf_below)
+		our_turf.zFall(parent, falling_from_move = is_moving)
+
+/datum/component/riding/vehicle/scooter/skateboard/hover/holy
+	var/is_slown_down = FALSE
+
+/datum/component/riding/vehicle/scooter/skateboard/hover/holy/on_hover_enabled()
+	if(!is_slown_down)
+		return
+	is_slown_down = FALSE
+	vehicle_move_delay -= 1
+
+/datum/component/riding/vehicle/scooter/skateboard/hover/holy/on_hover_fail(turf/open/our_turf, turf/turf_below, is_moving)
+	if(is_slown_down)
+		return
+	is_slown_down = TRUE
+	vehicle_move_delay += 1
 
 /datum/component/riding/vehicle/scooter/skateboard/wheelys
 	vehicle_move_delay = 0
diff --git a/code/datums/components/slime_friends.dm b/code/datums/components/slime_friends.dm
new file mode 100644
index 0000000000000..d2b751d092ea9
--- /dev/null
+++ b/code/datums/components/slime_friends.dm
@@ -0,0 +1,61 @@
+/datum/component/slime_friends
+	/// Slime maker timer.
+	var/timer
+	/// List to pick from when we need slime colour.
+	var/static/colours = list(
+		/datum/slime_type/adamantine,
+		/datum/slime_type/black,
+		/datum/slime_type/blue,
+		/datum/slime_type/bluespace,
+		/datum/slime_type/cerulean,
+		/datum/slime_type/darkblue,
+		/datum/slime_type/darkpurple,
+		/datum/slime_type/gold,
+		/datum/slime_type/green,
+		/datum/slime_type/grey,
+		/datum/slime_type/lightpink,
+		/datum/slime_type/metal,
+		/datum/slime_type/oil,
+		/datum/slime_type/orange,
+		/datum/slime_type/pink,
+		/datum/slime_type/purple,
+		/datum/slime_type/pyrite,
+		/datum/slime_type/rainbow,
+		/datum/slime_type/red,
+		/datum/slime_type/sepia,
+		/datum/slime_type/silver,
+		/datum/slime_type/yellow,
+	)
+
+/datum/component/slime_friends/Initialize(...)
+	. = ..()
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+	var/mob/living/living_parent = parent
+	living_parent.faction |= FACTION_SLIME
+	RegisterSignal(living_parent, COMSIG_ENTER_AREA, PROC_REF(start_slime_prodaction))
+
+/datum/component/slime_friends/Destroy(force)
+	. = ..()
+	var/mob/living/living_parent = parent
+	living_parent.faction -= FACTION_SLIME
+	timer = null
+
+/// Start slime prodaction when we leave wizden.
+/datum/component/slime_friends/proc/start_slime_prodaction(mob/living/friend, area/new_area)
+	if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	timer = addtimer(CALLBACK(src, PROC_REF(make_slime_friend), friend), 20 SECONDS)
+	UnregisterSignal(friend, COMSIG_ENTER_AREA)
+
+/// Slime prodactor proc.
+/datum/component/slime_friends/proc/make_slime_friend(mob/living/friend)
+	timer = addtimer(CALLBACK(src, PROC_REF(make_slime_friend), friend), 20 SECONDS)
+	if(get_area(friend) == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	var/turf/where = get_turf(friend)
+	var/new_colour = pick(colours)
+	var/mob/living/basic/slime/new_friend = new(where, new_colour, SLIME_LIFE_STAGE_ADULT)
+	new_friend.faction = friend.faction.Copy()
+	new_friend.set_enraged_behaviour()
+	friend.nutrition -= 50
diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm
index 74dbdd5642fe2..8a934cdd4c1d5 100644
--- a/code/datums/components/slippery.dm
+++ b/code/datums/components/slippery.dm
@@ -56,7 +56,7 @@
  * * lube_flags - Controls the slip behaviour, they are listed starting [here][SLIDE]
  * * datum/callback/on_slip_callback - Callback to define further custom controls on when slipping is applied
  * * paralyze - length of time to paralyze the crossing mob for (Deciseconds)
- * * force_drop - should the crossing mob drop items in it's hands or not
+ * * force_drop - should the crossing mob drop items in its hands or not
  * * slot_whitelist - flags controlling where on a mob this item can be equipped to make the parent mob slippery full list [here][ITEM_SLOT_OCLOTHING]
  * * datum/callback/on_slip_callback - Callback to add custom behaviours as the crossing mob is slipped
  */
diff --git a/code/datums/components/soapbox.dm b/code/datums/components/soapbox.dm
new file mode 100644
index 0000000000000..4622cc089288c
--- /dev/null
+++ b/code/datums/components/soapbox.dm
@@ -0,0 +1,44 @@
+/datum/component/soapbox
+	/// List of our current soapboxxer(s) who are gaining loud speech
+	var/list/soapboxers = list()
+	/// Gives atoms moving over us the soapbox speech and takes it away when they leave
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(on_loc_entered),
+		COMSIG_ATOM_EXITED = PROC_REF(on_loc_exited),
+	)
+
+/datum/component/soapbox/Initialize(...)
+	if(!ismovable(parent))
+		return COMPONENT_INCOMPATIBLE
+	add_connect_loc_behalf_to_parent()
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(parent_moved))
+
+///Applies loud speech to our movable when entering the turf our parent is on
+/datum/component/soapbox/proc/on_loc_entered(datum/source, atom/movable/soapbox_arrive)
+	SIGNAL_HANDLER
+	if(QDELETED(soapbox_arrive))
+		return
+	RegisterSignal(soapbox_arrive, COMSIG_MOB_SAY, PROC_REF(soapbox_speech))
+	soapboxers += soapbox_arrive
+
+///Takes away loud speech from our movable when it leaves the turf our parent is on
+/datum/component/soapbox/proc/on_loc_exited(datum/source, atom/movable/soapbox_leave)
+	SIGNAL_HANDLER
+	if(soapbox_leave in soapboxers)
+		UnregisterSignal(soapbox_leave, COMSIG_MOB_SAY)
+		soapboxers -= soapbox_leave
+
+///We don't want our soapboxxer to keep their loud say if the parent is moved out from under them
+/datum/component/soapbox/proc/parent_moved(datum/source)
+	SIGNAL_HANDLER
+	for(var/atom/movable/loud as anything in soapboxers)
+		UnregisterSignal(loud, COMSIG_MOB_SAY)
+		soapboxers = list()
+
+///Gives a mob a unique say span
+/datum/component/soapbox/proc/soapbox_speech(datum/source, list/speech_args)
+	SIGNAL_HANDLER
+	speech_args[SPEECH_SPANS] |= SPAN_SOAPBOX
+
+/datum/component/soapbox/proc/add_connect_loc_behalf_to_parent()
+	AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections)
diff --git a/code/datums/components/space_allaergy.dm b/code/datums/components/space_allaergy.dm
new file mode 100644
index 0000000000000..d1bc334ce1f5f
--- /dev/null
+++ b/code/datums/components/space_allaergy.dm
@@ -0,0 +1,14 @@
+/// Slowly kill the thing when iuts on a planet
+/datum/component/planet_allergy/Initialize(...)
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(entered_area))
+
+/datum/component/planet_allergy/proc/entered_area(mob/living/parent, area/new_area)
+	SIGNAL_HANDLER
+
+	if(is_on_a_planet(parent) && parent.has_gravity())
+		parent.apply_status_effect(/datum/status_effect/planet_allergy) //your gamer body cant stand real gravity
+	else
+		parent.remove_status_effect(/datum/status_effect/planet_allergy)
diff --git a/code/datums/components/space_camo.dm b/code/datums/components/space_camo.dm
new file mode 100644
index 0000000000000..08b6c10649443
--- /dev/null
+++ b/code/datums/components/space_camo.dm
@@ -0,0 +1,54 @@
+/// Camouflage us when we enter space by increasing alpha and or changing color
+/datum/component/space_camo
+	/// Alpha we have in space
+	var/space_alpha
+	/// Alpha we have elsewhere
+	var/non_space_alpha
+	/// How long we can't enter camo after hitting or being hit
+	var/reveal_after_combat
+	/// The world time after we can camo again
+	VAR_PRIVATE/next_camo
+
+/datum/component/space_camo/Initialize(space_alpha, non_space_alpha, reveal_after_combat)
+	if(!ismovable(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.space_alpha = space_alpha
+	src.non_space_alpha = non_space_alpha
+	src.reveal_after_combat = reveal_after_combat
+
+	RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(on_atom_entering))
+
+	if(isliving(parent))
+		RegisterSignals(parent, list(COMSIG_ATOM_WAS_ATTACKED, COMSIG_MOB_ITEM_ATTACK, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_REVEAL), PROC_REF(force_exit_camo))
+
+/datum/component/space_camo/proc/on_atom_entering(atom/movable/entering, atom/entered)
+	SIGNAL_HANDLER
+
+	if(!attempt_enter_camo())
+		exit_camo(parent)
+
+/datum/component/space_camo/proc/attempt_enter_camo()
+	if(!isspaceturf(get_turf(parent)) || next_camo > world.time)
+		return FALSE
+
+	enter_camo(parent)
+	return TRUE
+
+/datum/component/space_camo/proc/force_exit_camo()
+	SIGNAL_HANDLER
+
+	exit_camo(parent)
+	next_camo = world.time + reveal_after_combat
+	addtimer(CALLBACK(src, PROC_REF(attempt_enter_camo)), reveal_after_combat, TIMER_OVERRIDE | TIMER_UNIQUE)
+
+/datum/component/space_camo/proc/enter_camo(atom/movable/parent)
+	if(parent.alpha != space_alpha)
+		animate(parent, alpha = space_alpha, time = 0.5 SECONDS)
+	parent.remove_from_all_data_huds()
+	parent.add_atom_colour(SSparallax.get_parallax_color(), TEMPORARY_COLOUR_PRIORITY)
+
+/datum/component/space_camo/proc/exit_camo(atom/movable/parent)
+	animate(parent, alpha = non_space_alpha, time = 0.5 SECONDS)
+	parent.add_to_all_human_data_huds()
+	parent.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY)
diff --git a/code/datums/components/space_dive.dm b/code/datums/components/space_dive.dm
new file mode 100644
index 0000000000000..bbbeb0bb16832
--- /dev/null
+++ b/code/datums/components/space_dive.dm
@@ -0,0 +1,84 @@
+/// Lets us dive under the station from space
+/datum/component/space_dive
+	/// holder we use when we're in dive
+	var/jaunt_type = /obj/effect/dummy/phased_mob/space_dive
+	/// time it takes to enter the dive
+	var/dive_time = 3 SECONDS
+	/// the time it takes to exit our space dive
+	var/surface_time = 1 SECONDS
+	/// Traits added during phasing (and removed after)
+	var/static/phase_traits = list(TRAIT_MAGICALLY_PHASED, TRAIT_RUNECHAT_HIDDEN, TRAIT_WEATHER_IMMUNE)
+
+/datum/component/space_dive/Initialize(...)
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(bump))
+
+/datum/component/space_dive/proc/bump(mob/living/parent, atom/bumped)
+	SIGNAL_HANDLER
+
+	if(!isspaceturf(get_turf(parent)))
+		return
+
+	if(ismovable(bumped))
+		if(istype(bumped, /obj/machinery/door))//door check is kinda lame but it just plays better
+			return
+
+		var/atom/movable/mover = bumped
+		if(!mover.anchored)
+			return
+
+	INVOKE_ASYNC(src, PROC_REF(attempt_dive), parent, bumped)
+
+/datum/component/space_dive/proc/attempt_dive(mob/living/parent, atom/bumped)
+	if(!do_after(parent, dive_time, bumped))
+		return
+
+	dive(bumped)
+
+/datum/component/space_dive/proc/dive(atom/bumped)
+	var/obj/effect/dummy/phased_mob/jaunt = new jaunt_type(get_turf(bumped), parent)
+
+	RegisterSignal(jaunt, COMSIG_MOB_EJECTED_FROM_JAUNT, PROC_REF(surface))
+	RegisterSignal(jaunt, COMSIG_MOB_PHASED_CHECK, PROC_REF(move_check))
+	parent.add_traits(phase_traits, REF(src))
+
+	// This needs to happen at the end, after all the traits and stuff is handled
+	SEND_SIGNAL(parent, COMSIG_MOB_ENTER_JAUNT, src, jaunt)
+
+/datum/component/space_dive/proc/move_check(obj/effect/dummy/phased_mob/jaunt, mob/living/parent, turf/new_turf)
+	SIGNAL_HANDLER
+
+	if(!isspaceturf(new_turf))
+		return
+
+	INVOKE_ASYNC(src, PROC_REF(attempt_surface), parent, new_turf)
+	return COMPONENT_BLOCK_PHASED_MOVE
+
+/// try and surface by doing a do_after
+/datum/component/space_dive/proc/attempt_surface(mob/living/parent, turf/new_turf)
+	if(do_after(parent, surface_time, new_turf, extra_checks = CALLBACK(src, PROC_REF(check_if_moved), parent, get_turf(parent))))
+		surface(null, parent, new_turf)
+
+// we check if we moved for the do_after, since relayed movements arent caught that well by the do_after
+/datum/component/space_dive/proc/check_if_moved(mob/living/parent, turf/do_after_turf)
+	return get_turf(parent) == do_after_turf
+
+/datum/component/space_dive/proc/surface(atom/holder, mob/living/parent, turf/target)
+	SIGNAL_HANDLER
+
+	var/obj/effect/dummy/phased_mob/jaunt = parent.loc
+	if(!istype(jaunt))
+		return FALSE
+
+	parent.remove_traits(phase_traits, REF(src))
+
+	parent.forceMove(target || get_turf(parent))
+	qdel(jaunt)
+
+	// This needs to happen at the end, after all the traits and stuff is handled
+	SEND_SIGNAL(parent, COMSIG_MOB_AFTER_EXIT_JAUNT, src)
+
+/obj/effect/dummy/phased_mob/space_dive
+	movespeed = 1
diff --git a/code/datums/components/space_kidnap.dm b/code/datums/components/space_kidnap.dm
new file mode 100644
index 0000000000000..8a1de2123d9d3
--- /dev/null
+++ b/code/datums/components/space_kidnap.dm
@@ -0,0 +1,69 @@
+/// Component that lets us space kidnap people as the voidwalker with our HAAAADS
+/datum/component/space_kidnap
+	/// How long does it take to kidnap them?
+	var/kidnap_time = 6 SECONDS
+	/// Are we kidnapping right now?
+	var/kidnapping = FALSE
+
+/datum/component/space_kidnap/Initialize(...)
+	if(!ishuman(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(try_kidnap))
+
+/datum/component/space_kidnap/proc/try_kidnap(mob/living/parent, atom/target)
+	SIGNAL_HANDLER
+
+	if(!isliving(target))
+		return
+
+	var/mob/living/victim = target
+
+	if(victim.stat == DEAD)
+		target.balloon_alert(parent, "is dead!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
+	if(!victim.incapacitated())
+		return
+
+	if(!isspaceturf(get_turf(target)))
+		target.balloon_alert(parent, "not in space!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
+	if(!kidnapping)
+		INVOKE_ASYNC(src, PROC_REF(kidnap), parent, target)
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/space_kidnap/proc/kidnap(mob/living/parent, mob/living/victim)
+	victim.Paralyze(kidnap_time) //so they don't get up if we already got em
+	var/obj/particles = new /obj/effect/abstract/particle_holder (victim, /particles/void_kidnap)
+	kidnapping = TRUE
+
+	if(do_after(parent, kidnap_time, victim, extra_checks = CALLBACK(victim, TYPE_PROC_REF(/mob, incapacitated))))
+		take_them(victim)
+
+	qdel(particles)
+	kidnapping = FALSE
+
+/datum/component/space_kidnap/proc/take_them(mob/living/victim)
+	if(ishuman(victim))
+		var/mob/living/carbon/human/hewmon = victim
+		hewmon.gain_trauma(/datum/brain_trauma/voided)
+
+	victim.flash_act(INFINITY, override_blindness_check = TRUE, visual = TRUE, type = /atom/movable/screen/fullscreen/flash/black)
+	new /obj/effect/temp_visual/circle_wave/unsettle(get_turf(victim))
+
+	if(!SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_VOIDWALKER_VOID) || !GLOB.voidwalker_void.len)
+		victim.forceMove(get_random_station_turf())
+		victim.heal_overall_damage(brute = 80, burn = 20)
+		CRASH("[victim] was instantly dumped after being voidwalker kidnapped due to a missing landmark!")
+	else
+		victim.heal_and_revive(90)
+		victim.adjustOxyLoss(-100, FALSE)
+
+		var/obj/wisp = new /obj/effect/wisp_mobile (get_turf(pick(GLOB.voidwalker_void)))
+		victim.forceMove(wisp)
+		succesfully_kidnapped()
+
+/datum/component/space_kidnap/proc/succesfully_kidnapped(mob/living/carbon/human/kidnappee)
+	SEND_SIGNAL(parent, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP, kidnappee)
diff --git a/code/datums/components/speechmod.dm b/code/datums/components/speechmod.dm
index 71991c80d837c..2506a0b914077 100644
--- a/code/datums/components/speechmod.dm
+++ b/code/datums/components/speechmod.dm
@@ -13,8 +13,10 @@
 	var/slots
 	/// If set to true, turns all text to uppercase
 	var/uppercase = FALSE
+	/// Any additional checks that we should do before applying the speech modification
+	var/datum/callback/should_modify_speech = null
 
-/datum/component/speechmod/Initialize(replacements = list(), end_string = "", end_string_chance = 100, slots, uppercase = FALSE)
+/datum/component/speechmod/Initialize(replacements = list(), end_string = "", end_string_chance = 100, slots, uppercase = FALSE, should_modify_speech)
 	if (!ismob(parent) && !isitem(parent) && !istype(parent, /datum/mutation/human))
 		return COMPONENT_INCOMPATIBLE
 
@@ -23,6 +25,7 @@
 	src.end_string_chance = end_string_chance
 	src.slots = slots
 	src.uppercase = uppercase
+	src.should_modify_speech = should_modify_speech
 
 	if (istype(parent, /datum/mutation/human))
 		RegisterSignal(parent, COMSIG_MUTATION_GAINED, PROC_REF(on_mutation_gained))
@@ -51,6 +54,8 @@
 	var/message = speech_args[SPEECH_MESSAGE]
 	if(message[1] == "*")
 		return
+	if(!isnull(should_modify_speech) && !should_modify_speech.Invoke(source, speech_args))
+		return
 
 	for (var/to_replace in replacements)
 		var/replacement = replacements[to_replace]
@@ -123,3 +128,7 @@
 		return
 	UnregisterSignal(targeted, COMSIG_MOB_SAY)
 	targeted = null
+
+/datum/component/speechmod/Destroy()
+	should_modify_speech = null
+	return ..()
diff --git a/code/datums/components/spirit_holding.dm b/code/datums/components/spirit_holding.dm
index a7accc38352ee..b510fde3523a4 100644
--- a/code/datums/components/spirit_holding.dm
+++ b/code/datums/components/spirit_holding.dm
@@ -7,17 +7,20 @@
 	///bool on if this component is currently polling for observers to inhabit the item
 	var/attempting_awakening = FALSE
 	/// Allows renaming the bound item
-	var/allow_renaming
+	var/allow_renaming = TRUE
 	/// Allows channeling
-	var/allow_channeling
+	var/allow_channeling = TRUE
+	/// Allows exorcism
+	var/allow_exorcism
 	///mob contained in the item.
 	var/mob/living/basic/shade/bound_spirit
 
-/datum/component/spirit_holding/Initialize(datum/mind/soul_to_bind, mob/awakener, allow_renaming = TRUE, allow_channeling = TRUE)
+/datum/component/spirit_holding/Initialize(datum/mind/soul_to_bind, mob/awakener, allow_renaming = TRUE, allow_channeling = TRUE, allow_exorcism = TRUE)
 	if(!ismovable(parent)) //you may apply this to mobs, i take no responsibility for how that works out
 		return COMPONENT_INCOMPATIBLE
 	src.allow_renaming = allow_renaming
 	src.allow_channeling = allow_channeling
+	src.allow_exorcism = allow_exorcism
 	if(soul_to_bind)
 		bind_the_soule(soul_to_bind, awakener, soul_to_bind.name)
 
@@ -89,7 +92,7 @@
 		to_chat(ghost, span_userdanger("The new vessel for your spirit has been destroyed! You remain an unbound ghost."))
 		return
 
-	bind_the_soule(ghost, awakener)
+	bind_the_soule(ghost.mind, awakener)
 
 	attempting_awakening = FALSE
 
@@ -107,7 +110,8 @@
 	bound_spirit.get_language_holder().omnitongue = TRUE //Grants omnitongue
 
 	RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE, PROC_REF(block_buckle_message))
-	RegisterSignal(parent, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked))
+	if(allow_exorcism)
+		RegisterSignal(parent, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked))
 
 /**
  * custom_name : Simply sends a tgui input text box to the blade asking what name they want to be called, and retries it if the input is invalid.
@@ -115,11 +119,13 @@
  * Arguments:
  * * awakener: user who interacted with the blade
  */
-/datum/component/spirit_holding/proc/custom_name(mob/awakener)
+/datum/component/spirit_holding/proc/custom_name(mob/awakener, iteration = 1)
+	if(iteration > 5)
+		return "indecision" // The spirit of indecision
 	var/chosen_name = sanitize_name(tgui_input_text(bound_spirit, "What are you named?", "Spectral Nomenclature", max_length = MAX_NAME_LEN))
 	if(!chosen_name) // with the way that sanitize_name works, it'll actually send the error message to the awakener as well.
 		to_chat(awakener, span_warning("Your blade did not select a valid name! Please wait as they try again.")) // more verbose than what sanitize_name might pass in it's error message
-		return custom_name(awakener)
+		return custom_name(awakener, iteration++)
 	return chosen_name
 
 ///signal fired from a mob moving inside the parent
@@ -139,6 +145,8 @@
  * * exorcist: user who is attempting to remove the spirit
  */
 /datum/component/spirit_holding/proc/attempt_exorcism(mob/exorcist)
+	if(!allow_exorcism)
+		return // just in case
 	var/atom/movable/exorcised_movable = parent
 	to_chat(exorcist, span_notice("You begin to exorcise [parent]..."))
 	playsound(parent, 'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
diff --git a/code/datums/components/splattercasting.dm b/code/datums/components/splattercasting.dm
index b550f2b1221f4..eafc9629a8386 100644
--- a/code/datums/components/splattercasting.dm
+++ b/code/datums/components/splattercasting.dm
@@ -21,10 +21,12 @@
 	RegisterSignal(parent, COMSIG_MOB_SPELL_PROJECTILE, PROC_REF(on_spell_projectile))
 	RegisterSignal(parent, COMSIG_MOB_BEFORE_SPELL_CAST, PROC_REF(on_before_spell_cast))
 	RegisterSignal(parent, COMSIG_MOB_AFTER_SPELL_CAST, PROC_REF(on_after_spell_cast))
+	ADD_TRAIT(parent, TRAIT_SPLATTERCASTER, REF(src))
 
 /datum/component/splattercasting/UnregisterFromParent()
 	. = ..()
 	UnregisterSignal(parent, list(COMSIG_SPECIES_LOSS, COMSIG_MOB_SPELL_PROJECTILE, COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_AFTER_SPELL_CAST))
+	REMOVE_TRAIT(parent, TRAIT_SPLATTERCASTER, REF(src))
 
 ///signal sent when a spell casts a projectile
 /datum/component/splattercasting/proc/on_species_change(mob/living/carbon/source, datum/species/lost_species)
diff --git a/code/datums/components/style/style.dm b/code/datums/components/style/style.dm
index f39379d636783..9bc420cc175c0 100644
--- a/code/datums/components/style/style.dm
+++ b/code/datums/components/style/style.dm
@@ -37,8 +37,6 @@
 	var/timerid
 	/// Highest score attained by this component, to avoid as much overhead when considering to award a high score to the client
 	var/high_score = 0
-	/// Weakref to the added projectile parry component
-	var/datum/weakref/projectile_parry
 	/// What rank, minimum, the user needs to be to hotswap items
 	var/hotswap_rank = STYLE_BRUTAL
 	/// If this is multitooled, making it make funny noises on the user's rank going up
@@ -110,20 +108,7 @@
 	RegisterSignal(parent, COMSIG_LIVING_DEFUSED_GIBTONITE, PROC_REF(on_gibtonite_defuse))
 	RegisterSignal(parent, COMSIG_LIVING_CRUSHER_DETONATE, PROC_REF(on_crusher_detonate))
 	RegisterSignal(parent, COMSIG_LIVING_DISCOVERED_GEYSER, PROC_REF(on_geyser_discover))
-
-	projectile_parry = WEAKREF(parent.AddComponent(\
-		/datum/component/projectile_parry,\
-		list(\
-			/obj/projectile/colossus,\
-			/obj/projectile/temp/watcher,\
-			/obj/projectile/kinetic,\
-			/obj/projectile/bileworm_acid,\
-			/obj/projectile/herald,\
-			/obj/projectile/kiss,\
-			)\
-		)
-	)
-
+	ADD_TRAIT(parent, TRAIT_MINING_PARRYING, STYLE_TRAIT)
 
 /datum/component/style/UnregisterFromParent()
 	UnregisterSignal(parent, COMSIG_USER_ITEM_INTERACTION)
@@ -137,10 +122,7 @@
 	UnregisterSignal(parent, COMSIG_LIVING_DEFUSED_GIBTONITE)
 	UnregisterSignal(parent, COMSIG_LIVING_CRUSHER_DETONATE)
 	UnregisterSignal(parent, COMSIG_LIVING_DISCOVERED_GEYSER)
-
-	if(projectile_parry)
-		qdel(projectile_parry.resolve())
-
+	REMOVE_TRAIT(parent, TRAIT_MINING_PARRYING, STYLE_TRAIT)
 
 /datum/component/style/Destroy(force)
 	STOP_PROCESSING(SSdcs, src)
@@ -150,14 +132,11 @@
 		mob_parent.hud_used.show_hud(mob_parent.hud_used.hud_version)
 	return ..()
 
-
 /datum/component/style/process(seconds_per_tick)
 	point_multiplier = round(max(point_multiplier - 0.2 * seconds_per_tick, 1), 0.1)
 	change_points(-5 * seconds_per_tick * ROUND_UP((style_points + 1) / 200), use_multiplier = FALSE)
 	update_screen()
 
-
-
 /datum/component/style/proc/add_action(action, amount)
 	if(length(actions) > 9)
 		actions.Cut(1, 2)
@@ -219,7 +198,7 @@
 
 			rank = rank_changed
 	meter.maptext = "[format_rank_string(rank)][generate_multiplier()][generate_actions()]"
-	meter.maptext_y = 100 - 9 * length(actions)
+	meter.maptext_y = 94 - 12 * length(actions)
 	update_meter(point_to_rank(), go_back)
 
 /datum/component/style/proc/update_meter(new_rank, go_back)
@@ -270,19 +249,15 @@
 			return "SPACED!"
 
 /datum/component/style/proc/format_rank_string(new_rank)
-	var/rank_string = rank_to_string(new_rank)
-	var/final_string = ""
-	final_string += "<span class='maptext' style='font-size: 8px'><font color='[rank_to_color(new_rank)]'><b>[rank_string[1]]</b>"
-	final_string += "<span style='font-size: 7px'>[copytext(rank_string, 2)]</span></font></span>"
-	return final_string
+	return MAPTEXT_PIXELLARI("<font color='[rank_to_color(new_rank)]'>[rank_to_string(new_rank)]</font>")
 
 /datum/component/style/proc/generate_multiplier()
-	return "<br><span class='maptext' style='font-size: 7px'>MULTIPLIER: [point_multiplier]X</span>"
+	return "<br>" + MAPTEXT_GRAND9K("MULTIPLIER: [point_multiplier]X")
 
 /datum/component/style/proc/generate_actions()
 	var/action_string = ""
 	for(var/action in actions)
-		action_string += "<br><span class='maptext'>+ <font color='[action_to_color(actions[action])]'>[actions[action]]</font></span>"
+		action_string += "<br>" + MAPTEXT_GRAND9K("+ <font color='[action_to_color(actions[action])]'>[actions[action]]</font>")
 	return action_string
 
 /datum/component/style/proc/action_to_color(action)
diff --git a/code/datums/components/style/style_meter.dm b/code/datums/components/style/style_meter.dm
index 94263700dda21..eb9ca3653fc82 100644
--- a/code/datums/components/style/style_meter.dm
+++ b/code/datums/components/style/style_meter.dm
@@ -98,6 +98,7 @@
 
 	clean_up(loc)
 	forceMove(get_turf(src))
+	INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), src)
 	return CLICK_ACTION_SUCCESS
 
 /obj/item/style_meter/multitool_act(mob/living/user, obj/item/tool)
@@ -115,9 +116,7 @@
 /// Unregister signals and just generally clean up ourselves after being removed from glasses
 /obj/item/style_meter/proc/clean_up(atom/movable/old_location)
 	old_location.cut_overlay(meter_appearance)
-	UnregisterSignal(old_location, COMSIG_ITEM_EQUIPPED)
-	UnregisterSignal(old_location, COMSIG_ITEM_DROPPED)
-	UnregisterSignal(old_location, COMSIG_ATOM_EXAMINE)
+	UnregisterSignal(old_location, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ATOM_EXAMINE, COMSIG_CLICK_ALT))
 	UnregisterSignal(old_location, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL))
 	if(!style_meter)
 		return
@@ -132,7 +131,7 @@
 	maptext_height = 120
 	maptext_width = 105
 	maptext_x = 5
-	maptext_y = 100
+	maptext_y = 94
 	maptext = ""
 	layer = SCREENTIP_LAYER
 
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index b8621d382f6fb..8e902ced2fdbf 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -43,7 +43,7 @@
 	src.min_distance = min_distance
 
 	var/mob/P = parent
-	to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw mode, and clicking on your target with an empty hand."))
+	to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw mode, and ") + span_boldnotice("RIGHT-CLICKING on your target with an empty hand."))
 
 	addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
 
@@ -74,6 +74,9 @@
 	if(modifiers[ALT_CLICK] || modifiers[SHIFT_CLICK] || modifiers[CTRL_CLICK] || modifiers[MIDDLE_CLICK])
 		return
 
+	if(!modifiers[RIGHT_CLICK])
+		return
+
 	if(!user.throw_mode || user.get_active_held_item() || user.pulling || user.buckled || user.incapacitated())
 		return
 
diff --git a/code/datums/components/temporary_glass_shatter.dm b/code/datums/components/temporary_glass_shatter.dm
new file mode 100644
index 0000000000000..c2db33190e601
--- /dev/null
+++ b/code/datums/components/temporary_glass_shatter.dm
@@ -0,0 +1,30 @@
+/// Component to make an item temporarily break glass
+/datum/component/temporary_glass_shatterer/Initialize(...)
+	. = ..()
+
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	RegisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(on_tap))
+
+/datum/component/temporary_glass_shatterer/proc/on_tap(obj/item/parent, mob/tapper, atom/target)
+	SIGNAL_HANDLER
+
+	if(istype(target, /obj/structure/window))
+		var/obj/structure/grille/grille = locate(/obj/structure/grille) in get_turf(target)
+		if(grille?.is_shocked())
+			target.balloon_alert(tapper, "is shocked!")
+			return COMPONENT_CANCEL_ATTACK_CHAIN
+
+		var/obj/structure/window/window = target
+		window.temporary_shatter()
+	else if(istype(target, /obj/structure/grille))
+		var/obj/structure/grille/grille = target
+		if(grille.is_shocked())
+			target.balloon_alert(tapper, "is shocked!")
+			return COMPONENT_CANCEL_ATTACK_CHAIN
+
+		grille.temporary_shatter()
+	else
+		return
+	return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/datums/components/trader/trader.dm b/code/datums/components/trader/trader.dm
index b10041385277d..d623a9943b893 100644
--- a/code/datums/components/trader/trader.dm
+++ b/code/datums/components/trader/trader.dm
@@ -52,7 +52,7 @@
 	 * Format; list(TYPEPATH = list(PRICE, QUANTITY, ADDITIONAL_DESCRIPTION))
 	 * Associated list of items able to be sold to the NPC with the money given for them.
 	 * The price given should be the "base" price; any price manipulation based on variables should be done with apply_sell_price_mods()
-	 * ADDITIONAL_DESCRIPTION is any additional text added to explain how the variables of the item effect the price; if it's stack based, it's final price depends how much is in the stack
+	 * ADDITIONAL_DESCRIPTION is any additional text added to explain how the variables of the item effect the price; if it's stack based, its final price depends how much is in the stack
 	 * EX; /obj/item/stack/sheet/mineral/diamond = list(500, INFINITY, ", per 100 cm3 sheet of diamond")
 	 * This list is filled by Initialize(), if you want to change the starting wanted items, modify initial_wanteds()
 	*/
@@ -327,7 +327,7 @@ Can accept both a type path, and an instance of a datum. Type path has priority.
 	return original_cost
 
 /**
- * Handles modifying/deleting the items to ensure that a proper amount is converted into cash; put into it's own proc to make the children of this not override a 30+ line sell_item()
+ * Handles modifying/deleting the items to ensure that a proper amount is converted into cash; put into its own proc to make the children of this not override a 30+ line sell_item()
  *
  * Arguments:
  * * selling - (Item REF) this is the item being sold
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
index 5a3ff4b4cb070..dcb8d63a3c43e 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/twohanded.dm
@@ -217,10 +217,11 @@
 	if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
 		user.dropItemToGround(parent, force = TRUE)
 		return COMPONENT_EQUIPPED_FAILED // blocked wield from item
+	if (wield_callback?.Invoke(parent, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
+		return
 	wielded = TRUE
 	ADD_TRAIT(parent, TRAIT_WIELDED, REF(src))
 	RegisterSignal(user, COMSIG_MOB_SWAPPING_HANDS, PROC_REF(on_swapping_hands))
-	wield_callback?.Invoke(parent, user)
 
 	// update item stats and name
 	var/obj/item/parent_item = parent
diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
index d62414a862b24..a5ff46964bf6f 100644
--- a/code/datums/components/uplink.dm
+++ b/code/datums/components/uplink.dm
@@ -3,7 +3,7 @@
 /**
  * Uplinks
  *
- * All /obj/item(s) have a hidden_uplink var. By default it's null. Give the item one with 'new(src') (it must be in it's contents). Then add 'uses.'
+ * All /obj/item(s) have a hidden_uplink var. By default it's null. Give the item one with 'new(src') (it must be in its contents). Then add 'uses.'
  * Use whatever conditionals you want to check that the user has an uplink, and then call interact() on their uplink.
  * You might also want the uplink menu to open if active. Check if the uplink is 'active' and then interact() with it.
 **/
diff --git a/code/datums/components/vacuum.dm b/code/datums/components/vacuum.dm
index c471dc13a16bc..0bf7888ff47e3 100644
--- a/code/datums/components/vacuum.dm
+++ b/code/datums/components/vacuum.dm
@@ -53,7 +53,7 @@
 		if (!isitem(potential_item))
 			continue
 		var/obj/item/item = potential_item
-		if (vacuum_bag?.attackby(item))
+		if (vacuum_bag.atom_storage.attempt_insert(item))
 			sucked = TRUE // track that we successfully sucked up something
 
 	// if we did indeed suck up something, play a funny noise
diff --git a/code/datums/components/wormborn.dm b/code/datums/components/wormborn.dm
new file mode 100644
index 0000000000000..1841dbf38cc3e
--- /dev/null
+++ b/code/datums/components/wormborn.dm
@@ -0,0 +1,74 @@
+/datum/component/wormborn
+
+/datum/component/wormborn/Initialize(...)
+	. = ..()
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+
+/datum/component/wormborn/RegisterWithParent()
+	. = ..()
+	RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(second_breath))
+
+/datum/component/wormborn/UnregisterFromParent()
+	. = ..()
+	UnregisterSignal(parent, COMSIG_LIVING_DEATH)
+
+/datum/component/wormborn/proc/second_breath(mob/living/source)
+	SIGNAL_HANDLER
+
+	if(get_area(source) == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	source.buckled?.unbuckle_mob(source, force = TRUE)
+
+	if(source.movement_type & VENTCRAWLING)
+		source.forceMove(get_turf(source))
+
+	var/mob/living/worm = new /mob/living/basic/wizard_worm(get_turf(source))
+	source.mind?.transfer_to(worm)
+	source.forceMove(worm)
+
+/mob/living/basic/wizard_worm
+	name = "Magic Worm"
+	desc = "Large blue worm. What happens if you put your hand in his mouth?."
+	icon = 'icons/mob/simple/mob.dmi'
+	icon_state = "wizard_start"
+	icon_living = "wizard_start"
+	base_icon_state = "wizard"
+	maxHealth = 800
+	health = 800
+	melee_damage_lower = 20
+	melee_damage_upper = 30
+	obj_damage = 200
+	speed = 0
+	move_force = MOVE_FORCE_OVERPOWERING
+	move_resist = MOVE_FORCE_OVERPOWERING
+	pull_force = MOVE_FORCE_OVERPOWERING
+	mob_size = MOB_SIZE_HUGE
+	sentience_type = SENTIENCE_BOSS
+	mob_biotypes = MOB_ORGANIC|MOB_SPECIAL
+
+/mob/living/basic/wizard_worm/has_gravity(turf/gravity_turf)
+	return TRUE
+
+/mob/living/basic/wizard_worm/can_be_pulled()
+	return FALSE
+
+/mob/living/basic/wizard_worm/Initialize(mapload, spawn_bodyparts = TRUE)
+	. = ..()
+	AddElement(/datum/element/wall_tearer)
+
+	if(spawn_bodyparts)
+		build_tail()
+
+/mob/living/basic/wizard_worm/proc/build_tail(mob/living/tail)
+	AddComponent(/datum/component/mob_chain, vary_icon_state = TRUE)
+	var/mob/living/basic/wizard_worm/prev = src
+	for(var/i in 1 to 5)
+		prev = new_segment(behind = prev)
+	update_appearance(UPDATE_ICON_STATE)
+
+/mob/living/basic/wizard_worm/proc/new_segment(mob/living/basic/wizard_worm/behind)
+	var/mob/living/segment = new type(drop_location(), FALSE)
+	ADD_TRAIT(segment, TRAIT_PERMANENTLY_MORTAL, INNATE_TRAIT)
+	segment.AddComponent(/datum/component/mob_chain, front = behind, vary_icon_state = TRUE)
+	return segment
diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index 00437a2cdd8f1..b38431ceb0eb7 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -29,7 +29,7 @@
 		return FALSE
 	if (current_charges <= 0)
 		if (feedback)
-			owner.balloon_alert(owner, "no charges!")
+			owner.balloon_alert(owner, "нет зарядов!")
 		return FALSE
 	return TRUE
 
@@ -48,11 +48,11 @@
 	var/turf/current_turf = get_turf(user)
 	var/turf/target_turf = get_turf(target)
 	if(!(target in view(user.client.view, user)))
-		user.balloon_alert(user, "out of view!")
+		user.balloon_alert(user, "вне поля зрения!")
 		return FALSE
 
 	if(!do_teleport(user, target_turf, no_effects = TRUE))
-		user.balloon_alert(user, "dash blocked!")
+		user.balloon_alert(user, "скачок заблокирован!")
 		return FALSE
 
 	// Note: It's possible do_teleport, for whatever reason,
@@ -83,4 +83,4 @@
 	if(!owner)
 		return
 	owner.update_mob_action_buttons()
-	dashing_item.balloon_alert(owner, "[current_charges]/[max_charges] dash charges")
+	dashing_item.balloon_alert(owner, "[current_charges]/[max_charges] зарядов")
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index b7e11010e8fe5..59a1d54571d3c 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -93,7 +93,7 @@
  * Default implementation of clean-up code.
  *
  * This should be overridden to remove all references pointing to the object being destroyed, if
- * you do override it, make sure to call the parent and return it's return value by default
+ * you do override it, make sure to call the parent and return its return value by default
  *
  * Return an appropriate [QDEL_HINT][QDEL_HINT_QUEUE] to modify handling of your deletion;
  * in most cases this is [QDEL_HINT_QUEUE].
@@ -111,6 +111,9 @@
 	tag = null
 	datum_flags &= ~DF_USE_TAG //In case something tries to REF us
 	weak_reference = null //ensure prompt GCing of weakref.
+	if(!(datum_flags & DF_STATIC_OBJECT))
+		DREAMLUAU_CLEAR_REF_USERDATA(vars) // vars ceases existing when src does, so we need to clear any lua refs to it that exist.
+		DREAMLUAU_CLEAR_REF_USERDATA(src)
 
 	if(_active_timers)
 		var/list/timers = _active_timers
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index fad70aff23f72..79f0646a5c4b3 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -14,7 +14,7 @@
 	stage_speed = -3
 	transmittable = -4
 	level = 6
-	base_message_chance = 5
+	base_message_chance = 3
 	symptom_delay_min = 1
 	symptom_delay_max = 1
 	required_organ = ORGAN_SLOT_LUNGS
@@ -40,26 +40,32 @@
 		if(4, 5)
 			infected_mob.losebreath = max(0, infected_mob.losebreath - 4)
 			infected_mob.adjustOxyLoss(-7)
+			if(prob(base_message_chance))
+				to_chat(infected_mob, span_notice("You realize you haven't been breathing."))
 			if(regenerate_blood && infected_mob.blood_volume < BLOOD_VOLUME_NORMAL)
 				infected_mob.blood_volume += 1
 		else
 			if(prob(base_message_chance))
-				to_chat(infected_mob, span_notice("[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]"))
+				to_chat(infected_mob, span_notice("Your lungs feel great."))
 	return
 
-/datum/symptom/oxygen/on_stage_change(datum/disease/advance/A)
+/datum/symptom/oxygen/on_stage_change(datum/disease/advance/advanced_disease)
 	. = ..()
 	if(!.)
 		return FALSE
-	var/mob/living/carbon/M = A.affected_mob
-	if(A.stage >= 4)
-		ADD_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+	var/mob/living/carbon/infected_mob = advanced_disease.affected_mob
+	if(advanced_disease.stage >= 4)
+		ADD_TRAIT(infected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+		if(advanced_disease.stage == 4)
+			to_chat(infected_mob, span_notice("You don't feel the need to breathe anymore."))
 	else
-		REMOVE_TRAIT(M, TRAIT_NOBREATH, DISEASE_TRAIT)
+		REMOVE_TRAIT(infected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+		if(advanced_disease.stage_peaked && advanced_disease.stage == 3)
+			to_chat(infected_mob, span_notice("You feel the need to breathe again."))
 	return TRUE
 
-/datum/symptom/oxygen/End(datum/disease/advance/A)
+/datum/symptom/oxygen/End(datum/disease/advance/advanced_disease)
 	. = ..()
 	if(!.)
 		return
-	REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+	REMOVE_TRAIT(advanced_disease.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
diff --git a/code/datums/diseases/chronic_illness.dm b/code/datums/diseases/chronic_illness.dm
index d99d29e61a851..37778a158ad79 100644
--- a/code/datums/diseases/chronic_illness.dm
+++ b/code/datums/diseases/chronic_illness.dm
@@ -65,8 +65,8 @@
 				to_chat(affected_mob, span_danger("[pick("You feel as though your atoms are accelerating in place.", "You feel like you're being torn apart!")]"))
 				affected_mob.emote("scream")
 				need_mob_update += affected_mob.adjustBruteLoss(10, updating_health = FALSE)
-				if(need_mob_update)
-					affected_mob.updatehealth()
+			if(need_mob_update)
+				affected_mob.updatehealth()
 		if(5)
 			switch(rand(1,2))
 				if(1)
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index e5d4657c17660..df92d57c59b4c 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -216,8 +216,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 		L[DNA_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_human.Find(features["tail_cat"]), length(SSaccessories.tails_list_human))
 	if(features["tail_lizard"])
 		L[DNA_LIZARD_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_lizard.Find(features["tail_lizard"]), length(SSaccessories.tails_list_lizard))
-	if(features["tail_monkey"])
-		L[DNA_MONKEY_TAIL_BLOCK] = construct_block(SSaccessories.tails_list_monkey.Find(features["tail_monkey"]), length(SSaccessories.tails_list_monkey))
 	if(features["snout"])
 		L[DNA_SNOUT_BLOCK] = construct_block(SSaccessories.snouts_list.Find(features["snout"]), length(SSaccessories.snouts_list))
 	if(features["horns"])
@@ -362,8 +360,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 			set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_human.Find(features["tail_cat"]), length(SSaccessories.tails_list_human)))
 		if(DNA_LIZARD_TAIL_BLOCK)
 			set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_lizard.Find(features["tail_lizard"]), length(SSaccessories.tails_list_lizard)))
-		if(DNA_MONKEY_TAIL_BLOCK)
-			set_uni_feature_block(blocknumber, construct_block(SSaccessories.tails_list_monkey.Find(features["tail_monkey"]), length(SSaccessories.tails_list_monkey)))
 		if(DNA_SNOUT_BLOCK)
 			set_uni_feature_block(blocknumber, construct_block(SSaccessories.snouts_list.Find(features["snout"]), length(SSaccessories.snouts_list)))
 		if(DNA_HORNS_BLOCK)
@@ -400,8 +396,9 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 	if(holder && (human_mutation in mutations))
 		set_se(0, human_mutation)
 		. = human_mutation.on_losing(holder)
-		qdel(human_mutation) // qdel mutations on removal
-		update_instability(FALSE)
+		if(!(human_mutation in mutations))
+			qdel(human_mutation) // qdel mutations on removal
+			update_instability(FALSE)
 		return
 
 /**
@@ -668,8 +665,6 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
 		dna.features["tail_cat"] = SSaccessories.tails_list_human[deconstruct_block(get_uni_feature_block(features, DNA_TAIL_BLOCK), length(SSaccessories.tails_list_human))]
 	if(dna.features["tail_lizard"])
 		dna.features["tail_lizard"] = SSaccessories.tails_list_lizard[deconstruct_block(get_uni_feature_block(features, DNA_LIZARD_TAIL_BLOCK), length(SSaccessories.tails_list_lizard))]
-	if(dna.features["tail_monkey"])
-		dna.features["tail_monkey"] = SSaccessories.tails_list_monkey[deconstruct_block(get_uni_feature_block(features, DNA_MONKEY_TAIL_BLOCK), length(SSaccessories.tails_list_monkey))]
 	if(dna.features["ears"])
 		dna.features["ears"] = SSaccessories.ears_list[deconstruct_block(get_uni_feature_block(features, DNA_EARS_BLOCK), length(SSaccessories.ears_list))]
 	if(dna.features["moth_wings"])
diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index c2154736cc0f0..7aa7f120e7509 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -243,3 +243,18 @@
 	obj_icon_state = "eyepatch"
 	emote_hear = list("sighs gruffly.", "groans.")
 	emote_see = list("considers their own mortality.", "stares bleakly into the middle distance.", "ponders the horrors of warfare.")
+
+/datum/dog_fashion/head/watermelon
+	name = "Watermelon Warrior %REAL_NAME%"
+	desc = "5% safer than normal and ready to take on advantage!"
+	obj_icon_state = "watermelon"
+
+/datum/dog_fashion/head/holymelon
+	name = "Holymelon Paladin %REAL_NAME%"
+	desc = "Extraterrestial powers beware, %NAME% is here to smite you down!"
+	obj_icon_state = "holymelon"
+
+/datum/dog_fashion/head/barrelmelon
+	name = "Barrelmelon Berserk %REAL_NAME%"
+	desc = "Either the sturdiness of the helmet gave %REAL_NAME% a confidence boost, or its bit tight on their head..."
+	obj_icon_state = "barrelmelon"
diff --git a/code/datums/eigenstate.dm b/code/datums/eigenstate.dm
index b25fa657eb6e4..8b113285b4b1a 100644
--- a/code/datums/eigenstate.dm
+++ b/code/datums/eigenstate.dm
@@ -25,7 +25,7 @@ GLOBAL_DATUM_INIT(eigenstate_manager, /datum/eigenstate_manager, new)
 			targets -= target
 			continue
 		if(!subtle)
-			target.visible_message("[target] fizzes, collapsing it's unique wavefunction into the others!") //If we're in a eigenlink all on our own and are open to new friends
+			target.visible_message("[target] fizzes, collapsing its unique wavefunction into the others!") //If we're in a eigenlink all on our own and are open to new friends
 		remove_eigen_entry(target) //clearup for new stuff
 	//Do we still have targets?
 	if(!length(targets))
diff --git a/code/datums/elements/bane.dm b/code/datums/elements/bane.dm
index 6e62d15fc1648..95e21251657d7 100644
--- a/code/datums/elements/bane.dm
+++ b/code/datums/elements/bane.dm
@@ -1,5 +1,5 @@
 /// Deals extra damage to mobs of a certain type, species, or biotype.
-/// This doesn't directly modify the normal damage of the weapon, instead it applies it's own damage seperatedly ON TOP of normal damage
+/// This doesn't directly modify the normal damage of the weapon, instead it applies its own damage seperatedly ON TOP of normal damage
 /// ie. a sword that does 10 damage with a bane elment attacthed that has a 0.5 damage_multiplier will do:
 /// 10 damage from the swords normal attack + 5 damage (50%) from the bane element
 /datum/element/bane
@@ -27,40 +27,20 @@
 	src.added_damage = added_damage
 	src.requires_combat_mode = requires_combat_mode
 	src.mob_biotypes = mob_biotypes
-	target.AddComponent(/datum/component/on_hit_effect, CALLBACK(src, PROC_REF(do_bane)), CALLBACK(src, PROC_REF(check_bane)))
+	target.AddElementTrait(TRAIT_ON_HIT_EFFECT, REF(src), /datum/element/on_hit_effect)
+	RegisterSignal(target, COMSIG_ON_HIT_EFFECT, PROC_REF(do_bane))
 
-/datum/element/bane/Detach(datum/target)
-	qdel(target.GetComponent(/datum/component/on_hit_effect))
+/datum/element/bane/Detach(datum/source)
+	UnregisterSignal(source, COMSIG_ON_HIT_EFFECT)
+	REMOVE_TRAIT(source, TRAIT_ON_HIT_EFFECT, REF(src))
 	return ..()
 
-/datum/element/bane/proc/check_bane(bane_applier, target, bane_weapon)
-	if(!check_biotype_path(bane_applier, target))
+/datum/element/bane/proc/do_bane(datum/element_owner, mob/living/bane_applier, mob/living/baned_target, hit_zone, throw_hit)
+	if(!check_biotype_path(bane_applier, baned_target))
 		return
-	var/atom/movable/atom_owner = bane_weapon
-	if(SEND_SIGNAL(atom_owner, COMSIG_OBJECT_PRE_BANING, target) & COMPONENT_CANCEL_BANING)
+	if(SEND_SIGNAL(element_owner, COMSIG_OBJECT_PRE_BANING, baned_target) & COMPONENT_CANCEL_BANING)
 		return
-	return TRUE
 
-/**
- * Checks typepaths and the mob's biotype, returning TRUE if correct and FALSE if wrong.
- * Additionally checks if combat mode is required, and if so whether it's enabled or not.
- */
-/datum/element/bane/proc/check_biotype_path(mob/living/bane_applier, atom/target)
-	if(!isliving(target))
-		return FALSE
-	var/mob/living/living_target = target
-	if(bane_applier)
-		if(requires_combat_mode && !bane_applier.combat_mode)
-			return FALSE
-	var/is_correct_biotype = living_target.mob_biotypes & mob_biotypes
-	if(mob_biotypes && !(is_correct_biotype))
-		return FALSE
-	if(ispath(target_type, /mob/living))
-		return istype(living_target, target_type)
-	else //species type
-		return is_species(living_target, target_type)
-
-/datum/element/bane/proc/do_bane(datum/element_owner, mob/living/bane_applier, mob/living/baned_target, hit_zone)
 	var/force_boosted
 	var/applied_dam_type
 
@@ -91,3 +71,22 @@
 	baned_target.apply_damage(extra_damage, applied_dam_type, hit_zone)
 	SEND_SIGNAL(baned_target, COMSIG_LIVING_BANED, bane_applier, baned_target) // for extra effects when baned.
 	SEND_SIGNAL(element_owner, COMSIG_OBJECT_ON_BANING, baned_target)
+
+/**
+ * Checks typepaths and the mob's biotype, returning TRUE if correct and FALSE if wrong.
+ * Additionally checks if combat mode is required, and if so whether it's enabled or not.
+ */
+/datum/element/bane/proc/check_biotype_path(mob/living/bane_applier, atom/target)
+	if(!isliving(target))
+		return FALSE
+	var/mob/living/living_target = target
+	if(bane_applier)
+		if(requires_combat_mode && !bane_applier.combat_mode)
+			return FALSE
+	var/is_correct_biotype = living_target.mob_biotypes & mob_biotypes
+	if(mob_biotypes && !(is_correct_biotype))
+		return FALSE
+	if(ispath(target_type, /mob/living))
+		return istype(living_target, target_type)
+	else //species type
+		return is_species(living_target, target_type)
diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm
index 3f4db60de2d51..b8a9fa673e358 100644
--- a/code/datums/elements/digitalcamo.dm
+++ b/code/datums/elements/digitalcamo.dm
@@ -27,17 +27,15 @@
 
 /datum/element/digitalcamo/proc/HideFromAIHuds(mob/living/target)
 	for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
-		var/datum/atom_hud/M = GLOB.huds[AI.med_hud]
-		M.hide_single_atomhud_from(AI,target)
-		var/datum/atom_hud/S = GLOB.huds[AI.sec_hud]
-		S.hide_single_atomhud_from(AI,target)
+		for (var/hud_type in AI.silicon_huds)
+			var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+			silicon_hud.hide_single_atomhud_from(AI,target)
 
 /datum/element/digitalcamo/proc/UnhideFromAIHuds(mob/living/target)
 	for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
-		var/datum/atom_hud/M = GLOB.huds[AI.med_hud]
-		M.unhide_single_atomhud_from(AI,target)
-		var/datum/atom_hud/S = GLOB.huds[AI.sec_hud]
-		S.unhide_single_atomhud_from(AI,target)
+		for (var/hud_type in AI.silicon_huds)
+			var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+			silicon_hud.unhide_single_atomhud_from(AI,target)
 
 /datum/element/digitalcamo/proc/on_examine(datum/source, mob/M)
 	SIGNAL_HANDLER
diff --git a/code/datums/elements/door_pryer.dm b/code/datums/elements/door_pryer.dm
index b7f213b3856f6..9f01e8be2b6ab 100644
--- a/code/datums/elements/door_pryer.dm
+++ b/code/datums/elements/door_pryer.dm
@@ -35,12 +35,13 @@
 		attacker.balloon_alert(attacker, "busy!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
-	if (airlock_target.locked || airlock_target.welded || airlock_target.seal)
-		if (!attacker.combat_mode)
-			airlock_target.balloon_alert(attacker, "it's sealed!")
-			return COMPONENT_CANCEL_ATTACK_CHAIN
+	if (attacker.combat_mode)
 		return // Attack the door
 
+	if (airlock_target.locked || airlock_target.welded || airlock_target.seal)
+		airlock_target.balloon_alert(attacker, "it's sealed!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
 	INVOKE_ASYNC(src, PROC_REF(open_door), attacker, airlock_target)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
diff --git a/code/datums/elements/dryable.dm b/code/datums/elements/dryable.dm
index d0cdf2355231a..d66ea96d8c1f1 100644
--- a/code/datums/elements/dryable.dm
+++ b/code/datums/elements/dryable.dm
@@ -27,25 +27,24 @@
 		var/atom/movable/resulting_atom = dried_atom
 		resulting_atom.add_atom_colour(COLOR_DRIED_TAN, FIXED_COLOUR_PRIORITY)
 		apply_dried_status(resulting_atom, drying_user)
-		resulting_atom.forceMove(source.drop_location())
 		return
 	else if(isstack(source)) //Check if its a sheet
 		var/obj/item/stack/itemstack = dried_atom
 		for(var/i in 1 to itemstack.amount)
-			var/atom/movable/resulting_atom = new dry_result(source.drop_location())
+			var/atom/movable/resulting_atom = new dry_result(source.loc)
 			apply_dried_status(resulting_atom, drying_user)
 		qdel(source)
 		return
 	else if(istype(source, /obj/item/food) && ispath(dry_result, /obj/item/food))
 		var/obj/item/food/source_food = source
-		var/obj/item/food/resulting_food = new dry_result(source.drop_location())
+		var/obj/item/food/resulting_food = new dry_result(source.loc)
 		resulting_food.reagents.clear_reagents()
 		source_food.reagents.trans_to(resulting_food, source_food.reagents.total_volume)
 		apply_dried_status(resulting_food, drying_user)
 		qdel(source)
 		return
 	else
-		var/atom/movable/resulting_atom = new dry_result(source.drop_location())
+		var/atom/movable/resulting_atom = new dry_result(source.loc)
 		apply_dried_status(resulting_atom, drying_user)
 		qdel(source)
 
diff --git a/code/datums/elements/gags_recolorable.dm b/code/datums/elements/gags_recolorable.dm
index 93b21c5d31d4e..c59b314ee96c1 100644
--- a/code/datums/elements/gags_recolorable.dm
+++ b/code/datums/elements/gags_recolorable.dm
@@ -10,7 +10,7 @@
 
 /datum/element/gags_recolorable/proc/on_examine(atom/source, mob/user, list/examine_text)
 	SIGNAL_HANDLER
-	examine_text += span_notice("Now utilising PPP recolouring technology, capable of absorbing paint and pigments for changing it's colours!")
+	examine_text += span_notice("Now utilising PPP recolouring technology, capable of absorbing paint and pigments for changing its colours!")
 
 /datum/element/gags_recolorable/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
 	SIGNAL_HANDLER
diff --git a/code/datums/elements/glass_pacifist.dm b/code/datums/elements/glass_pacifist.dm
new file mode 100644
index 0000000000000..76204201c601e
--- /dev/null
+++ b/code/datums/elements/glass_pacifist.dm
@@ -0,0 +1,18 @@
+/// Prevents the living from attacking windows
+/datum/element/glass_pacifist
+
+/datum/element/glass_pacifist/Attach(datum/target)
+	. = ..()
+
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignal(target, COMSIG_LIVING_ATTACK_ATOM, PROC_REF(check_if_glass))
+
+/datum/element/glass_pacifist/proc/check_if_glass(mob/living/owner, atom/hit)
+	SIGNAL_HANDLER
+
+	if(istype(hit, /obj/structure/window))
+		owner.visible_message(span_notice("[owner.name] nuzzles the [hit.name]!"))
+		new /obj/effect/temp_visual/heart(hit.loc)
+		return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/datums/elements/immerse.dm b/code/datums/elements/immerse.dm
index 89148fad7e2a3..65f7d45b9ab77 100644
--- a/code/datums/elements/immerse.dm
+++ b/code/datums/elements/immerse.dm
@@ -107,6 +107,8 @@
  */
 /datum/element/immerse/proc/on_init_or_entered(turf/source, atom/movable/movable)
 	SIGNAL_HANDLER
+	if(QDELETED(movable))
+		return
 	if(HAS_TRAIT(movable, TRAIT_IMMERSED))
 		return
 	if(movable.layer >= ABOVE_ALL_MOB_LAYER || !ISINRANGE(movable.plane, MUTATE_PLANE(FLOOR_PLANE, source), MUTATE_PLANE(GAME_PLANE, source)))
diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm
index 901b163af1538..1ba296bfe730d 100644
--- a/code/datums/elements/lazy_fishing_spot.dm
+++ b/code/datums/elements/lazy_fishing_spot.dm
@@ -16,9 +16,14 @@
 	src.configuration = configuration
 	ADD_TRAIT(target, TRAIT_FISHING_SPOT, REF(src))
 	RegisterSignal(target, COMSIG_PRE_FISHING, PROC_REF(create_fishing_spot))
+	RegisterSignal(target, COMSIG_NPC_FISHING, PROC_REF(return_glob_fishing_spot))
+	RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
+	RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examined_more))
+	RegisterSignal(target, COMSIG_ATOM_EX_ACT, PROC_REF(explosive_fishing))
 
 /datum/element/lazy_fishing_spot/Detach(datum/target)
-	UnregisterSignal(target, COMSIG_PRE_FISHING)
+	UnregisterSignal(target, list(COMSIG_PRE_FISHING, COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXAMINE_MORE, COMSIG_ATOM_EX_ACT))
+	UnregisterSignal(target, list(COMSIG_PRE_FISHING, COMSIG_NPC_FISHING))
 	REMOVE_TRAIT(target, TRAIT_FISHING_SPOT, REF(src))
 	return ..()
 
@@ -27,3 +32,52 @@
 
 	source.AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[configuration])
 	Detach(source)
+
+///If the fish source has fishes that are shown in the
+/datum/element/lazy_fishing_spot/proc/on_examined(datum/source, mob/user, list/examine_text)
+	SIGNAL_HANDLER
+	if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
+		return
+
+	var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
+
+	var/has_known_fishes = FALSE
+	for(var/reward in fish_source.fish_table)
+		if(!ispath(reward, /obj/item/fish))
+			continue
+		var/obj/item/fish/prototype = reward
+		if(initial(prototype.show_in_catalog))
+			has_known_fishes = TRUE
+			break
+	if(!has_known_fishes)
+		return
+
+	examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...")
+
+/datum/element/lazy_fishing_spot/proc/on_examined_more(datum/source, mob/user, list/examine_text)
+	SIGNAL_HANDLER
+	if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
+		return
+
+	var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
+
+	var/list/known_fishes = list()
+	for(var/reward in fish_source.fish_table)
+		if(!ispath(reward, /obj/item/fish))
+			continue
+		var/obj/item/fish/prototype = reward
+		if(initial(prototype.show_in_catalog))
+			known_fishes += initial(prototype.name)
+
+	if(!length(known_fishes))
+		return
+
+	examine_text += span_info("You can catch the following fish here: [english_list(known_fishes)].")
+
+/datum/element/lazy_fishing_spot/proc/explosive_fishing(atom/location, severity)
+	SIGNAL_HANDLER
+	var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
+	fish_source.spawn_reward_from_explosion(location, severity)
+
+/datum/element/lazy_fishing_spot/proc/return_glob_fishing_spot(datum/source, list/fish_spot_container)
+	fish_spot_container[NPC_FISHING_SPOT] = GLOB.preset_fish_sources[configuration]
diff --git a/code/datums/elements/lifesteal.dm b/code/datums/elements/lifesteal.dm
index 48f812fc1f1fa..ed607c34976b3 100644
--- a/code/datums/elements/lifesteal.dm
+++ b/code/datums/elements/lifesteal.dm
@@ -13,13 +13,16 @@
 /datum/element/lifesteal/Attach(datum/target, flat_heal = 10)
 	. = ..()
 	src.flat_heal = flat_heal
-	target.AddComponent(/datum/component/on_hit_effect, CALLBACK(src, PROC_REF(do_lifesteal)))
+	target.AddElementTrait(TRAIT_ON_HIT_EFFECT, REF(src), /datum/element/on_hit_effect)
+	RegisterSignal(target, COMSIG_ON_HIT_EFFECT, PROC_REF(do_lifesteal))
 
-/datum/element/lifesteal/Detach(datum/target)
-	qdel(target.GetComponent(/datum/component/on_hit_effect))
+/datum/element/lifesteal/Detach(datum/source)
+	UnregisterSignal(source, COMSIG_ON_HIT_EFFECT)
+	REMOVE_TRAIT(source, TRAIT_ON_HIT_EFFECT, REF(src))
 	return ..()
 
-/datum/element/lifesteal/proc/do_lifesteal(datum/element_owner, atom/heal_target, atom/damage_target, hit_zone)
+/datum/element/lifesteal/proc/do_lifesteal(datum/source, atom/heal_target, atom/damage_target, hit_zone, throw_hit)
+	SIGNAL_HANDLER
 	if(isliving(heal_target) && isliving(damage_target))
 		var/mob/living/healing = heal_target
 		var/mob/living/damaging = damage_target
diff --git a/code/datums/elements/no_crit_hitting.dm b/code/datums/elements/no_crit_hitting.dm
new file mode 100644
index 0000000000000..416a6e70b87a2
--- /dev/null
+++ b/code/datums/elements/no_crit_hitting.dm
@@ -0,0 +1,21 @@
+/// Stops a mob from hitting someone in crit. doesn't account for projectiles or spells
+/datum/element/no_crit_hitting
+
+/datum/element/no_crit_hitting/Attach(datum/target)
+	. = ..()
+
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignals(target, list(COMSIG_MOB_ITEM_ATTACK), PROC_REF(check_attack))
+
+/datum/element/no_crit_hitting/proc/check_attack(mob/living/attacker, atom/attacked)
+	SIGNAL_HANDLER
+
+	if(!isliving(attacked))
+		return
+
+	var/mob/living/liver = attacked
+	if(liver.stat == HARD_CRIT)
+		liver.balloon_alert(attacker, "they're in crit!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/datums/elements/on_hit_effect.dm b/code/datums/elements/on_hit_effect.dm
new file mode 100644
index 0000000000000..f84a6cafa6f44
--- /dev/null
+++ b/code/datums/elements/on_hit_effect.dm
@@ -0,0 +1,65 @@
+/**
+ * ## On Hit Effect Component!
+ *
+ * Component for other elements/components to rely on for on-hit effects without duplicating the on-hit code.
+ * See Lifesteal, or bane for examples.
+ */
+/datum/element/on_hit_effect
+
+/datum/element/on_hit_effect/Attach(datum/target)
+	. = ..()
+	if(!HAS_TRAIT(target, TRAIT_ON_HIT_EFFECT))
+		stack_trace("[type] added to [target] without adding TRAIT_ON_HIT_EFFECT first. Please use AddElementTrait instead.")
+	if(ismachinery(target) || isstructure(target) || isgun(target) || isprojectilespell(target))
+		RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit))
+	else if(isitem(target))
+		RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
+	else if(isanimal_or_basicmob(target))
+		RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
+	else if(isprojectile(target))
+		RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_projectile_self_hit))
+	else
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(on_thrown_hit))
+
+/datum/element/on_hit_effect/Detach(datum/source)
+	UnregisterSignal(source, list(
+		COMSIG_PROJECTILE_ON_HIT,
+		COMSIG_ITEM_AFTERATTACK,
+		COMSIG_HOSTILE_POST_ATTACKINGTARGET,
+		COMSIG_PROJECTILE_SELF_ON_HIT,
+		COMSIG_MOVABLE_IMPACT,
+	))
+	return ..()
+
+/datum/element/on_hit_effect/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	SIGNAL_HANDLER
+
+	if(!proximity_flag)
+		return
+
+	on_hit(source, user, target, user.zone_selected)
+
+/datum/element/on_hit_effect/proc/hostile_attackingtarget(mob/living/attacker, atom/target, success)
+	SIGNAL_HANDLER
+
+	if(!success)
+		return
+
+	on_hit(attacker, attacker, target, attacker.zone_selected)
+
+/datum/element/on_hit_effect/proc/on_projectile_hit(datum/fired_from, atom/movable/firer, atom/target, angle, body_zone)
+	SIGNAL_HANDLER
+	on_hit(fired_from, firer, target, body_zone)
+
+/datum/element/on_hit_effect/proc/on_projectile_self_hit(datum/source, mob/firer, atom/target, angle, body_zone)
+	SIGNAL_HANDLER
+	on_hit(source, firer, target, body_zone)
+
+/datum/element/on_hit_effect/proc/on_thrown_hit(datum/source, atom/hit_atom, datum/thrownthing/throwingdatum)
+	SIGNAL_HANDLER
+	on_hit(source, source, hit_atom, null, TRUE)
+
+/datum/element/on_hit_effect/proc/on_hit(atom/source, atom/movable/attacker, atom/target, body_zone, throw_hit = FALSE)
+	SEND_SIGNAL(source, COMSIG_ON_HIT_EFFECT, attacker, target, body_zone, throw_hit)
diff --git a/code/datums/elements/only_pull_living.dm b/code/datums/elements/only_pull_living.dm
new file mode 100644
index 0000000000000..8113a66a73021
--- /dev/null
+++ b/code/datums/elements/only_pull_living.dm
@@ -0,0 +1,16 @@
+/// Element for only letting a living pull other livings
+/datum/element/only_pull_living
+
+/datum/element/only_pull_living/Attach(datum/target)
+	. = ..()
+
+	if(!isliving(target))
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignal(target, COMSIG_LIVING_TRY_PULL, PROC_REF(try_pull))
+
+/datum/element/only_pull_living/proc/try_pull(mob/living/owner, atom/movable/pulled)
+	SIGNAL_HANDLER
+
+	if(!isliving(pulled))
+		return COMSIG_LIVING_CANCEL_PULL
diff --git a/code/datums/elements/simple_flying.dm b/code/datums/elements/simple_flying.dm
index 49b8771687bd9..e6d8f42db838b 100644
--- a/code/datums/elements/simple_flying.dm
+++ b/code/datums/elements/simple_flying.dm
@@ -17,6 +17,7 @@
 /datum/element/simple_flying/Detach(datum/target)
 	. = ..()
 	UnregisterSignal(target, COMSIG_MOB_STATCHANGE)
+	REMOVE_TRAIT(target, TRAIT_MOVE_FLYING, ELEMENT_TRAIT(type))
 
 ///signal called by the stat of the target changing
 /datum/element/simple_flying/proc/on_stat_change(mob/living/target, new_stat)
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
index 1b932ce066590..14cdda8e4cf52 100644
--- a/code/datums/elements/strippable.dm
+++ b/code/datums/elements/strippable.dm
@@ -43,15 +43,21 @@
 	if(!user.can_perform_action(source, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
 		return
 
-	// Cyborgs buckle people by dragging them onto them, unless in combat mode.
+	// Snowflake for cyborgs buckling people by dragging them onto them, unless in combat mode.
 	if (iscyborg(user))
 		var/mob/living/silicon/robot/cyborg_user = user
 		if (!cyborg_user.combat_mode)
 			return
+	// Snowflake for xeno consumption code
+	if (isalienadult(user))
+		var/mob/living/carbon/alien/adult/alien = user
+		if (alien.grab_state == GRAB_AGGRESSIVE && alien.pulling == source)
+			return
 
 	if (!isnull(should_strip_proc_path) && !call(source, should_strip_proc_path)(user))
 		return
 
+	// Snowflake for mob scooping
 	if (isliving(source))
 		var/mob/living/mob = source
 		if (mob.can_be_held && (user.grab_state == GRAB_AGGRESSIVE) && (user.pulling == source))
diff --git a/code/datums/elements/venomous.dm b/code/datums/elements/venomous.dm
index ba4e088750cd1..9f9e4940df13e 100644
--- a/code/datums/elements/venomous.dm
+++ b/code/datums/elements/venomous.dm
@@ -12,24 +12,25 @@
 	var/injection_flags
 	///How much of the reagent added. if it's a list, it'll pick a range with the range being list(lower_value, upper_value)
 	var/list/amount_added
+	///Does this trigger when thrown?
+	var/thrown_effect = FALSE
 
 /datum/element/venomous/Attach(datum/target, poison_type, amount_added, injection_flags = NONE, thrown_effect = FALSE)
 	. = ..()
 	src.poison_type = poison_type
 	src.amount_added = amount_added
 	src.injection_flags = injection_flags
-	target.AddComponent(\
-		/datum/component/on_hit_effect,\
-		on_hit_callback = CALLBACK(src, PROC_REF(do_venom)),\
-		thrown_effect = thrown_effect,\
-	)
+	src.thrown_effect = thrown_effect
+	target.AddElementTrait(TRAIT_ON_HIT_EFFECT, REF(src), /datum/element/on_hit_effect)
+	RegisterSignal(target, COMSIG_ON_HIT_EFFECT, PROC_REF(do_venom))
 
-/datum/element/venomous/Detach(datum/target)
-	qdel(target.GetComponent(/datum/component/on_hit_effect))
+/datum/element/venomous/Detach(datum/source)
+	UnregisterSignal(source, COMSIG_ON_HIT_EFFECT)
+	REMOVE_TRAIT(source, TRAIT_ON_HIT_EFFECT, REF(src))
 	return ..()
 
-/datum/element/venomous/proc/do_venom(datum/element_owner, atom/venom_source, mob/living/target, hit_zone)
-	if(!istype(target))
+/datum/element/venomous/proc/do_venom(datum/element_owner, atom/venom_source, mob/living/target, hit_zone, throw_hit)
+	if((throw_hit && !thrown_effect) || !istype(target))
 		return
 	if(target.stat == DEAD)
 		return
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 7006d6d6daa71..8d77c6fc6bdbb 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -44,6 +44,8 @@
 	var/list/mob_type_blacklist_typecache
 	/// Types that can use this emote regardless of their state.
 	var/list/mob_type_ignore_stat_typecache
+	/// Trait that is required to use this emote.
+	var/trait_required
 	/// In which state can you use this emote? (Check stat.dm for a full list of them)
 	var/stat_allowed = CONSCIOUS
 	/// Sound to play when emote is called.
@@ -58,6 +60,8 @@
 	var/can_message_change = FALSE
 	/// How long is the cooldown on the audio of the emote, if it has one?
 	var/audio_cooldown = 2 SECONDS
+	/// Does this emote's sound ignore walls?
+	var/sound_wall_ignore = FALSE
 
 /datum/emote/New()
 	switch(mob_type_allowed_typecache)
@@ -83,27 +87,22 @@
  * * type_override - Override to the current emote_type.
  * * intentional - Bool that says whether the emote was forced (FALSE) or not (TRUE).
  *
- * Returns TRUE if it was able to run the emote, FALSE otherwise.
  */
 /datum/emote/proc/run_emote(mob/user, params, type_override, intentional = FALSE)
-	if(!can_run_emote(user, TRUE, intentional))
-		return FALSE
-	if(SEND_SIGNAL(user, COMSIG_MOB_PRE_EMOTED, key, params, type_override, intentional, src) & COMPONENT_CANT_EMOTE)
-		return TRUE // We don't return FALSE because the error output would be incorrect, provide your own if necessary.
 	var/msg = select_message_type(user, message, intentional)
 	if(params && message_param)
 		msg = select_param(user, params)
 
 	msg = replace_pronoun(user, msg)
 	if(!msg)
-		return TRUE
+		return
 
 	user.log_message(msg, LOG_EMOTE)
 
 	var/tmp_sound = get_sound(user)
 	if(tmp_sound && should_play_sound(user, intentional) && TIMER_COOLDOWN_FINISHED(user, type))
 		TIMER_COOLDOWN_START(user, type, audio_cooldown)
-		playsound(user, tmp_sound, 50, vary)
+		playsound(source = user,soundin = tmp_sound,vol = 50, vary = vary, ignore_walls = sound_wall_ignore)
 
 	var/is_important = emote_type & EMOTE_IMPORTANT
 	var/is_visual = emote_type & EMOTE_VISIBLE
@@ -136,7 +135,7 @@
 				viewer.show_message("<span class='emote'><b>[user]</b> [msg]</span>", MSG_AUDIBLE)
 			else if(is_visual)
 				viewer.show_message("<span class='emote'><b>[user]</b> [msg]</span>", MSG_VISUAL)
-		return TRUE // Early exit so no dchat message
+		return // Early exit so no dchat message
 
 	// The emote has some important information, and should always be shown to the user
 	else if(is_important)
@@ -183,7 +182,7 @@
 				continue
 			to_chat(ghost, "<span class='emote'>[FOLLOW_LINK(ghost, user)] [dchatmsg]</span>")
 
-	return TRUE
+	return
 
 
 
@@ -293,10 +292,13 @@
  * * user - Person that is trying to send the emote.
  * * status_check - Bool that says whether we should check their stat or not.
  * * intentional - Bool that says whether the emote was forced (FALSE) or not (TRUE).
+ * * params - Parameters added after the emote.
  *
  * Returns a bool about whether or not the user can run the emote.
  */
-/datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
+/datum/emote/proc/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE, params)
+	if(trait_required && !HAS_TRAIT(user, trait_required))
+		return FALSE
 	if(!is_type_in_typecache(user, mob_type_allowed_typecache))
 		return FALSE
 	if(is_type_in_typecache(user, mob_type_blacklist_typecache))
diff --git a/code/datums/greyscale/json_configs/meter.json b/code/datums/greyscale/json_configs/meter.json
index 73cfb73995955..344500c2a9dcc 100644
--- a/code/datums/greyscale/json_configs/meter.json
+++ b/code/datums/greyscale/json_configs/meter.json
@@ -2,26 +2,26 @@
 	"meter": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure_off",
+			"icon_state": "meter_base",
 			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
+			"icon_state": "pressure_off",
 			"blend_mode": "overlay"
 		}
 	],
 	"meter0": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure0",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure0",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -32,14 +32,14 @@
 	"meter1_1": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_1",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_1",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -50,14 +50,14 @@
 	"meter1_2": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_2",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_2",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -68,14 +68,14 @@
 	"meter1_3": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_3",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_3",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -86,14 +86,14 @@
 	"meter1_4": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_4",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_4",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -104,14 +104,14 @@
 	"meter1_5": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_5",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_5",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -122,14 +122,14 @@
 	"meter1_6": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure1_6",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure1_6",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -140,14 +140,14 @@
 	"meter2_1": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_1",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_1",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -158,14 +158,14 @@
 	"meter2_2": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_2",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_2",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -176,14 +176,14 @@
 	"meter2_3": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_3",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_3",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -194,14 +194,14 @@
 	"meter2_4": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_4",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_4",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -212,14 +212,14 @@
 	"meter2_5": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_5",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_5",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -230,14 +230,14 @@
 	"meter2_6": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure2_6",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure2_6",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -248,14 +248,14 @@
 	"meter3_1": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_1",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_1",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -266,14 +266,14 @@
 	"meter3_2": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_2",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_2",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -284,14 +284,14 @@
 	"meter3_3": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_3",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_3",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -302,14 +302,14 @@
 	"meter3_4": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_4",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_4",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -320,14 +320,14 @@
 	"meter3_5": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_5",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_5",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -338,14 +338,14 @@
 	"meter3_6": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure3_6",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure3_6",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
@@ -356,14 +356,14 @@
 	"meter4": [
 		{
 			"type": "icon_state",
-			"icon_state": "pressure4",
-			"blend_mode": "overlay",
-			"color_ids": [ 1 ]
+			"icon_state": "meter_base",
+			"blend_mode": "overlay"
 		},
 		{
 			"type": "icon_state",
-			"icon_state": "meter_base",
-			"blend_mode": "overlay"
+			"icon_state": "pressure4",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
 		},
 		{
 			"type": "icon_state",
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 78ec5f133066c..c69a279938dd1 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -11,7 +11,7 @@
 		user.reset_perspective(null)
 	user.remote_control = null
 
-//this datum manages it's own references
+//this datum manages its own references
 
 /datum/holocall
 	///the one that called
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index c0e90994af520..10a623b394e8b 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -8,17 +8,24 @@ GLOBAL_LIST_EMPTY(huds_by_category)
 
 //GLOBAL HUD LIST
 GLOBAL_LIST_INIT(huds, list(
-	DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(),
-	DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(),
-	DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(),
-	DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(),
-	DATA_HUD_DIAGNOSTIC_BASIC = new/datum/atom_hud/data/diagnostic/basic(),
-	DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(),
-	DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor(),
-	DATA_HUD_SENTIENT_DISEASE = new/datum/atom_hud/sentient_disease(),
-	DATA_HUD_AI_DETECT = new/datum/atom_hud/ai_detector(),
-	DATA_HUD_FAN = new/datum/atom_hud/data/human/fan_hud(),
-	DATA_HUD_MALF_APC = new/datum/atom_hud/data/malf_apc(),
+	DATA_HUD_SECURITY_BASIC = new /datum/atom_hud/data/human/security/basic(),
+	DATA_HUD_SECURITY_ADVANCED = new /datum/atom_hud/data/human/security/advanced(),
+	DATA_HUD_MEDICAL_BASIC = new /datum/atom_hud/data/human/medical/basic(),
+	DATA_HUD_MEDICAL_ADVANCED = new /datum/atom_hud/data/human/medical/advanced(),
+	DATA_HUD_DIAGNOSTIC = new /datum/atom_hud/data/diagnostic(),
+	DATA_HUD_BOT_PATH = new /datum/atom_hud/data/bot_path(),
+	DATA_HUD_ABDUCTOR = new /datum/atom_hud/abductor(),
+	DATA_HUD_SENTIENT_DISEASE = new /datum/atom_hud/sentient_disease(),
+	DATA_HUD_AI_DETECT = new /datum/atom_hud/ai_detector(),
+	DATA_HUD_FAN = new /datum/atom_hud/data/human/fan_hud(),
+	DATA_HUD_MALF_APC = new /datum/atom_hud/data/malf_apc(),
+))
+
+GLOBAL_LIST_INIT(trait_to_hud, list(
+	TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED,
+	TRAIT_MEDICAL_HUD = DATA_HUD_MEDICAL_ADVANCED,
+	TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC,
+	TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH,
 ))
 
 /datum/atom_hud
diff --git a/code/datums/id_trim/ruins.dm b/code/datums/id_trim/ruins.dm
index 36284e06b72c4..e308287ec5c5d 100644
--- a/code/datums/id_trim/ruins.dm
+++ b/code/datums/id_trim/ruins.dm
@@ -162,3 +162,16 @@
 /datum/id_trim/away/the_outlet/mad_manager
 	assignment = "The Mad Manager"
 	access = list(ACCESS_AWAY_GENERAL, ACCESS_AWAY_MEDICAL, ACCESS_AWAY_SEC)
+
+//Haunted Trading Post IDs                                 //
+/datum/id_trim/away/hauntedtradingpost
+	assignment = "Donk Co. Employee"
+	department_color = COLOR_ENGINEERING_ORANGE
+	sechud_icon_state = SECHUD_SYNDICATE
+	threat_modifier = 5
+	access = list(ACCESS_SYNDICATE)
+
+/datum/id_trim/away/hauntedtradingpost/boss
+	assignment = "Donk Co. Executive"
+	access = list(ACCESS_SYNDICATE, ACCESS_AWAY_COMMAND)
+//                                                         //
diff --git a/code/datums/lazy_template.dm b/code/datums/lazy_template.dm
index 7b18ff7225f03..3faefc0cc78b4 100644
--- a/code/datums/lazy_template.dm
+++ b/code/datums/lazy_template.dm
@@ -130,3 +130,7 @@
 /datum/lazy_template/heretic_sacrifice_room
 	key = LAZY_TEMPLATE_KEY_HERETIC_SACRIFICE
 	map_name = "heretic_sacrifice"
+
+/datum/lazy_template/voidwalker_void
+	key = LAZY_TEMPLATE_KEY_VOIDWALKER_VOID
+	map_name = "voidwalker_void"
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 8116084127ecf..330c224070c3e 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -9,7 +9,7 @@
 	help_verb = /mob/living/proc/sleeping_carp_help
 	display_combos = TRUE
 	/// List of traits applied to users of this martial art.
-	var/list/scarp_traits = list(TRAIT_NOGUNS, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER, TRAIT_HEAVY_SLEEPER)
+	var/list/scarp_traits = list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER, TRAIT_HEAVY_SLEEPER)
 
 /datum/martial_art/the_sleeping_carp/on_teach(mob/living/new_holder)
 	. = ..()
@@ -188,8 +188,7 @@
 		return FALSE
 	if(!(carp_user.mobility_flags & MOBILITY_USE)) //NO UNABLE TO USE
 		return FALSE
-	var/datum/dna/dna = carp_user.has_dna()
-	if(dna?.check_mutation(/datum/mutation/human/hulk)) //NO HULK
+	if(HAS_TRAIT(carp_user, TRAIT_HULK)) //NO HULK
 		return FALSE
 	if(!isturf(carp_user.loc)) //NO MOTHERFLIPPIN MECHS!
 		return FALSE
diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm
index a742a9c71296e..552fa7a84cdf2 100644
--- a/code/datums/materials/meat.dm
+++ b/code/datums/materials/meat.dm
@@ -1,4 +1,4 @@
-///It's gross, gets the name of it's owner, and is all kinds of fucked up
+///It's gross, gets the name of its owner, and is all kinds of fucked up
 /datum/material/meat
 	name = "meat"
 	desc = "Meat"
diff --git a/code/datums/mind/antag.dm b/code/datums/mind/antag.dm
index c9d970a294c04..fd6241f10009e 100644
--- a/code/datums/mind/antag.dm
+++ b/code/datums/mind/antag.dm
@@ -214,9 +214,10 @@
 		N.nukeop_outfit = null
 		add_antag_datum(N,converter.nuke_team)
 
-
 	enslaved_to = WEAKREF(creator)
 
+	SEND_SIGNAL(current, COMSIG_MOB_ENSLAVED_TO, creator)
+
 	current.faction |= creator.faction
 	creator.faction |= "[REF(current)]"
 
diff --git a/code/datums/mutations/active.dm b/code/datums/mutations/active.dm
index 42c11e9c6f804..4d89b882314e1 100644
--- a/code/datums/mutations/active.dm
+++ b/code/datums/mutations/active.dm
@@ -1,8 +1,8 @@
 /datum/mutation/human/adrenaline_rush
 	name = "Adrenaline Rush"
-	desc = "Allows the host to trigger their body's adrenaline response at will."
+	desc = "Позволяет обладателю данной мутации при желании наполнить своё тело адреналином."
 	quality = POSITIVE
-	text_gain_indication = span_notice("You feel pumped up!")
+	text_gain_indication = span_notice("Ты чувствуешь себя накаченным!")
 	instability = POSITIVE_INSTABILITY_MODERATE
 	power_path = /datum/action/cooldown/adrenaline
 
diff --git a/code/datums/mutations/adaptation.dm b/code/datums/mutations/adaptation.dm
index a731224d52357..987f62388c0d3 100644
--- a/code/datums/mutations/adaptation.dm
+++ b/code/datums/mutations/adaptation.dm
@@ -22,8 +22,8 @@
 
 /datum/mutation/human/adaptation/cold
 	name = "Cold Adaptation"
-	desc = "A strange mutation that renders the host immune to damage from low temperature environments. It also prevents the host from slipping on ice."
-	text_gain_indication = span_notice("Your body feels refreshingly cold.")
+	desc = "Странная мутация, которая адаптирует иммунную систему организма к низким температурам. Она также предотвращает подсклазьзование на льду."
+	text_gain_indication = span_notice("Твое тело наполняет освежающий холод.")
 	instability = POSITIVE_INSTABILITY_MODERATE
 	mutation_traits = list(TRAIT_RESISTCOLD, TRAIT_NO_SLIP_ICE)
 	adapt_icon = "cold"
@@ -31,8 +31,8 @@
 
 /datum/mutation/human/adaptation/heat
 	name = "Heat Adaptation"
-	desc = "A strange mutation that renders the host immune to damage from high temperature, including being set alight, though the flame itself still burns clothing. It also seems to make the host resist ash storms."
-	text_gain_indication = span_notice("Your body feels invigoratingly warm.")
+	desc = "Странная мутация, которая адаптирует иммунную систему организма к высоким температурам, а также предотвращает возгорание её обладателя, хотя пламя всё ещё сжигает одежду. Также делает носителя невосприимчивым к пепельным штормам."
+	text_gain_indication = span_notice("Твоё тело наполняет лёгкое тепло.")
 	instability = POSITIVE_INSTABILITY_MODERATE
 	mutation_traits = list(TRAIT_RESISTHEAT, TRAIT_ASHSTORM_IMMUNE)
 	adapt_icon = "fire"
@@ -40,9 +40,9 @@
 
 /datum/mutation/human/adaptation/thermal
 	name = "Thermal Adaptation"
-	desc = "A strange mutation that renders the host immune to damage from both low and high temperature environments. Does not protect from high or low pressure environments."
+	desc = "Странная мутация, которая даёт невосприимчивость к урону от высокой и низкой температур. Не защищает от высокого и низкого давления."
 	difficulty = 32
-	text_gain_indication = span_notice("Your body feels pleasantly room temperature.")
+	text_gain_indication = span_notice("Твоё тело ощущает комфорто-комнатную температуру.")
 	instability = POSITIVE_INSTABILITY_MAJOR
 	mutation_traits = list(TRAIT_RESISTHEAT, TRAIT_RESISTCOLD)
 	adapt_icon = "thermal"
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index b96508aebee46..64dfef1885226 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -124,17 +124,17 @@
 	if(..())
 		return
 	ADD_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
-	owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))
+	owner.visible_message(span_danger("[owner] неожиданно уменьшается!"), span_notice("Всё вокруг тебя увеличивается.."))
 
 /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
 	REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION)
-	owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
+	owner.visible_message(span_danger("[owner] неожиданно увеличивается!"), span_notice("Всё вокруг тебя уменьшается.."))
 
 /datum/mutation/human/acromegaly
 	name = "Acromegaly"
-	desc = "A mutation believed to be the cause of acromegaly, or 'being unusually tall'."
+	desc = "Считается, что данная мутация вызвана акромегалией или 'необычно высоким ростом'."
 	quality = MINOR_NEGATIVE
 	difficulty = 16
 	instability = NEGATIVE_STABILITY_MODERATE
@@ -145,7 +145,7 @@
 	if(..())
 		return
 	ADD_TRAIT(owner, TRAIT_TOO_TALL, GENETIC_MUTATION)
-	owner.visible_message(span_danger("[owner] suddenly grows tall!"), span_notice("You feel a small strange urge to fight small men with slingshots. Or maybe play some basketball."))
+	owner.visible_message(span_danger("[owner] неожиданно становится выше!"), span_notice("У тебя появляется странное желание бороться с маленькими людьми с рогатками. Или стоит сыграть в баскетбол?"))
 	RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(head_bonk))
 	owner.regenerate_icons()
 
@@ -153,7 +153,7 @@
 	if(..())
 		return
 	REMOVE_TRAIT(owner, TRAIT_TOO_TALL, GENETIC_MUTATION)
-	owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("You return to your usual height."))
+	owner.visible_message(span_danger("[owner] неожиданно уменьшается!"), span_notice("Ты возвращаешься к своему обычному росту."))
 	UnregisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(head_bonk))
 	owner.regenerate_icons()
 
@@ -173,7 +173,7 @@
 
 /datum/mutation/human/gigantism
 	name = "Gigantism" //negative version of dwarfism
-	desc = "The cells within the subject spread out to cover more area, making the subject appear larger."
+	desc = "Клетки субъекта распространяются для охвата большей площади, визуально увеличивая носителя."
 	quality = MINOR_NEGATIVE
 	difficulty = 12
 	conflicts = list(/datum/mutation/human/dwarfism)
@@ -183,15 +183,14 @@
 		return
 	ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
 	owner.update_transform(1.25)
-	owner.visible_message(span_danger("[owner] suddenly grows!"), span_notice("Everything around you seems to shrink.."))
+	owner.visible_message(span_danger("[owner] неожиданно увеличивается!"), span_notice("Всё вокруг тебя уменьшается.."))
 
 /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
 	REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
 	owner.update_transform(0.8)
-	owner.visible_message(span_danger("[owner] suddenly shrinks!"), span_notice("Everything around you seems to grow.."))
-
+	owner.visible_message(span_danger("[owner] неожиданно уменьшается!"), span_notice("Всё вокруг тебя увеличивается..."))
 //Clumsiness has a very large amount of small drawbacks depending on item.
 /datum/mutation/human/clumsy
 	name = "Clumsiness"
@@ -258,8 +257,8 @@
 /datum/mutation/human/race
 	name = "Monkified"
 	desc = "Странный геном который, по мнению общества, отличает обезьяну от человека."
-	text_gain_indication = "Ты чувствуешь необычно по-обезьяни."
-	text_lose_indication = "Ты чувствуешь себя как раньше."
+	text_gain_indication = span_green("Ты чувствуешь необычно по-обезьяни.")
+	text_lose_indication = span_notice("Ты чувствуешь себя как раньше.")
 	quality = NEGATIVE
 	instability = NEGATIVE_STABILITY_MAJOR // mmmonky
 	remove_on_aheal = FALSE
@@ -269,18 +268,26 @@
 	var/original_name
 
 /datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner)
-	if(..())
+	. = ..()
+	if(.)
+		return
+	if(ismonkey(owner))
 		return
-	if(!ismonkey(owner))
-		original_species = owner.dna.species.type
-		original_name = owner.real_name
-		owner.fully_replace_character_name(null, "monkey ([rand(1,999)])")
-	. = owner.monkeyize()
+	original_species = owner.dna.species.type
+	original_name = owner.real_name
+	owner.monkeyize()
 
 /datum/mutation/human/race/on_losing(mob/living/carbon/human/owner)
-	if(!QDELETED(owner) && owner.stat != DEAD && (owner.dna.mutations.Remove(src)) && ismonkey(owner))
-		owner.fully_replace_character_name(null, original_name)
-		. = owner.humanize(original_species)
+	if(owner.stat == DEAD)
+		return
+	. = ..()
+	if(.)
+		return
+	if(QDELETED(owner))
+		return
+
+	owner.fully_replace_character_name(null, original_name)
+	owner.humanize(original_species)
 
 /datum/mutation/human/glow
 	name = "Glowy"
@@ -469,27 +476,6 @@
 			owner.visible_message(span_warning("[owner]'s skin bubbles and pops."), span_userdanger("Your bubbling flesh pops! It burns!"))
 			playsound(owner,'sound/weapons/sear.ogg', 50, TRUE)
 
-/datum/mutation/human/gigantism
-	name = "Gigantism"//negative version of dwarfism
-	desc = "Клетки субъекта распространяются для охвата большей площади, визуально увеличивая носителя."
-	quality = MINOR_NEGATIVE
-	difficulty = 12
-	conflicts = list(/datum/mutation/human/dwarfism)
-
-/datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
-	if(..())
-		return
-	ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
-	owner.update_transform(1.25)
-	owner.visible_message(span_danger("[owner] неожиданно увеличивается!"), span_notice("Всё вокруг тебя уменьшается.."))
-
-/datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner)
-	if(..())
-		return
-	REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION)
-	owner.update_transform(0.8)
-	owner.visible_message(span_danger("[owner] неожиданно уменьшается!"), span_notice("Всё вокруг тебя увеличивается..."))
-
 /datum/mutation/human/spastic
 	name = "Spastic"
 	desc = "Субъект страдает от спазма в мышцах."
@@ -591,7 +577,7 @@
 
 /datum/mutation/human/headless
 	name = "H.A.R.S."
-	desc = "Мутация заставляет тело отторгать голову, мозг субъекта с данной мутацией переносится в грудь. Расшифровывается как Синдром Аллергического Отторжения Головы. Внимание: удаление данной мутации очень опасно, хоть и она регенерирует не жизненно важные органы головы."
+	desc = "Мутация заставляет тело отторгать голову, мозг субъекта с данной мутацией переносится в грудь. Расшифровывается как Синдром Аллергического Отторжения Головы. Удаление данной мутации очень опасно, хоть она и регенерирует не жизненно важные органы головы."
 	instability = NEGATIVE_STABILITY_MAJOR
 	difficulty = 12 //pretty good for traitors
 	quality = NEGATIVE //holy shit no eyes or tongue or ears
diff --git a/code/datums/mutations/hot.dm b/code/datums/mutations/hot.dm
index 574bc95d1e404..068d4028bb99c 100644
--- a/code/datums/mutations/hot.dm
+++ b/code/datums/mutations/hot.dm
@@ -1,7 +1,7 @@
 /datum/mutation/human/geladikinesis/ash
 	name = "Cindikinesis"
-	desc = "Allows the user to concentrate nearby heat into a pile of ash. Wow. Very interesting."
-	text_gain_indication = span_notice("Your hand feels warm.")
+	desc = "Позволяет обладателю мутации сконцентрировать рядом находящееся тепло в кучу пепла. Вау. Очень интересно."
+	text_gain_indication = span_notice("Твоя рука кажется тёплой.")
 	locked = TRUE
 	power_path = /datum/action/cooldown/spell/conjure_item/snow/ash
 
@@ -14,8 +14,8 @@
 
 /datum/mutation/human/cryokinesis/pyrokinesis
 	name = "Pyrokinesis"
-	desc = "Draws positive energy from the surroundings to heat surrounding temperatures at subject's will."
-	text_gain_indication = span_notice("Your hand feels hot!")
+	desc = "Притягивает положительную энергию окружения для повышения температуры вокруг субъекта."
+	text_gain_indication = span_notice("Твоя рука кажется горячей!")
 	locked = TRUE
 	power_path = /datum/action/cooldown/spell/pointed/projectile/cryo/pyro
 
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 02573fc513b74..7646d42f6f918 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -17,7 +17,6 @@
 	mutation_traits = list(
 		TRAIT_CHUNKYFINGERS,
 		TRAIT_HULK,
-		TRAIT_IGNOREDAMAGESLOWDOWN,
 		TRAIT_PUSHIMMUNE,
 		TRAIT_STUNIMMUNE,
 	)
@@ -38,6 +37,7 @@
 	owner.add_mood_event("hulk", /datum/mood_event/hulk)
 	RegisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand))
 	RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(check_swing))
+	owner.add_movespeed_mod_immunities("hulk", /datum/movespeed_modifier/damage_slowdown)
 
 /datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers)
 	SIGNAL_HANDLER
@@ -99,6 +99,7 @@
 	owner.clear_mood_event("hulk")
 	UnregisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK)
 	UnregisterSignal(owner, COMSIG_MOB_CLICKON)
+	owner.remove_movespeed_mod_immunities("hulk", /datum/movespeed_modifier/damage_slowdown)
 
 /// How many steps it takes to throw the mob
 #define HULK_TAILTHROW_STEPS 28
@@ -257,6 +258,7 @@
 	log_combat(the_hulk, yeeted_person, "has thrown by tail")
 
 /datum/mutation/human/hulk/wizardly
+	name = "Hulk (Magical)"
 	species_allowed = null //yes skeleton/lizard hulk - note that species that dont have skintone changing (like skellies) get custom handling
 	health_req = 0
 	instability = 0
@@ -264,19 +266,18 @@
 	/// List of traits to add/remove when someone gets this mutation.
 	mutation_traits = list(
 		TRAIT_HULK,
-		TRAIT_IGNOREDAMAGESLOWDOWN,
 		TRAIT_PUSHIMMUNE,
 		TRAIT_STUNIMMUNE,
 	) // no chunk
 
 /datum/mutation/human/hulk/superhuman
+	name = "Hulk (Super)"
 	health_req = 0
 	instability = 0
 	/// List of traits to add/remove when someone gets this mutation.
 	mutation_traits = list(
 		TRAIT_CHUNKYFINGERS,
 		TRAIT_HULK,
-		TRAIT_IGNOREDAMAGESLOWDOWN,
 		TRAIT_NOSOFTCRIT,
 		TRAIT_NOHARDCRIT,
 		TRAIT_PUSHIMMUNE,
@@ -289,8 +290,8 @@
 
 /datum/mutation/human/hulk/ork
 	name = "Ork"
-	desc = "A mutation caused by a mixup of hulk genes which severely impacts speech centers in owners' brains."
-	text_gain_indication = span_notice("You feel significantly dumber!")
+	desc = "Данная мутация вызвана смешиванием генов халка. Она сильно влияет на речевые центры мозга обладателя мутации."
+	text_gain_indication = span_notice("Ты чувствуешь себя гораздно тупее!")
 	bodypart_color = COLOR_ASSISTANT_OLIVE
 	conflicts = list(/datum/mutation/human/hulk)
 
diff --git a/code/datums/mutations/reach.dm b/code/datums/mutations/reach.dm
index 4be2a64608884..47cf303222438 100644
--- a/code/datums/mutations/reach.dm
+++ b/code/datums/mutations/reach.dm
@@ -41,11 +41,11 @@
 
 /datum/mutation/human/elastic_arms
 	name = "Elastic Arms"
-	desc = "Subject's arms have become elastic, allowing them to stretch up to a meter away. However, this elasticity makes it difficult to wear gloves, handle complex tasks, or grab large objects."
+	desc = "Руки субъекта становятся эластичными, позволяя им растягиваться до метра. Однако, такая эластичность затрудняет ношение перчаток, выполнение сложных задач и взятие больших объектов."
 	quality = POSITIVE
 	instability = POSITIVE_INSTABILITY_MAJOR
-	text_gain_indication = span_warning("You feel armstrong!")
-	text_lose_indication = span_warning("Your arms stop feeling so saggy all the time.")
+	text_gain_indication = span_warning("Твои руки становятся похожими на... на... НА СПАГЕТТИ!")
+	text_lose_indication = span_warning("Твои руки перестают быть такими отвисшими всё время.")
 	difficulty = 32
 	mutation_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_NO_TWOHANDING)
 
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 557bc23e4e5d9..f668f55f95f33 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -42,10 +42,10 @@
 
 /datum/mutation/human/heckacious
 	name = "heckacious larincks"
-	desc = "duge what is WISH your words man..........."
+	desc = "чел что ЖЕЛАЮТ твои слова чувак..........."
 	quality = MINOR_NEGATIVE
-	text_gain_indication = span_sans("aw SHIT man. your throat feels like FUCKASS.")
-	text_lose_indication = span_notice("The demonic entity possessing your larynx has finally released its grasp.")
+	text_gain_indication = span_sans("ЧЁРТ, чувак. твоё горло как ДЕРЬМО.")
+	text_lose_indication = span_notice("Демоническое существо, овладевшее твоей гортанью, наконец-то ослабило свою хватку.")
 	locked = TRUE
 
 /datum/mutation/human/heckacious/on_acquiring(mob/living/carbon/human/owner)
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index 06ccab06b989a..f8ba8c12881d1 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -88,12 +88,12 @@
 
 /datum/mutation/human/lay_on_hands
 	name = "Mending Touch"
-	desc = "The affected can lay their hands on other people to transfer a small amount of their injuries to themselves."
+	desc = "Подверженные данной мутации могут приложить свои руки на других людей, чтобы забрать себе часть их ранений."
 	quality = POSITIVE
 	locked = FALSE
 	difficulty = 16
-	text_gain_indication = span_notice("Your hand feels blessed!")
-	text_lose_indication = span_notice("Your hand feels secular once more.")
+	text_gain_indication = span_notice("Твоя рука, будто бы священна!")
+	text_lose_indication = span_notice("Твоя рука снова кажется обычной.")
 	power_path = /datum/action/cooldown/spell/touch/lay_on_hands
 	instability = POSITIVE_INSTABILITY_MAJOR
 	energy_coeff = 1
diff --git a/code/datums/pod_style.dm b/code/datums/pod_style.dm
new file mode 100644
index 0000000000000..483f46209eda0
--- /dev/null
+++ b/code/datums/pod_style.dm
@@ -0,0 +1,163 @@
+/// Datum holding information about pod type visuals, VFX, name and description
+/// These are not created anywhere and thus should not be assigned procs, only being used as data storage
+/datum/pod_style
+	/// Name that pods of this style will be named by default
+	var/name = "supply pod"
+	/// Name that is displayed to admins in pod config panel
+	var/ui_name = "Standard"
+	/// Description assigned to droppods of this style
+	var/desc = "A Nanotrasen supply drop pod."
+	/// Determines if this pod can use animations/masking/overlays
+	var/shape = POD_SHAPE_NORMAL
+	/// Base icon state assigned to this pod
+	var/icon_state = "pod"
+	/// Whenever this pod should have a door overlay added to it. Uses [icon_state]_door sprite
+	var/has_door = TRUE
+	/// Decals added to this pod, if any
+	var/decal_icon = "default"
+	/// Color that this pod glows when landing
+	var/glow_color = "yellow"
+	/// Type of rubble that this pod creates upon landing
+	var/rubble_type = RUBBLE_NORMAL
+	/// ID for TGUI data
+	var/id = "standard"
+
+/datum/pod_style/advanced
+	name = "bluespace supply pod"
+	ui_name = "Advanced"
+	desc = "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."
+	decal_icon = "bluespace"
+	glow_color = "blue"
+	id = "bluespace"
+
+/datum/pod_style/centcom
+	name = "\improper CentCom supply pod"
+	ui_name = "Nanotrasen"
+	desc = "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."
+	decal_icon = "centcom"
+	glow_color = "blue"
+	id = "centcom"
+
+/datum/pod_style/syndicate
+	name = "blood-red supply pod"
+	ui_name = "Syndicate"
+	desc = "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."
+	icon_state = "darkpod"
+	decal_icon = "syndicate"
+	glow_color = "red"
+	id = "syndicate"
+
+/datum/pod_style/deathsquad
+	name = "\improper Deathsquad drop pod"
+	ui_name = "Deathsquad"
+	desc = "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."
+	icon_state = "darkpod"
+	decal_icon = "deathsquad"
+	glow_color = "blue"
+	id = "deathsquad"
+
+/datum/pod_style/cultist
+	name = "bloody supply pod"
+	ui_name = "Cultist"
+	desc = "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."
+	decal_icon = "cultist"
+	glow_color = "red"
+	id = "cultist"
+
+/datum/pod_style/missile
+	name = "cruise missile"
+	ui_name = "Missile"
+	desc = "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."
+	shape = POD_SHAPE_OTHER
+	icon_state = "missile"
+	has_door = FALSE
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_THIN
+	id = "missile"
+
+/datum/pod_style/missile/syndicate
+	name = "\improper Syndicate cruise missile"
+	ui_name = "Syndie Missile"
+	desc = "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."
+	icon_state = "smissile"
+	id = "syndie_missile"
+
+/datum/pod_style/box
+	name = "\improper Aussec supply crate"
+	ui_name = "Supply Box"
+	desc = "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."
+	shape = POD_SHAPE_OTHER
+	icon_state = "box"
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_WIDE
+	id = "supply_box"
+
+/datum/pod_style/clown
+	name = "\improper HONK pod"
+	ui_name = "Clown Pod"
+	desc = "A brightly-colored supply pod. It likely originated from the Clown Federation."
+	icon_state = "clownpod"
+	decal_icon = "clown"
+	glow_color = "green"
+	id = "clown"
+
+/datum/pod_style/orange
+	name = "\improper Orange"
+	ui_name = "Fruit"
+	desc = "An angry orange."
+	shape = POD_SHAPE_OTHER
+	icon_state = "orange"
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_WIDE
+	id = "orange"
+
+/datum/pod_style/invisible
+	name =  "\improper S.T.E.A.L.T.H. pod MKVII"
+	ui_name = "Invisible"
+	desc = "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"
+	shape = POD_SHAPE_OTHER
+	has_door = FALSE
+	icon_state = null
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_NONE
+	id = "invisible"
+
+/datum/pod_style/gondola
+	name = "gondola"
+	ui_name = "Gondola"
+	desc = "The silent walker. This one seems to be part of a delivery agency."
+	shape = POD_SHAPE_OTHER
+	icon_state = "gondola"
+	has_door = FALSE
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_NONE
+	id = "gondola"
+
+/datum/pod_style/seethrough
+	name = null
+	ui_name = "Seethrough"
+	desc = null
+	shape = POD_SHAPE_OTHER
+	has_door = FALSE
+	icon_state = null
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_NONE
+	id = "seethrough"
+
+/datum/pod_style/teleport
+	name = "портал доставки"
+	ui_name = "Teleport"
+	desc = "Высокотехнологичный портал для межзвездной доставки. Обеспечивает мгновенный доступ к товарам из любой точки вселенной."
+	shape = POD_SHAPE_OTHER
+	has_door = FALSE
+	icon_state = null
+	decal_icon = null
+	glow_color = null
+	rubble_type = RUBBLE_NONE
+	id = "teleport"
diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm
index 5b3171f13267c..120696109a677 100644
--- a/code/datums/quirks/_quirk.dm
+++ b/code/datums/quirks/_quirk.dm
@@ -124,10 +124,10 @@
  * Used when the quirk has been gained and no client is attached to the mob.
  */
 /datum/quirk/proc/on_quirk_holder_first_login(mob/living/source)
-		SIGNAL_HANDLER
+	SIGNAL_HANDLER
 
-		UnregisterSignal(source, COMSIG_MOB_LOGIN)
-		post_add()
+	UnregisterSignal(source, COMSIG_MOB_LOGIN)
+	post_add()
 
 /// Any effect that should be applied every single time the quirk is added to any mob, even when transferred.
 /datum/quirk/proc/add(client/client_source)
diff --git a/code/datums/quirks/negative_quirks/indebted.dm b/code/datums/quirks/negative_quirks/indebted.dm
index fd5354790e1f9..5a9ea427bcd74 100644
--- a/code/datums/quirks/negative_quirks/indebted.dm
+++ b/code/datums/quirks/negative_quirks/indebted.dm
@@ -30,7 +30,7 @@
 		quirk_holder.client.give_award(/datum/award/achievement/misc/debt_extinguished, quirk_holder)
 	podspawn(list(
 		"target" = get_turf(quirk_holder),
-		"style" = STYLE_BLUESPACE,
+		"style" = /datum/pod_style/advanced,
 		"spawn" = /obj/item/clothing/accessory/debt_payer_pin,
 	))
 
diff --git a/code/datums/quirks/positive_quirks/friendly.dm b/code/datums/quirks/positive_quirks/friendly.dm
index 4442736d733c1..7cfec3bb2ddd4 100644
--- a/code/datums/quirks/positive_quirks/friendly.dm
+++ b/code/datums/quirks/positive_quirks/friendly.dm
@@ -9,3 +9,15 @@
 	quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED
 	medical_record_text = "Пациент демонстрирует низкий уровень запретов на физический контакт и хорошо развитые руки. Просьба другому врачу заняться этим случаем."
 	mail_goodies = list(/obj/item/storage/box/hug)
+
+/datum/quirk/friendly/add_unique(client/client_source)
+	var/mob/living/carbon/human/human_quirkholder = quirk_holder
+	var/obj/item/organ/internal/heart/holder_heart = human_quirkholder.get_organ_slot(ORGAN_SLOT_HEART)
+	if(isnull(holder_heart) || isnull(holder_heart.reagents))
+		return
+	holder_heart.reagents.maximum_volume = 20
+	// We have a bigger heart full of love!
+	holder_heart.reagents.add_reagent(/datum/reagent/love, 2.5)
+	// Like, physically bigger.
+	holder_heart.reagents.add_reagent(/datum/reagent/consumable/nutriment, 5)
+	holder_heart.transform = holder_heart.transform.Scale(1.5)
diff --git a/code/datums/quirks/positive_quirks/strong_stomach.dm b/code/datums/quirks/positive_quirks/strong_stomach.dm
index 8c0a3f3b1375e..e3f2f3d929906 100644
--- a/code/datums/quirks/positive_quirks/strong_stomach.dm
+++ b/code/datums/quirks/positive_quirks/strong_stomach.dm
@@ -1,12 +1,12 @@
 /datum/quirk/strong_stomach
 	name = "Strong Stomach"
-	desc = "You can eat food discarded on the ground without getting sick, and vomiting affects you less."
+	desc = "Вы можете есть еду находящуюся на земле без последствий в виде болезни, а рвота влияет на вас меньше."
 	icon = FA_ICON_FACE_GRIN_BEAM_SWEAT
 	value = 4
 	mob_trait = TRAIT_STRONG_STOMACH
-	gain_text = span_notice("You feel like you could eat anything!")
-	lose_text = span_danger("Looking at food on the ground makes you feel a little queasy.")
-	medical_record_text = "Patient has a stronger than average immune system...to food poisoning, at least."
+	gain_text = span_notice("Ты чувствуешь, что можешь съесть всё, что угодно!")
+	lose_text = span_danger("Смотря на еду на земле, тебя начинает немного подташнивать.")
+	medical_record_text = "У пациента иммунная система организма сильнее, чем среднестатическая...  К пищевому отравлению, по крайней мере."
 	mail_goodies = list(
 		/obj/item/reagent_containers/pill/ondansetron,
 	)
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 76ac14cef5c92..e3ff61fad6c25 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -508,3 +508,8 @@
 	name = "Space-Ruin Decommissioned Garbage Truck NX4"
 	description = "An NX-760 interstellar transport barge. At the end of their life cycle, they are often filled with trash and launched into unexplored space to become someone else's problem. This one is full of commercial trash, and spiders."
 
+/datum/map_template/ruin/space/hauntedtradingpost
+	id = "hauntedtradingpost"
+	suffix = "hauntedtradingpost.dmm"
+	name = "Space-Ruin Donk Co. Interstellar Trading Post 6016"
+	description = "A small station for trading ships to dock at. It's been abandoned for some time, but its security systems have kept looters away. Rumored to be haunted."
diff --git a/code/datums/shuttles/emergency.dm b/code/datums/shuttles/emergency.dm
index 0f45a0c6a08b4..42e3566ccfef1 100644
--- a/code/datums/shuttles/emergency.dm
+++ b/code/datums/shuttles/emergency.dm
@@ -432,7 +432,7 @@
 /datum/map_template/shuttle/emergency/lance
 	suffix = "lance"
 	name = "The Lance Crew Evacuation System"
-	description = "A brand new shuttle by Nanotrasen's finest in shuttle-engineering, it's designed to tactically slam into a destroyed station, dispatching threats and saving crew at the same time! Be careful to stay out of it's path."
+	description = "A brand new shuttle by Nanotrasen's finest in shuttle-engineering, it's designed to tactically slam into a destroyed station, dispatching threats and saving crew at the same time! Be careful to stay out of its path."
 	admin_notes = "WARNING: This shuttle is designed to crash into the station. It has turrets, similar to the raven."
 	credit_cost = CARGO_CRATE_VALUE * 70
 	occupancy_limit = "50"
diff --git a/code/datums/signals.dm b/code/datums/signals.dm
index 01ca02e41c264..4a3b9448e22f4 100644
--- a/code/datums/signals.dm
+++ b/code/datums/signals.dm
@@ -4,7 +4,7 @@
  * This sets up a listening relationship such that when the target object emits a signal
  * the source datum this proc is called upon, will receive a callback to the given proctype
  * Use PROC_REF(procname), TYPE_PROC_REF(type,procname) or GLOBAL_PROC_REF(procname) macros to validate the passed in proc at compile time.
- * PROC_REF for procs defined on current type or it's ancestors, TYPE_PROC_REF for procs defined on unrelated type and GLOBAL_PROC_REF for global procs.
+ * PROC_REF for procs defined on current type or its ancestors, TYPE_PROC_REF for procs defined on unrelated type and GLOBAL_PROC_REF for global procs.
  * Return values from procs registered must be a bitfield
  *
  * Arguments:
diff --git a/code/datums/skills/_skill.dm b/code/datums/skills/_skill.dm
index b8438c67927ca..30acf90381f03 100644
--- a/code/datums/skills/_skill.dm
+++ b/code/datums/skills/_skill.dm
@@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(skill_types, subtypesof(/datum/skill))
 		return
 	podspawn(list(
 		"target" = get_turf(mind.current),
-		"style" = STYLE_BLUESPACE,
+		"style" = /datum/pod_style/advanced,
 		"spawn" = skill_item_path,
 		"delays" = list(POD_TRANSIT = 150, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
 	))
diff --git a/code/datums/skills/fishing.dm b/code/datums/skills/fishing.dm
index cfd14a4ce3ba6..fac1855c98dbc 100644
--- a/code/datums/skills/fishing.dm
+++ b/code/datums/skills/fishing.dm
@@ -6,7 +6,7 @@
 	name = "Fishing"
 	title = "Angler"
 	desc = "How empty and alone you are on this barren Earth."
-	modifiers = list(SKILL_VALUE_MODIFIER = list(1, 1, 0, -1, -2, -4, -6))
+	modifiers = list(SKILL_VALUE_MODIFIER = list(1, 0, -1, -3, -5, -7, -10))
 	skill_item_path = /obj/item/clothing/head/soft/fishing_hat
 
 /datum/skill/fishing/New()
diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
index eccb2161c73bb..a37926405f9c0 100644
--- a/code/datums/sprite_accessories.dm
+++ b/code/datums/sprite_accessories.dm
@@ -51,7 +51,7 @@
 	var/natural_spawn = TRUE
 
 /datum/sprite_accessory/blank
-	name = "None"
+	name = SPRITE_ACCESSORY_NONE
 	icon_state = "None"
 
 //////////////////////
@@ -835,7 +835,7 @@
 	var/gradient_category = GRADIENT_APPLIES_TO_HAIR|GRADIENT_APPLIES_TO_FACIAL_HAIR
 
 /datum/sprite_accessory/gradient/none
-	name = "None"
+	name = SPRITE_ACCESSORY_NONE
 	icon_state = "none"
 
 /datum/sprite_accessory/gradient/full
@@ -1726,10 +1726,6 @@
 /datum/sprite_accessory/lizard_markings
 	icon = 'icons/mob/human/species/lizard/lizard_markings.dmi'
 
-/datum/sprite_accessory/lizard_markings/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/lizard_markings/dtiger
 	name = "Dark Tiger Body"
 	icon_state = "dtiger"
@@ -1754,6 +1750,11 @@
 	icon = 'icons/mob/human/species/lizard/lizard_tails.dmi'
 	spine_key = SPINE_KEY_LIZARD
 
+/datum/sprite_accessory/tails/lizard/none
+	name = SPRITE_ACCESSORY_NONE
+	icon_state = "none"
+	natural_spawn = FALSE
+
 /datum/sprite_accessory/tails/lizard/smooth
 	name = "Smooth"
 	icon_state = "smooth"
@@ -1781,6 +1782,13 @@
 	icon_state = "default"
 	color_src = HAIR_COLOR
 
+/datum/sprite_accessory/tails/monkey
+
+/datum/sprite_accessory/tails/monkey/none
+	name = SPRITE_ACCESSORY_NONE
+	icon_state = "none"
+	natural_spawn = FALSE
+
 /datum/sprite_accessory/tails/monkey/default
 	name = "Monkey"
 	icon = 'icons/mob/human/species/monkey/monkey_tail.dmi'
@@ -1855,10 +1863,6 @@
 	icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
 	em_block = TRUE
 
-/datum/sprite_accessory/horns/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/horns/simple
 	name = "Simple"
 	icon_state = "simple"
@@ -1883,10 +1887,6 @@
 	icon = 'icons/mob/human/cat_features.dmi'
 	em_block = TRUE
 
-/datum/sprite_accessory/ears/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/ears/cat
 	name = "Cat"
 	icon_state = "cat"
@@ -1921,10 +1921,6 @@
 	color_src = HAIR_COLOR
 	locked = TRUE
 
-/datum/sprite_accessory/wings/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/wings
 	icon = 'icons/mob/human/species/wings.dmi'
 	em_block = TRUE
@@ -2068,10 +2064,6 @@
 /datum/sprite_accessory/frills
 	icon = 'icons/mob/human/species/lizard/lizard_misc.dmi'
 
-/datum/sprite_accessory/frills/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/frills/simple
 	name = "Simple"
 	icon_state = "simple"
@@ -2092,14 +2084,6 @@
 	icon = 'icons/mob/human/species/lizard/lizard_spines.dmi'
 	em_block = TRUE
 
-/datum/sprite_accessory/spines/none
-	name = "None"
-	icon_state = "none"
-
-/datum/sprite_accessory/tail_spines/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/spines/short
 	name = "Short"
 	icon_state = "short"
@@ -2360,10 +2344,6 @@
 	icon = 'icons/mob/human/species/moth/moth_markings.dmi'
 	color_src = null
 
-/datum/sprite_accessory/moth_markings/none
-	name = "None"
-	icon_state = "none"
-
 /datum/sprite_accessory/moth_markings/reddish
 	name = "Reddish"
 	icon_state = "reddish"
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index 24471acd9457c..85a1ccac11cba 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -246,6 +246,9 @@
 	weapon?.add_mob_blood(punpun)
 	punpun.add_mob_blood(punpun)
 
+	if(!isnull(punpun.ai_controller)) // In case punpun somehow lacks AI
+		QDEL_NULL(punpun.ai_controller)
+
 	new /datum/ai_controller/monkey/angry(punpun)
 
 	var/area/place = get_area(punpun)
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index f69c3860921c2..635565f529e47 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -383,30 +383,17 @@
 
 /datum/station_trait/linked_closets/on_round_start()
 	. = ..()
-	var/list/roundstart_non_secure_closets = GLOB.roundstart_station_closets.Copy()
-	for(var/obj/structure/closet/closet in roundstart_non_secure_closets)
-		if(closet.secure)
-			roundstart_non_secure_closets -= closet
+	var/list/roundstart_closets = GLOB.roundstart_station_closets.Copy()
 
 	/**
-	 * The number of links to perform.
-	 * Combined with 50/50 the probability of the link being triangular, the boundaries of any given
-	 * on-station, non-secure closet being linked are as high as 1 in 7/8 and as low as 1 in 16-17,
-	 * nearing an a mean of 1 in 9 to 11/12 the more repetitions are done.
-	 *
-	 * There are more than 220 roundstart closets on meta, around 150 of which aren't secure,
-	 * so, about 13 to 17 closets will be affected by this most of the times.
+	 * The number of links to perform. the chance of a closet being linked are about 1 in 10
+	 * There are more than 220 roundstart closets on meta, so, about 22 closets will be affected on average.
 	 */
-	var/number_of_links = round(length(roundstart_non_secure_closets) * (rand(350, 450)*0.0001), 1)
+	var/number_of_links = round(length(roundstart_closets) * (rand(400, 430)*0.0001), 1)
 	for(var/repetition in 1 to number_of_links)
-		var/closets_left = length(roundstart_non_secure_closets)
-		if(closets_left < 2)
-			return
 		var/list/targets = list()
-		for(var/how_many in 1 to min(closets_left, rand(2,3)))
-			targets += pick_n_take(roundstart_non_secure_closets)
-		if(closets_left == 1) //there's only one closet left. Let's not leave it alone.
-			targets += roundstart_non_secure_closets[1]
+		for(var/how_many in 1 to rand(2,3))
+			targets += pick_n_take(roundstart_closets)
 		GLOB.eigenstate_manager.create_new_link(targets)
 
 
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 1af74533775fa..945fbe06934bc 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -20,15 +20,23 @@
 
 	COOLDOWN_START(src, party_cooldown, rand(PARTY_COOLDOWN_LENGTH_MIN, PARTY_COOLDOWN_LENGTH_MAX))
 
-	var/area/area_to_spawn_in = pick(GLOB.bar_areas)
-	var/turf/T = pick(area_to_spawn_in.contents)
-
-	var/obj/structure/closet/supplypod/centcompod/toLaunch = new()
-	var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable, /obj/item/pizzabox/pineapple))
-	new pizza_to_spawn(toLaunch)
-	for(var/i in 1 to 6)
-		new /obj/item/reagent_containers/cup/glass/bottle/beer(toLaunch)
-	new /obj/effect/pod_landingzone(T, toLaunch)
+	var/pizza_type_to_spawn = pick(list(
+		/obj/item/pizzabox/margherita,
+		/obj/item/pizzabox/mushroom,
+		/obj/item/pizzabox/meat,
+		/obj/item/pizzabox/vegetable,
+		/obj/item/pizzabox/pineapple
+	))
+
+	var/area/bar_area = pick(GLOB.bar_areas)
+	podspawn(list(
+		"target" = pick(bar_area.contents),
+		"path" = /obj/structure/closet/supplypod/centcompod,
+		"spawn" = list(
+			pizza_type_to_spawn,
+			/obj/item/reagent_containers/cup/glass/bottle/beer = 6
+		)
+	))
 
 #undef PARTY_COOLDOWN_LENGTH_MIN
 #undef PARTY_COOLDOWN_LENGTH_MAX
diff --git a/code/datums/status_effects/_status_effect_helpers.dm b/code/datums/status_effects/_status_effect_helpers.dm
index f887afd91428e..a5743d2e93ad7 100644
--- a/code/datums/status_effects/_status_effect_helpers.dm
+++ b/code/datums/status_effects/_status_effect_helpers.dm
@@ -65,7 +65,7 @@
 /**
  * Checks if this mob has a status effect that shares the passed effect's ID
  *
- * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not it's typepath
+ * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not its typepath
  *
  * Returns an instance of a status effect, or NULL if none were found.
  */
@@ -99,7 +99,7 @@
  * Checks if this mob has a status effect that shares the passed effect's ID
  * and has the passed sources are in its list of sources (ONLY works for grouped efects!)
  *
- * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not it's typepath
+ * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not its typepath
  *
  * Returns an instance of a status effect, or NULL if none were found.
  */
@@ -128,7 +128,7 @@
 /**
  * Returns a list of all status effects that share the passed effect type's ID
  *
- * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not it's typepath
+ * checked_effect - TYPEPATH of a status effect to check for. Checks for its ID, not its typepath
  *
  * Returns a list
  */
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 49a54552db111..9f342ef16865c 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -84,7 +84,7 @@
 	icon_state = "blooddrunk"
 
 /datum/status_effect/blooddrunk/on_apply()
-	ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, BLOODDRUNK_TRAIT)
+	owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 	if(ishuman(owner))
 		var/mob/living/carbon/human/human_owner = owner
 		human_owner.physiology.brute_mod *= 0.1
@@ -104,7 +104,7 @@
 		human_owner.physiology.tox_mod *= 10
 		human_owner.physiology.oxy_mod *= 10
 		human_owner.physiology.stamina_mod *= 10
-	REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, BLOODDRUNK_TRAIT)
+	owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 	owner.remove_stun_absorption(id)
 
 //Used by changelings to rapidly heal
@@ -383,7 +383,7 @@
 	show_duration = TRUE
 
 /datum/status_effect/regenerative_core/on_apply()
-	ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+	owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 	owner.adjustBruteLoss(-25)
 	owner.adjustFireLoss(-25)
 	owner.fully_heal(HEAL_CC_STATUS)
@@ -394,7 +394,7 @@
 	return TRUE
 
 /datum/status_effect/regenerative_core/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+	owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 
 /datum/status_effect/lightningorb
 	id = "Lightning Orb"
@@ -570,7 +570,8 @@
 	owner.AddElement(/datum/element/forced_gravity, 0)
 	owner.AddElement(/datum/element/simple_flying)
 	owner.add_stun_absorption(source = id, priority = 4)
-	owner.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_FREE_HYPERSPACE_MOVEMENT), MAD_WIZARD_TRAIT)
+	owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
+	ADD_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, id)
 	owner.playsound_local(get_turf(owner), 'sound/chemistry/ahaha.ogg', vol = 100, vary = TRUE, use_reverb = TRUE)
 	return TRUE
 
@@ -587,7 +588,8 @@
 	owner.RemoveElement(/datum/element/forced_gravity, 0)
 	owner.RemoveElement(/datum/element/simple_flying)
 	owner.remove_stun_absorption(id)
-	owner.remove_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_FREE_HYPERSPACE_MOVEMENT), MAD_WIZARD_TRAIT)
+	owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
+	REMOVE_TRAIT(owner, TRAIT_FREE_HYPERSPACE_MOVEMENT, id)
 
 /// Gives you a brief period of anti-gravity
 /datum/status_effect/jump_jet
@@ -622,3 +624,30 @@
 	name = "Radiation shielding"
 	desc = "You're immune to radiation, get settled quick!"
 	icon_state = "radiation_shield"
+
+/// Heal in darkness and potentially trigger other effects, persists for a short duration after leaving
+/datum/status_effect/shadow_regeneration
+	id = "shadow_regeneration"
+	duration = 2 SECONDS
+	status_type = STATUS_EFFECT_REFRESH
+	alert_type = /atom/movable/screen/alert/status_effect/shadow_regeneration
+
+/datum/status_effect/shadow_regeneration/on_apply()
+	. = ..()
+	if (!.)
+		return FALSE
+	heal_owner()
+	return TRUE
+
+/datum/status_effect/shadow_regeneration/refresh(effect)
+	. = ..()
+	heal_owner()
+
+/// Regenerate health whenever this status effect is applied or reapplied
+/datum/status_effect/shadow_regeneration/proc/heal_owner()
+	owner.heal_overall_damage(brute = 1, burn = 1, required_bodytype = BODYTYPE_ORGANIC)
+
+/atom/movable/screen/alert/status_effect/shadow_regeneration
+	name = "Shadow Regeneration"
+	desc = "Bathed in soothing darkness, you will slowly heal yourself."
+	icon_state = "lightless"
diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm
index 83d99461fce57..df93089633629 100644
--- a/code/datums/status_effects/debuffs/debuffs.dm
+++ b/code/datums/status_effects/debuffs/debuffs.dm
@@ -345,20 +345,18 @@
 /datum/status_effect/crusher_mark
 	id = "crusher_mark"
 	duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
-	status_type = STATUS_EFFECT_MULTIPLE
+	status_type = STATUS_EFFECT_REFRESH
 	alert_type = null
 	var/mutable_appearance/marked_underlay
-	var/obj/item/kinetic_crusher/hammer_synced
-
+	var/boosted = FALSE
 
-/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/kinetic_crusher/new_hammer_synced)
+/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, was_boosted)
 	. = ..()
-	if(.)
-		hammer_synced = new_hammer_synced
+	boosted = was_boosted
 
 /datum/status_effect/crusher_mark/on_apply()
 	if(owner.mob_size >= MOB_SIZE_LARGE)
-		marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
+		marked_underlay = mutable_appearance('icons/effects/effects.dmi', boosted ? "shield" : "shield2")
 		marked_underlay.pixel_x = -owner.pixel_x
 		marked_underlay.pixel_y = -owner.pixel_y
 		owner.underlays += marked_underlay
@@ -366,16 +364,11 @@
 	return FALSE
 
 /datum/status_effect/crusher_mark/Destroy()
-	hammer_synced = null
 	if(owner)
 		owner.underlays -= marked_underlay
 	QDEL_NULL(marked_underlay)
 	return ..()
 
-//we will only clear ourselves if the crusher is the one that owns us.
-/datum/status_effect/crusher_mark/before_remove(obj/item/kinetic_crusher/attacking_hammer)
-	return (attacking_hammer == hammer_synced)
-
 /datum/status_effect/stacking/saw_bleed
 	id = "saw_bleed"
 	tick_interval = 0.6 SECONDS
diff --git a/code/datums/stock_market_events.dm b/code/datums/stock_market_events.dm
index 4907bf784f63a..b29e52ab0ee11 100644
--- a/code/datums/stock_market_events.dm
+++ b/code/datums/stock_market_events.dm
@@ -23,7 +23,7 @@
 
 	/// When this event is ongoing, what direction will the price trend in?
 	var/trend_value
-	/// When this event is triggered, for how long will it's effects last?
+	/// When this event is triggered, for how long will its effects last?
 	var/trend_duration
 
 /**
diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm
index 8c98d7d56bd16..7cdb9d406152b 100644
--- a/code/datums/storage/storage.dm
+++ b/code/datums/storage/storage.dm
@@ -44,6 +44,9 @@
 	var/animated = TRUE
 	/// Determines whether we play a rustle sound when inserting/removing items.
 	var/rustle_sound = TRUE
+	/// The sound to play when we open/access the storage
+	var/open_sound
+	var/open_sound_vary = TRUE
 
 	/// The maximum amount of items that can be inserted into this storage.
 	var/max_slots = 7
@@ -444,13 +447,40 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	if(!can_insert(to_insert, user, messages = messages, force = force))
 		return FALSE
 
-	SEND_SIGNAL(parent, COMSIG_STORAGE_STORED_ITEM, to_insert, user, force)
+	SEND_SIGNAL(parent, COMSIG_ATOM_STORED_ITEM, to_insert, user, force)
 	SEND_SIGNAL(src, COMSIG_STORAGE_STORED_ITEM, to_insert, user, force)
+	RegisterSignal(to_insert, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive))
 	to_insert.forceMove(real_location)
 	item_insertion_feedback(user, to_insert, override)
 	parent.update_appearance()
 	return TRUE
 
+/// Since items inside storages ignore transparency for QOL reasons, we're tracking when things are dropped onto them instead of our UI elements
+/datum/storage/proc/mousedrop_receive(atom/dropped_onto, atom/movable/target, mob/user, params)
+	SIGNAL_HANDLER
+
+	if (src != user.active_storage)
+		return
+
+	if (!user.can_perform_action(parent, FORBID_TELEKINESIS_REACH))
+		return
+
+	if (target.loc != real_location) // what even
+		UnregisterSignal(target, COMSIG_MOUSEDROPPED_ONTO)
+		return
+
+	if(numerical_stacking)
+		return
+
+	var/drop_index = real_location.contents.Find(dropped_onto)
+	real_location.contents -= target
+	// Use an empty list if we're dropping onto the last item
+	var/list/to_move = real_location.contents.len >= drop_index ? real_location.contents.Copy(drop_index) : list()
+	real_location.contents -= to_move
+	real_location.contents += target
+	real_location.contents += to_move
+	refresh_views()
+
 /**
  * Inserts every item in a given list, with a progress bar
  *
@@ -541,6 +571,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	refresh_views()
 	parent.update_appearance()
 
+	UnregisterSignal(thing, COMSIG_MOUSEDROPPED_ONTO)
 	SEND_SIGNAL(parent, COMSIG_ATOM_REMOVED_ITEM, thing, remove_to_loc, silent)
 	SEND_SIGNAL(src, COMSIG_STORAGE_REMOVED_ITEM, thing, remove_to_loc, silent)
 	return TRUE
@@ -716,7 +747,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		parent.add_fingerprint(user)
 		return COMPONENT_CANCEL_MOUSEDROP_ONTO
 
-	else if(ismob(over_object))
+	if(ismob(over_object))
 		if(over_object != user || !user.can_perform_action(parent, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
 			return
 
@@ -724,13 +755,24 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		INVOKE_ASYNC(src, PROC_REF(open_storage), user)
 		return COMPONENT_CANCEL_MOUSEDROP_ONTO
 
-	else if(!istype(over_object, /atom/movable/screen))
-		if(!user.can_perform_action(over_object, FORBID_TELEKINESIS_REACH))
-			return
+	if(istype(over_object, /atom/movable/screen))
+		return
 
-		parent.add_fingerprint(user)
-		INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, user)
-		return COMPONENT_CANCEL_MOUSEDROP_ONTO
+	if(!user.can_perform_action(over_object, FORBID_TELEKINESIS_REACH))
+		return
+
+	parent.add_fingerprint(user)
+
+	var/atom/dump_loc = over_object.get_dumping_location()
+	if(isnull(dump_loc))
+		return
+
+	/// Don't dump *onto* objects in the same storage as ourselves
+	if (over_object.loc == parent.loc && !isnull(parent.loc.atom_storage) && isnull(over_object.atom_storage))
+		return
+
+	INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, dump_loc, user)
+	return COMPONENT_CANCEL_MOUSEDROP_ONTO
 
 /**
  * Dumps all of our contents at a specific location.
@@ -738,7 +780,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
  * @param atom/dest_object where to dump to
  * @param mob/user the user who is dumping the contents
  */
-/datum/storage/proc/dump_content_at(atom/dest_object, mob/user)
+/datum/storage/proc/dump_content_at(atom/dest_object, dump_loc, mob/user)
 	if(locked)
 		user.balloon_alert(user, "closed!")
 		return
@@ -761,10 +803,6 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		SEND_SIGNAL(src, COMSIG_STORAGE_DUMP_POST_TRANSFER, dest_object, user)
 		return
 
-	var/atom/dump_loc = dest_object.get_dumping_location()
-	if(isnull(dump_loc))
-		return
-
 	// Storage to loc transfer requires a do_after
 	to_chat(user, span_notice("You start dumping out the contents of [parent] onto [dest_object]..."))
 	if(!do_after(user, 2 SECONDS, target = dest_object))
@@ -920,7 +958,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		animate_parent()
 
 	if(rustle_sound)
-		playsound(parent, SFX_RUSTLE, 50, TRUE, -5)
+		playsound(parent, (open_sound ? open_sound : SFX_RUSTLE), 50, open_sound_vary, -5)
 
 	return TRUE
 
@@ -1024,7 +1062,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 		var/atom/movable/movable_loc = real_location
 		movable_loc.lose_active_storage(src)
 
-	if (isnull(storage_interfaces[to_hide]))
+	if (!length(storage_interfaces) || isnull(storage_interfaces[to_hide]))
 		return TRUE
 
 	is_using -= to_hide
diff --git a/code/datums/storage/storage_interface.dm b/code/datums/storage/storage_interface.dm
index cd28b9eb3f7a1..c0cab0dd7952c 100644
--- a/code/datums/storage/storage_interface.dm
+++ b/code/datums/storage/storage_interface.dm
@@ -2,7 +2,7 @@
 /datum/storage_interface
 	/// UI elements for this theme
 	var/atom/movable/screen/close/closer
-	var/atom/movable/screen/storage/cells
+	var/atom/movable/screen/storage/cell/cells
 	var/atom/movable/screen/storage/corner/corner_top_left
 	var/atom/movable/screen/storage/corner/top_right/corner_top_right
 	var/atom/movable/screen/storage/corner/bottom_left/corner_bottom_left
diff --git a/code/datums/storage/subtypes/bag_of_holding.dm b/code/datums/storage/subtypes/bag_of_holding.dm
index aa812f5d1e007..4028d4f789c6b 100644
--- a/code/datums/storage/subtypes/bag_of_holding.dm
+++ b/code/datums/storage/subtypes/bag_of_holding.dm
@@ -16,6 +16,7 @@
 	return ..()
 
 /datum/storage/bag_of_holding/proc/recursive_insertion(obj/item/to_insert, mob/living/user)
+	var/area/bag_area = get_area(user)
 	var/safety = tgui_alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [to_insert.name]?", list("Proceed", "Abort"))
 	if(safety != "Proceed" \
 		|| QDELETED(to_insert) \
@@ -24,6 +25,7 @@
 		|| QDELETED(user) \
 		|| !user.can_perform_action(parent, NEED_DEXTERITY) \
 		|| !can_insert(to_insert, user) \
+		|| (bag_area.area_flags & NO_BOH) \
 	)
 		return
 
diff --git a/code/datums/storage/subtypes/portable_chem_mixer.dm b/code/datums/storage/subtypes/portable_chem_mixer.dm
new file mode 100644
index 0000000000000..fcf5c6ec412bc
--- /dev/null
+++ b/code/datums/storage/subtypes/portable_chem_mixer.dm
@@ -0,0 +1,16 @@
+/datum/storage/portable_chem_mixer
+	max_total_storage = 200
+	max_slots = 50
+
+/datum/storage/portable_chem_mixer/New(atom/parent, max_slots, max_specific_storage, max_total_storage)
+	. = ..()
+
+	var/static/list/obj/item/reagent_containers/containers = list(
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/cup/tube,
+		/obj/item/reagent_containers/cup/glass/waterbottle,
+		/obj/item/reagent_containers/condiment,
+	)
+
+	set_holdable(containers)
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 24d560519f534..5079596957fc2 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -60,7 +60,7 @@
 /datum/weather/rad_storm/end()
 	if(..())
 		return
-	priority_announce("Радиационная угроза миновала. Пожалуйста, вернитесь на свои рабочие места.", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Радиационная угроза миновала. Пожалуйста, вернитесь на свои рабочие места.", "Обнаружена аномалия")
 	status_alarm(FALSE)
 
 /datum/weather/rad_storm/proc/do_mutate(mob/living/carbon/human/mutant)
diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm
index 873d092e4f622..37ed5ab5caef7 100644
--- a/code/datums/wires/vending.dm
+++ b/code/datums/wires/vending.dm
@@ -15,7 +15,7 @@
 	var/datum/language_holder/vending_languages = vending_machine.get_language_holder()
 
 	if(!length(vending_languages.spoken_languages))
-		CRASH("Vending machine [vending_machine] does not have any spoken languages in it's language holder.")
+		CRASH("Vending machine [vending_machine] does not have any spoken languages in its language holder.")
 
 	// synch the current language to the language_iterator
 	for(var/i in vending_languages.spoken_languages)
diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm
index c6aaffe8483ab..4454b0024e441 100644
--- a/code/datums/wounds/pierce.dm
+++ b/code/datums/wounds/pierce.dm
@@ -55,7 +55,7 @@
 			victim.add_splatter_floor(get_step(victim.loc, victim.dir))
 
 /datum/wound/pierce/bleed/get_bleed_rate_of_change()
-	//basically if a species doesn't bleed, the wound is stagnant and will not heal on it's own (nor get worse)
+	//basically if a species doesn't bleed, the wound is stagnant and will not heal on its own (nor get worse)
 	if(!limb.can_bleed())
 		return BLOOD_FLOW_STEADY
 	if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS))
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index e8f77e603be99..dd41d48620e99 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -122,7 +122,7 @@
 	return bleed_amt
 
 /datum/wound/slash/flesh/get_bleed_rate_of_change()
-	//basically if a species doesn't bleed, the wound is stagnant and will not heal on it's own (nor get worse)
+	//basically if a species doesn't bleed, the wound is stagnant and will not heal on its own (nor get worse)
 	if(!limb.can_bleed())
 		return BLOOD_FLOW_STEADY
 	if(HAS_TRAIT(victim, TRAIT_BLOODY_MESS))
@@ -137,7 +137,7 @@
 	if (!victim || HAS_TRAIT(victim, TRAIT_STASIS))
 		return
 
-	// in case the victim has the NOBLOOD trait, the wound will simply not clot on it's own
+	// in case the victim has the NOBLOOD trait, the wound will simply not clot on its own
 	if(limb.can_bleed())
 		set_blood_flow(min(blood_flow, WOUND_SLASH_MAX_BLOODFLOW))
 
diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm
index ff8e22b17b8fa..031a6dd5039d7 100644
--- a/code/game/area/areas/mining.dm
+++ b/code/game/area/areas/mining.dm
@@ -18,6 +18,10 @@
 	name = "Mining Station Public Storage"
 	icon_state = "mining_storage"
 
+/area/mine/lobby/raptor
+	name = "Nanotrasen Raptor Farm"
+	icon_state = "mining_storage"
+
 /area/mine/production
 	name = "Mining Station Production Wing"
 	icon_state = "mining_production"
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index ceb8cac18c009..5eac7addb4ec2 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -695,7 +695,71 @@
 	name = "Decommissioned Garbage Truck"
 	sound_environment = SOUND_AREA_SMALL_ENCLOSED
 	ambience_index = AMBIENCE_MAINT
+
 /area/ruin/space/has_grav/garbagetruck/foodwaste
+
 /area/ruin/space/has_grav/garbagetruck/medicalwaste
+
 /area/ruin/space/has_grav/garbagetruck/squat
+
 /area/ruin/space/has_grav/garbagetruck/toystore
+
+//Donk Co trading outpost
+/area/ruin/space/has_grav/hauntedtradingpost
+	name = "\improper Donk Co. Trading Outpost"
+	icon_state = "donk_public"
+	sound_environment = SOUND_AREA_STANDARD_STATION
+
+/area/ruin/space/has_grav/hauntedtradingpost/public
+	name = "\improper Donk Co. Trading Outpost Public Meeting Area And Cafeteria"
+
+/area/ruin/space/has_grav/hauntedtradingpost/public/corridor
+	name = "\improper Donk Co. Trading Outpost Public Docks And Corridors"
+	sound_environment = SOUND_AREA_LARGE_ENCLOSED
+
+/area/ruin/space/has_grav/hauntedtradingpost/employees
+	name = "\improper Donk Co. Trading Outpost Employees Lounge"
+	icon_state = "donk_employees"
+	airlock_wires = /datum/wires/airlock/engineering
+	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
+
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation
+	name = "\improper Donk Co. Trading Outpost Engineering Station"
+
+/area/ruin/space/has_grav/hauntedtradingpost/employees/corridor
+	name = "\improper Donk Co. Trading Outpost Secure Corridor"
+	icon_state = "donk_command"
+
+/area/ruin/space/has_grav/hauntedtradingpost/employees/breakroom
+	name = "\improper Donk Co. Trading Outpost Break Room"
+
+/area/ruin/space/has_grav/hauntedtradingpost/maint
+	name = "\improper Donk Co. Trading Outpost Auxiliary Storage Room"
+	icon_state = "donk_maints"
+	airlock_wires = /datum/wires/airlock/maint
+	sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
+	ambience_index = AMBIENCE_MAINT
+
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage
+
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toystorage
+
+/area/ruin/space/has_grav/hauntedtradingpost/maint/disposals
+	name = "\improper Donk Co. Trading Outpost Waste Management Station"
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
+
+/area/ruin/space/has_grav/hauntedtradingpost/office
+	name = "\improper Donk Co. Trading Outpost Captains Office"
+	icon_state = "donk_command"
+	airlock_wires = /datum/wires/airlock/cargo
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/ruin/space/has_grav/hauntedtradingpost/office/meetingroom
+	name = "\improper Donk Co. Trading Outpost Board Room"
+
+/area/ruin/space/has_grav/hauntedtradingpost/aicore
+	name = "\improper Cybersun AI Core"
+	icon_state = "donk_command"
+	airlock_wires = /datum/wires/airlock/security
+	sound_environment = SOUND_AREA_SMALL_ENCLOSED
+	ambience_index = AMBIENCE_DANGER
diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm
index 4a398a635a73c..c025428a17b6e 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -166,6 +166,9 @@
 	if(atom_storage)
 		QDEL_NULL(atom_storage)
 
+	if(wires)
+		QDEL_NULL(wires)
+
 	orbiters = null // The component is attached to us normaly and will be deleted elsewhere
 
 	// Checking length(overlays) before cutting has significant speed benefits
@@ -183,6 +186,13 @@
 	if(smoothing_flags & SMOOTH_QUEUED)
 		SSicon_smooth.remove_from_queues(src)
 
+	// These lists cease existing when src does, so we need to clear any lua refs to them that exist.
+	if(!(datum_flags & DF_STATIC_OBJECT))
+		DREAMLUAU_CLEAR_REF_USERDATA(contents)
+		DREAMLUAU_CLEAR_REF_USERDATA(filters)
+		DREAMLUAU_CLEAR_REF_USERDATA(overlays)
+		DREAMLUAU_CLEAR_REF_USERDATA(underlays)
+
 	return ..()
 
 /atom/proc/handle_ricochet(obj/projectile/ricocheting_projectile)
@@ -860,7 +870,6 @@
 		active_hud.screentip_text.maptext = ""
 		return
 
-	active_hud.screentip_text.maptext_y = 10 // 10px lines us up with the action buttons top left corner
 	var/lmb_rmb_line = ""
 	var/ctrl_lmb_ctrl_rmb_line = ""
 	var/alt_lmb_alt_rmb_line = ""
@@ -930,14 +939,26 @@
 
 				if(extra_lines)
 					extra_context = "<br><span class='subcontext'>[lmb_rmb_line][ctrl_lmb_ctrl_rmb_line][alt_lmb_alt_rmb_line][shift_lmb_ctrl_shift_lmb_line]</span>"
-					//first extra line pushes atom name line up 11px, subsequent lines push it up 9px, this offsets that and keeps the first line in the same place
-					active_hud.screentip_text.maptext_y = -1 + (extra_lines - 1) * -9
 
+	var/new_maptext
 	if (screentips_enabled == SCREENTIP_PREFERENCE_CONTEXT_ONLY && extra_context == "")
-		active_hud.screentip_text.maptext = ""
+		new_maptext = ""
 	else
 		//We inline a MAPTEXT() here, because there's no good way to statically add to a string like this
-		active_hud.screentip_text.maptext = "<span class='context' style='text-align: center; color: [active_hud.screentip_color]'>[name][extra_context]</span>"
+		new_maptext = "<span class='context' style='text-align: center; color: [active_hud.screentip_color]'>[name][extra_context]</span>"
+
+	if (length(name) * 10 > active_hud.screentip_text.maptext_width)
+		INVOKE_ASYNC(src, PROC_REF(set_hover_maptext), client, active_hud, new_maptext)
+		return
+
+	active_hud.screentip_text.maptext = new_maptext
+	active_hud.screentip_text.maptext_y = 10 - (extra_lines > 0 ? 11 + 9 * (extra_lines - 1): 0)
+
+/atom/proc/set_hover_maptext(client/client, datum/hud/active_hud, new_maptext)
+	var/map_height
+	WXH_TO_HEIGHT(client.MeasureText(new_maptext, null, active_hud.screentip_text.maptext_width), map_height)
+	active_hud.screentip_text.maptext = new_maptext
+	active_hud.screentip_text.maptext_y = 26 - map_height
 
 /**
  * This proc is used for telling whether something can pass by this atom in a given direction, for use by the pathfinding system.
diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm
index ad1d832227780..ab94c73856365 100644
--- a/code/game/atom/atom_examine.dm
+++ b/code/game/atom/atom_examine.dm
@@ -5,7 +5,7 @@
 /**
  * Called when a mob examines (shift click or verb) this atom
  *
- * Default behaviour is to get the name and icon of the object and it's reagents where
+ * Default behaviour is to get the name and icon of the object and its reagents where
  * the [TRANSPARENT] flag is set on the reagents holder
  *
  * Produces a signal [COMSIG_ATOM_EXAMINE]
@@ -105,5 +105,6 @@
 	return name_chaser
 
 /// Used by mobs to determine the name for someone wearing a mask, or with a disfigured or missing face. By default just returns the atom's name. add_id_name will control whether or not we append "(as [id_name])".
-/atom/proc/get_visible_name(add_id_name)
+/// force_real_name will always return real_name and add (as face_name/id_name) if it doesn't match their appearance
+/atom/proc/get_visible_name(add_id_name, force_real_name)
 	return name
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 8135a3af59346..046478c9b366a 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -231,6 +231,10 @@
 
 	LAZYNULL(client_mobs_in_contents)
 
+	// These lists cease existing when src does, so we need to clear any lua refs to them that exist.
+	DREAMLUAU_CLEAR_REF_USERDATA(vis_contents)
+	DREAMLUAU_CLEAR_REF_USERDATA(vis_locs)
+
 	. = ..()
 
 	for(var/movable_content in contents)
@@ -879,9 +883,10 @@
 // Make sure you know what you're doing if you call this
 // You probably want CanPass()
 /atom/movable/Cross(atom/movable/crossed_atom)
-	. = TRUE
-	SEND_SIGNAL(src, COMSIG_MOVABLE_CROSS, crossed_atom)
-	SEND_SIGNAL(crossed_atom, COMSIG_MOVABLE_CROSS_OVER, src)
+	if(SEND_SIGNAL(src, COMSIG_MOVABLE_CROSS, crossed_atom) & COMPONENT_BLOCK_CROSS)
+		return FALSE
+	if(SEND_SIGNAL(crossed_atom, COMSIG_MOVABLE_CROSS_OVER, src) & COMPONENT_BLOCK_CROSS)
+		return FALSE
 	return CanPass(crossed_atom, get_dir(src, crossed_atom))
 
 ///default byond proc that is deprecated for us in lieu of signals. do not call
@@ -926,7 +931,8 @@
 /atom/movable/Bump(atom/bumped_atom)
 	if(!bumped_atom)
 		CRASH("Bump was called with no argument.")
-	SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, bumped_atom)
+	if(SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, bumped_atom) & COMPONENT_INTERCEPT_BUMPED)
+		return
 	. = ..()
 	if(!QDELETED(throwing))
 		throwing.finalize(hit = TRUE, target = bumped_atom)
@@ -1420,7 +1426,15 @@
 /atom/movable/proc/CanPassThrough(atom/blocker, movement_dir, blocker_opinion)
 	SHOULD_CALL_PARENT(TRUE)
 	SHOULD_BE_PURE(TRUE)
-	return blocker_opinion
+
+	var/blocking_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_CAN_PASS_THROUGH, blocker, movement_dir)
+	if(!blocking_signal)
+		return blocker_opinion
+
+	if(blocking_signal & COMSIG_COMPONENT_PERMIT_PASSAGE)
+		return TRUE
+	else //we have a COMSIG_COMPONENT_REFUSE_PASSAGE but like its either this or that, unlike someone wanna adds half-passing through but fuck you
+		return FALSE
 
 /// called when this atom is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
 /atom/movable/proc/on_exit_storage(datum/storage/master_storage)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index a4d59d668ae11..e39ce9bd92d37 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -53,18 +53,14 @@
 	hud_icons = list(FAN_HUD)
 
 /datum/atom_hud/data/diagnostic
-
-/datum/atom_hud/data/diagnostic/basic
 	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD)
 
-/datum/atom_hud/data/diagnostic/advanced
-	hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD, DIAG_PATH_HUD)
-
 /datum/atom_hud/data/bot_path
-	// This hud exists so the bot can see itself, that's all
-	uses_global_hud_category = FALSE
 	hud_icons = list(DIAG_PATH_HUD)
 
+/datum/atom_hud/data/bot_path/private
+	uses_global_hud_category = FALSE
+
 /datum/atom_hud/abductor
 	hud_icons = list(GLAND_HUD)
 
@@ -282,7 +278,7 @@ Security HUDs! Basic mode shows only the job.
 
 /mob/living/proc/sec_hud_set_implants()
 	var/image/holder
-	for(var/i in list(IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD))
+	for(var/i in (list(IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD) & hud_list))
 		holder = hud_list[i]
 		holder.icon_state = null
 		set_hud_image_inactive(i)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index 467eeea067a81..d9e0309ce1ab8 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -210,7 +210,7 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
 	if(LAZYLEN(our_mind.failed_special_equipment))
 		podspawn(list(
 			"target" = get_turf(owner),
-			"style" = STYLE_SYNDICATE,
+			"style" = /datum/pod_style/syndicate,
 			"spawn" = our_mind.failed_special_equipment,
 		))
 		our_mind.failed_special_equipment = null
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 40d9ef556dc56..45a75f06133dd 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -284,10 +284,21 @@
 /obj/machinery/proc/locate_machinery()
 	return
 
+///Early process for machines added to SSmachines.processing_early to prioritize power draw
+/obj/machinery/proc/process_early()
+	set waitfor = FALSE
+	return PROCESS_KILL
+
 /obj/machinery/process()//If you dont use process or power why are you here
 	return PROCESS_KILL
 
+///Late process for machines added to SSmachines.processing_late to gather accurate recordings
+/obj/machinery/proc/process_late()
+	set waitfor = FALSE
+	return PROCESS_KILL
+
 /obj/machinery/proc/process_atmos()//If you dont use process why are you here
+	set waitfor = FALSE
 	return PROCESS_KILL
 
 ///Called when we want to change the value of the machine_stat variable. Holds bitflags.
@@ -405,6 +416,10 @@
 /obj/machinery/proc/close_machine(atom/movable/target, density_to_set = TRUE)
 	state_open = FALSE
 	set_density(density_to_set)
+	if (!density)
+		update_appearance()
+		return
+
 	if(!target)
 		for(var/atom in loc)
 			if (!(can_be_occupant(atom)))
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index d1025b52b321f..07c3b0c057584 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -53,7 +53,6 @@
 /obj/machinery/autolathe/Destroy()
 	QDEL_NULL(print_sound)
 	materials = null
-	QDEL_NULL(wires)
 	return ..()
 
 /obj/machinery/autolathe/examine(mob/user)
diff --git a/code/game/machinery/botlaunchpad.dm b/code/game/machinery/botlaunchpad.dm
index fecca2a25489f..e044bb1e29688 100644
--- a/code/game/machinery/botlaunchpad.dm
+++ b/code/game/machinery/botlaunchpad.dm
@@ -49,7 +49,7 @@
 	podspawn(list(
 		"target" = get_turf(src),
 		"path" = /obj/structure/closet/supplypod/botpod,
-		"style" = STYLE_SEETHROUGH,
+		"style" = /datum/pod_style/seethrough,
 		"reverse_dropoff_coords" = list(reverse_turf.x, reverse_turf.y, reverse_turf.z)
 	))
 
@@ -67,7 +67,7 @@
 	simple_bot.call_bot(src,  get_turf(src))
 
 /obj/structure/closet/supplypod/botpod
-	style = STYLE_SEETHROUGH
+	style = /datum/pod_style/seethrough
 	explosionSize = list(0,0,0,0)
 	reversing = TRUE
 	reverse_option_list = list("Mobs"=TRUE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE,"Mecha"=FALSE)
diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm
index fa0d28c999c88..655e27e00f646 100644
--- a/code/game/machinery/civilian_bounties.dm
+++ b/code/game/machinery/civilian_bounties.dm
@@ -38,7 +38,7 @@
 /obj/machinery/computer/piratepad_control/civilian
 	name = "civilian bounty control terminal"
 	desc = "A console for assigning civilian bounties to inserted ID cards, and for controlling the bounty pad for export."
-	status_report = "Ready for delivery."
+	status_report = "Готов к доставке."
 	icon_screen = "civ_bounty"
 	icon_keyboard = "id_key"
 	warmup_time = 3 SECONDS
@@ -56,7 +56,7 @@
 
 /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
 	if(istype(I) && istype(I.buffer,/obj/machinery/piratepad/civilian))
-		to_chat(user, span_notice("You link [src] with [I.buffer] in [I] buffer."))
+		to_chat(user, span_notice("Вы привязываете [src.name] к [I.buffer] с помощью буффера [I.name]."))
 		pad_ref = WEAKREF(I.buffer)
 		return TRUE
 
@@ -75,23 +75,23 @@
 	if(sending)
 		return FALSE
 	if(!inserted_scan_id)
-		status_report = "Please insert your ID first."
+		status_report = "Пожалуйста, вставьте сначала ID карту."
 		playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
 		return FALSE
 	if(!inserted_scan_id.registered_account.civilian_bounty)
-		status_report = "Please accept a new civilian bounty first."
+		status_report = "Пожалуйста, возьмите сначала новый заказ."
 		playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
 		return FALSE
-	status_report = "Civilian Bounty: "
+	status_report = "Гражданский заказ: "
 	var/obj/machinery/piratepad/civilian/pad = pad_ref?.resolve()
 	for(var/atom/movable/AM in get_turf(pad))
 		if(AM == pad)
 			continue
 		if(inserted_scan_id.registered_account.civilian_bounty.applies_to(AM))
-			status_report += "Target Applicable."
+			status_report += "Цель применима."
 			playsound(loc, 'sound/machines/synth_yes.ogg', 30 , TRUE)
 			return
-	status_report += "Not Applicable."
+	status_report += "Цель неприменима."
 	playsound(loc, 'sound/machines/synth_no.ogg', 30 , TRUE)
 
 /**
@@ -118,13 +118,13 @@
 			curr_bounty.ship(AM)
 			qdel(AM)
 	if(active_stack >= 1)
-		status_report += "Bounty Target Found x[active_stack]. "
+		status_report += "Цель заказа найдена x[active_stack]. "
 	else
-		status_report = "No applicable targets found. Aborting."
+		status_report = "Цель заказа не обнаружена. Отмена."
 		stop_sending()
 	if(curr_bounty.can_claim())
 		//Pay for the bounty with the ID's department funds.
-		status_report += "Bounty completed! Please give your bounty cube to cargo for your automated payout shortly."
+		status_report += "Заказ выполнен! Пожалуйста, передайте свой куб-награду в отдел снабжения для перевода средств на ваш аккаунт."
 		SSblackbox.record_feedback("tally", "bounties_completed", 1, curr_bounty.type)
 		inserted_scan_id.registered_account.reset_bounty()
 		SSeconomy.civ_bounty_tracker++
@@ -132,7 +132,7 @@
 		var/obj/item/bounty_cube/reward = new /obj/item/bounty_cube(drop_location())
 		reward.set_up(curr_bounty, inserted_scan_id)
 
-	pad.visible_message(span_notice("[pad] activates!"))
+	pad.visible_message(span_notice("[pad.name] активируется!"))
 	flick(pad.sending_state,pad)
 	pad.icon_state = pad.idle_state
 	playsound(loc, 'sound/machines/synth_yes.ogg', 30 , TRUE)
@@ -145,10 +145,10 @@
 	var/datum/bank_account/pot_acc = inserted_scan_id.registered_account
 	if((pot_acc.civilian_bounty || pot_acc.bounties) && !COOLDOWN_FINISHED(pot_acc, bounty_timer))
 		var/curr_time = round((COOLDOWN_TIMELEFT(pot_acc, bounty_timer)) / (1 MINUTES), 0.01)
-		say("Internal ID network spools coiling, try again in [curr_time] minutes!")
+		say("Внутренняя сеть идентификаторов наматывает катушки, попробуйте ещё раз через [curr_time] минут!")
 		return FALSE
 	if(!pot_acc.account_job)
-		say("Requesting ID card has no job assignment registered!")
+		say("Запрашиваемая ID карта не имеет зарегистрированной должности!")
 		return FALSE
 	var/list/datum/bounty/crumbs = list(random_bounty(pot_acc.account_job.bounty_types), // We want to offer 2 bounties from their appropriate job catagories
 										random_bounty(pot_acc.account_job.bounty_types), // and 1 guarenteed assistant bounty if the other 2 suck.
@@ -246,8 +246,8 @@
 		else
 			id_eject(user, target)
 
-	user.visible_message(span_notice("[user] inserts \the [card_to_insert] into \the [src]."),
-						span_notice("You insert \the [card_to_insert] into \the [src]."))
+	user.visible_message(span_notice("[user] вставляет [card_to_insert.name] в [src.name]."),
+						span_notice("Вы вставляете [card_to_insert.name] в [src.name]."))
 	playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
 	ui_interact(user)
 	return TRUE
@@ -255,14 +255,14 @@
 ///Removes A stored ID card.
 /obj/machinery/computer/piratepad_control/civilian/proc/id_eject(mob/user, obj/target)
 	if(!target)
-		to_chat(user, span_warning("That slot is empty!"))
+		to_chat(user, span_warning("Этот слот пуст!"))
 		return FALSE
 	else
 		target.forceMove(drop_location())
 		if(!issilicon(user) && Adjacent(user))
 			user.put_in_hands(target)
-		user.visible_message(span_notice("[user] gets \the [target] from \the [src]."), \
-							span_notice("You get \the [target] from \the [src]."))
+		user.visible_message(span_notice("[user] получает [target.name] из [src.name]."), \
+							span_notice("Вы получаете [target.name] из [src.name]."))
 		playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE)
 		inserted_scan_id = null
 		return TRUE
@@ -320,9 +320,9 @@
 /obj/item/bounty_cube/examine()
 	. = ..()
 	if(speed_bonus)
-		. += span_notice("<b>[time2text(next_nag_time - world.time,"mm:ss")]</b> remains until <b>[bounty_value * speed_bonus]</b> credit speedy delivery bonus lost.")
+		. += span_notice("<b>[time2text(next_nag_time - world.time,"mm:ss")]</b> остаётся до потери бонуса за быструю доставку в размере <b>[bounty_value * speed_bonus]</b> кредитов.")
 	if(handler_tip && !bounty_handler_account)
-		. += span_notice("Scan this in the cargo shuttle with an export scanner to register your bank account for the <b>[bounty_value * handler_tip]</b> credit handling tip.")
+		. += span_notice("Просканируйте его на шаттле отдела поставок с помощью экспорт сканера, чтобы вписать свой банковский аккаунт в инструкцию по обращению стоимостью <b>[bounty_value * handler_tip]</b> кредитов.")
 
 /*
  * Signal proc for [COMSIG_ITEM_EXPORTED], registered on the internal radio.
@@ -342,10 +342,10 @@
 	//if our nag cooldown has finished and we aren't on Centcom or in transit, then nag
 	if(COOLDOWN_FINISHED(src, next_nag_time) && !is_centcom_level(z) && !is_reserved_level(z))
 		//set up our nag message
-		var/nag_message = "[src] is unsent in [get_area(src)]."
+		var/nag_message = "[src.name] лежит неотправленным в [get_area(src)]."
 
 		//nag on Supply channel and reduce the speed bonus multiplier to nothing
-		var/speed_bonus_lost = "[speed_bonus ? " Speedy delivery bonus of [bounty_value * speed_bonus] credit\s lost." : ""]"
+		var/speed_bonus_lost = "[speed_bonus ? " Бонус за быструю доставку стоимостью [bounty_value * speed_bonus] кредитов был потерян." : ""]"
 		radio.talk_into(src, "[nag_message][speed_bonus_lost]", RADIO_CHANNEL_SUPPLY)
 		speed_bonus = 0
 
@@ -366,12 +366,12 @@
 	bounty_holder_job = holder_id.assignment
 	bounty_holder_account = holder_id.registered_account
 	name = "\improper [bounty_value] cr [name]"
-	desc += " The sales tag indicates it was <i>[bounty_holder] ([bounty_holder_job])</i>'s reward for completing the <i>[bounty_name]</i> bounty."
+	desc += " Торговая бирка показывает, что этот куб-награда для <i>[bounty_holder] ([bounty_holder_job])</i> за выполнение заказа \"<i>[bounty_name]</i>\" ."
 	AddComponent(/datum/component/pricetag, holder_id.registered_account, holder_cut, FALSE)
 	AddComponent(/datum/component/gps, "[src]")
 	START_PROCESSING(SSobj, src)
 	COOLDOWN_START(src, next_nag_time, nag_cooldown)
-	radio.talk_into(src,"Created in [get_area(src)] by [bounty_holder] ([bounty_holder_job]). Speedy delivery bonus lost in [time2text(next_nag_time - world.time,"mm:ss")].", RADIO_CHANNEL_SUPPLY)
+	radio.talk_into(src,"Куб-награда был создан в [get_area(src)] пользователем [bounty_holder] ([bounty_holder_job]). Бонус за быструю доставку будет потерян через [time2text(next_nag_time - world.time,"mm:ss")].", RADIO_CHANNEL_SUPPLY)
 
 //for when you need a REAL bounty cube to test with and don't want to do a bounty each time your code changes
 /obj/item/bounty_cube/debug_cube
@@ -404,7 +404,7 @@
 	var/uses = 2
 
 /obj/item/civ_bounty_beacon/attack_self()
-	loc.visible_message(span_warning("\The [src] begins to beep loudly!"))
+	loc.visible_message(span_warning("[src.name] начинает громко гудеть!"))
 	addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS)
 
 /obj/item/civ_bounty_beacon/proc/launch_payload()
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index 1c365dd087649..91a616cc5f678 100644
--- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm
+++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
@@ -57,7 +57,7 @@
 
 /obj/machinery/air_sensor/examine(mob/user)
 	. = ..()
-	. += span_notice("Use multitool to link it to an injector/vent or reset it's ports")
+	. += span_notice("Use multitool to link it to an injector/vent or reset its ports")
 	. += span_notice("Click with hand to turn it off.")
 
 /obj/machinery/air_sensor/attack_hand(mob/living/user, list/modifiers)
@@ -196,7 +196,7 @@
 		if(initial(sensor.chamber_id) != target_chamber)
 			continue
 
-		//make real air sensor in it's place
+		//make real air sensor in its place
 		var/obj/machinery/air_sensor/new_sensor = new sensor(get_turf(src))
 		new_sensor.inlet_id = input_id
 		new_sensor.outlet_id = output_id
diff --git a/code/game/machinery/computer/atmos_computers/_atmos_control.dm b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
index 094f12e36e36a..cdd0349ac85b9 100644
--- a/code/game/machinery/computer/atmos_computers/_atmos_control.dm
+++ b/code/game/machinery/computer/atmos_computers/_atmos_control.dm
@@ -19,7 +19,7 @@
 	/// Whether we are allowed to reconnect.
 	var/reconnecting = TRUE
 
-	/// Was this computer multitooled before. If so copy the list connected_sensors as it now mantain's it's own sensors independent of the map loaded one's
+	/// Was this computer multitooled before. If so copy the list connected_sensors as it now maintain's its own sensors independent of the map loaded one's
 	var/was_multi_tooled = FALSE
 
 	/// list of all sensors[key is chamber id, value is id of air sensor linked to this chamber] monitered by this computer
@@ -96,7 +96,7 @@
 		if(!was_multi_tooled)
 			connected_sensors = connected_sensors.Copy()
 			was_multi_tooled = TRUE
-		//register the sensor's unique ID with it's assositated chamber
+		//register the sensor's unique ID with its assositated chamber
 		connected_sensors[sensor.chamber_id] = sensor.id_tag
 		user.balloon_alert(user, "sensor connected to [src]")
 		return ITEM_INTERACT_SUCCESS
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 670d8d33fd81c..b5bb04fac35e1 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -133,7 +133,7 @@
 
 	var/list/visible_turfs = list()
 
-	// Get the camera's turf to correctly gather what's visible from it's turf, in case it's located in a moving object (borgs / mechs)
+	// Get the camera's turf to correctly gather what's visible from its turf, in case it's located in a moving object (borgs / mechs)
 	var/new_cam_turf = get_turf(active_camera)
 
 	// If we're not forcing an update for some reason and the cameras are in the same location,
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index f91e713b73721..98b51a4684834 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -298,7 +298,7 @@
 			nuke_request(reason, usr)
 			to_chat(usr, span_notice("Request sent."))
 			usr.log_message("has requested the nuclear codes from CentCom with reason \"[reason]\"", LOG_SAY)
-			priority_announce("[usr] запросил коды для запуска механизма ядерного самоуничтожения станции. В ближайшее время будет отправлено уведомление о подтверждении или отклонении данного запроса.", "ВНИМАНИЕ: Запрос кода самоуничтожения станции", SSstation.announcer.get_rand_report_sound())
+			priority_announce("[usr] запросил коды для запуска механизма ядерного самоуничтожения станции. В ближайшее время будет отправлено уведомление о подтверждении или отклонении данного запроса.", "Запрос кода самоуничтожения станции", SSstation.announcer.get_rand_report_sound())
 			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 			COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN)
 		if ("restoreBackupRoutingData")
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 9028d6d367d91..41c46c0cb205b 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -35,7 +35,7 @@
 #define GENETIC_DAMAGE_ACCURACY_MULTIPLIER 3
 
 /// Special status indicating a scanner occupant is transforming eg. from monkey to human
-#define STATUS_TRANSFORMING 4
+#define STATUS_TRANSFORMING 5
 
 /// Multiplier for how much genetic damage received from DNA Console functionality
 #define GENETIC_DAMAGE_IRGENETIC_DAMAGE_MULTIPLIER 1
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index d67cea367e9a6..43a18c7081f30 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -143,11 +143,13 @@
 			var/chems_needed = surgery_step.get_chem_list()
 			var/alternative_step
 			var/alt_chems_needed = ""
+			var/alt_chems_present = FALSE
 			if(surgery_step.repeatable)
 				var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
 				if(next_step)
 					alternative_step = capitalize(next_step.name)
 					alt_chems_needed = next_step.get_chem_list()
+					alt_chems_present = next_step.chem_check(patient)
 				else
 					alternative_step = "Finish operation"
 			data["procedures"] += list(list(
@@ -155,7 +157,9 @@
 				"next_step" = capitalize(surgery_step.name),
 				"chems_needed" = chems_needed,
 				"alternative_step" = alternative_step,
-				"alt_chems_needed" = alt_chems_needed
+				"alt_chems_needed" = alt_chems_needed,
+				"chems_present" = surgery_step.chem_check(patient),
+				"alt_chems_present" = alt_chems_present
 			))
 	return data
 
diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm
index 770897a2fe4fb..b3644efeeff68 100644
--- a/code/game/machinery/computer/orders/order_computer/order_computer.dm
+++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm
@@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(order_console_products)
 					ordered_paths += item.item_path
 			podspawn(list(
 				"target" = get_turf(living_user),
-				"style" = STYLE_BLUESPACE,
+				"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = /datum/pod_style/advanced,
 				"spawn" = ordered_paths,
 			))
 			grocery_list.Cut()
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index c421ca0c90308..deca4ec8245e1 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -185,11 +185,23 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/ce, 32)
 	frame_type = /obj/item/wallframe/telescreen/cmo
 
 /obj/item/wallframe/telescreen/cmo
-	name = "\improper Chief Engineer'stelescreen frame"
+	name = "\improper Chief Medical Officer's telescreen frame"
 	result_path = /obj/machinery/computer/security/telescreen/cmo
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/cmo, 32)
 
+/obj/machinery/computer/security/telescreen/med_sec
+	name = "\improper medical telescreen"
+	desc = "A telescreen with access to the medbay's camera network."
+	network = list(CAMERANET_NETWORK_MEDBAY)
+	frame_type = /obj/item/wallframe/telescreen/med_sec
+
+/obj/item/wallframe/telescreen/med_sec
+	name = "\improper medical telescreen frame"
+	result_path = /obj/machinery/computer/security/telescreen/med_sec
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/med_sec, 32)
+
 /obj/machinery/computer/security/telescreen/vault
 	name = "vault monitor"
 	desc = "A telescreen that connects to the vault's camera network."
diff --git a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
index 0c181ad043e77..aa3e9441d84a0 100644
--- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
@@ -104,6 +104,7 @@
 	icon_state = "brain"
 	greyscale_config = /datum/greyscale_config/mutant_organ
 	greyscale_colors = CARP_COLORS
+	can_smoothen_out = FALSE
 
 	///Timer counting down. When finished, the owner gets a bad moodlet.
 	var/cooldown_timer
diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
index 34d50fc3fc26b..e3e7112b0fec9 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
@@ -51,7 +51,7 @@
 
 /obj/item/organ/internal/tongue/fly/New(class, timer, datum/mutation/human/copymut)
 	. = ..()
-	AddComponent(/datum/component/speechmod, replacements = speech_replacements)
+	AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech)))
 
 /obj/item/organ/internal/tongue/fly/Initialize(mapload)
 	. = ..()
diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
index ac3dae39b7019..385878cb255a4 100644
--- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
@@ -58,6 +58,7 @@
 	icon_state = "brain"
 	greyscale_config = /datum/greyscale_config/mutant_organ
 	greyscale_colors = GOLIATH_COLORS
+	can_smoothen_out = FALSE
 
 	var/obj/item/goliath_infuser_hammer/hammer
 
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 33465809f4270..7188ba7c8353a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -139,6 +139,9 @@
 	/// Used for papers and photos pinned to the airlock
 	var/note_overlay_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
 
+	/// Airlock pump that overrides airlock controlls when set up for cycling
+	var/obj/machinery/atmospherics/components/unary/airlock_pump/cycle_pump
+
 	var/cyclelinkeddir = 0
 	var/obj/machinery/door/airlock/cyclelinkedairlock
 	var/shuttledocked = 0
@@ -286,7 +289,6 @@
 	qdel(src)
 
 /obj/machinery/door/airlock/Destroy()
-	QDEL_NULL(wires)
 	QDEL_NULL(electronics)
 	if (cyclelinkedairlock)
 		if (cyclelinkedairlock.cyclelinkedairlock == src)
@@ -1222,6 +1224,10 @@
 		INVOKE_ASYNC(src, density ? PROC_REF(open) : PROC_REF(close), BYPASS_DOOR_CHECKS)
 
 /obj/machinery/door/airlock/open(forced = DEFAULT_DOOR_CHECKS)
+	if(cycle_pump && !operating && !welded && !seal && locked && density)
+		cycle_pump.airlock_act(src)
+		return FALSE // The rest will be handled by the pump
+
 	if( operating || welded || locked || seal )
 		return FALSE
 
@@ -1456,9 +1462,9 @@
 		return
 	if(!density) //Already open
 		return ..()
+	if(user.combat_mode)
+		return ..()
 	if(locked || welded || seal) //Extremely generic, as aliens only understand the basics of how airlocks work.
-		if(user.combat_mode)
-			return ..()
 		to_chat(user, span_warning("[src] refuses to budge!"))
 		return
 	add_fingerprint(user)
@@ -1822,6 +1828,17 @@
 /obj/structure/fluff/airlock_filler/singularity_pull(S, current_size)
 	return
 
+/obj/machinery/door/airlock/proc/set_cycle_pump(obj/machinery/atmospherics/components/unary/airlock_pump/pump)
+	RegisterSignal(pump, COMSIG_QDELETING, PROC_REF(unset_cycle_pump))
+	cycle_pump = pump
+
+/obj/machinery/door/airlock/proc/unset_cycle_pump()
+	SIGNAL_HANDLER
+	if(locked)
+		unbolt()
+		say("Link broken, unbolting.")
+	cycle_pump = null
+
 // Station Airlocks Regular
 
 /obj/machinery/door/airlock/command
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index c6ed9f94a99f0..601ad67a6e9a4 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -102,6 +102,8 @@
 	else
 		flags_1 &= ~PREVENT_CLICK_UNDER_1
 
+	if(glass)
+		passwindow_on(src, INNATE_TRAIT)
 	//doors only block while dense though so we have to use the proc
 	real_explosion_block = explosion_block
 	update_explosive_block()
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 1de24c94a02a2..84df989ba0ea3 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -431,6 +431,10 @@
 	ignore_alarms = FALSE
 	if(!alarm_type || active) // If we have no alarm type, or are already active, go away
 		return
+	// Do we even care about temperature?
+	for(var/area/place in affecting_areas)
+		if(!place.fire_detect) // If any area is set to disable detection
+			return
 	// Otherwise, reactivate ourselves
 	start_activation_process(alarm_type)
 
@@ -546,7 +550,7 @@
 
 	if(density)
 		being_held_open = TRUE
-		user.balloon_alert_to_viewers("holding [src] open", "holding [src] open")
+		user.balloon_alert_to_viewers("holding firelock open", "holding firelock open")
 		COOLDOWN_START(src, activation_cooldown, REACTIVATION_DELAY)
 		open()
 		if(QDELETED(user))
@@ -583,7 +587,7 @@
 	UnregisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION)
 	UnregisterSignal(user, COMSIG_QDELETING)
 	if(user)
-		user.balloon_alert_to_viewers("released [src]", "released [src]")
+		user.balloon_alert_to_viewers("released firelock", "released firelock")
 
 /obj/machinery/door/firedoor/attack_ai(mob/user)
 	add_fingerprint(user)
@@ -603,7 +607,7 @@
 /obj/machinery/door/firedoor/attack_alien(mob/user, list/modifiers)
 	add_fingerprint(user)
 	if(welded)
-		to_chat(user, span_warning("[src] refuses to budge!"))
+		balloon_alert(user, "refuses to budge!")
 		return
 	open()
 	if(active)
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index a852ea019c697..3fc4dcf219adb 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -477,6 +477,9 @@
 	my_area.fire_detect = !my_area.fire_detect
 	for(var/obj/machinery/firealarm/fire_panel in my_area.firealarms)
 		fire_panel.update_icon()
+	// Used to force all the firelocks to update, if the zone is not manually activated
+	if (my_area.fault_status != AREA_FAULT_MANUAL)
+		reset() // Don't send user to prevent double balloon_alert() and the action is already logged in this proc.
 	if (user)
 		balloon_alert(user, "thermal sensors [my_area.fire_detect ? "enabled" : "disabled"]")
 		user.log_message("[ my_area.fire_detect ? "enabled" : "disabled" ] firelock sensors using [src].", LOG_GAME)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 3fa7d25767f2f..887c04ebedee0 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -137,6 +137,7 @@
 	icon = 'icons/obj/wallmounts.dmi'
 	icon_state = "migniter"
 	result_path = /obj/machinery/sparker
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
 	pixel_shift = 26
 
 /obj/machinery/sparker
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 04883800f31ef..c8d0249fca02d 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -119,6 +119,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
 	icon = 'icons/obj/machines/wallmounts.dmi'
 	icon_state = "light-nopower"
 	result_path = /obj/machinery/light_switch
+	custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
 	pixel_shift = 26
 
 /obj/item/circuit_component/light_switch
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 5f534ec95b4ed..401245613e1b0 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -31,7 +31,6 @@
 	for(var/obj/machinery/computer/pod/control as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/computer/pod))
 		if(control.id == id)
 			control.connected = null
-	QDEL_NULL(wires)
 	return ..()
 
 /obj/machinery/mass_driver/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
diff --git a/code/game/machinery/mechlaunchpad.dm b/code/game/machinery/mechlaunchpad.dm
index cbdc34d864800..70d075a551024 100644
--- a/code/game/machinery/mechlaunchpad.dm
+++ b/code/game/machinery/mechlaunchpad.dm
@@ -56,13 +56,13 @@
 	podspawn(list(
 		"target" = get_turf(src),
 		"path" = /obj/structure/closet/supplypod/mechpod,
-		"style" = STYLE_SEETHROUGH,
+		"style" = /datum/pod_style/seethrough,
 		"reverse_dropoff_coords" = list(reverse_turf.x, reverse_turf.y, reverse_turf.z)
 	))
 	use_energy(active_power_usage)
 
 /obj/structure/closet/supplypod/mechpod
-	style = STYLE_SEETHROUGH
+	style = /datum/pod_style/seethrough
 	explosionSize = list(0,0,0,0)
 	reversing = TRUE
 	reverse_option_list = list("Mobs"=FALSE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE,"Mecha"=TRUE)
diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm
index 6a63f07e5f51d..b2b6a2e2f1a15 100644
--- a/code/game/machinery/medical_kiosk.dm
+++ b/code/game/machinery/medical_kiosk.dm
@@ -318,7 +318,7 @@
 		patient_status = pick(
 			"The only kiosk is kiosk, but is the only patient, patient?",
 			"Breathing manually.",
-			"Constact NTOS site admin.",
+			"Contact NTOS site admin.",
 			"97% carbon, 3% natural flavoring",
 			"The ebb and flow wears us all in time.",
 			"It's Lupus. You have Lupus.",
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 929383b178c62..ef18dc6b068ae 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -36,9 +36,11 @@ Buildable meters
 	icon_state_preview = "junction"
 	pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/junction
 /obj/item/pipe/directional/vent
+	name = "air vent fitting"
 	icon_state_preview = "uvent"
 	pipe_type = /obj/machinery/atmospherics/components/unary/vent_pump
 /obj/item/pipe/directional/scrubber
+	name = "air scrubber fitting"
 	icon_state_preview = "scrubber"
 	pipe_type = /obj/machinery/atmospherics/components/unary/vent_scrubber
 /obj/item/pipe/directional/connector
@@ -53,6 +55,9 @@ Buildable meters
 /obj/item/pipe/directional/he_exchanger
 	icon_state_preview = "heunary"
 	pipe_type = /obj/machinery/atmospherics/components/unary/heat_exchanger
+/obj/item/pipe/directional/airlock_pump
+	icon_state_preview = "airlock_pump"
+	pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump
 /obj/item/pipe/binary
 	RPD_type = PIPE_STRAIGHT
 /obj/item/pipe/binary/layer_adapter
@@ -75,6 +80,7 @@ Buildable meters
 	RPD_type = PIPE_TRIN_M
 	var/flipped = FALSE
 /obj/item/pipe/trinary/flippable/filter
+	name = "gas filter fitting"
 	icon_state_preview = "filter"
 	pipe_type = /obj/machinery/atmospherics/components/trinary/filter
 /obj/item/pipe/trinary/flippable/mixer
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 28aae48886621..8ce9265917d63 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -133,33 +133,55 @@
 		qdel(morsel)
 		return
 
-	var/list/to_eat = (issilicon(morsel) ? list(morsel) : morsel.get_all_contents()) //eating borg contents leads to many bad things
+	var/list/atom/to_eat = list(morsel)
 
 	var/living_detected = FALSE //technically includes silicons as well but eh
 	var/list/nom = list()
 	var/list/crunchy_nom = list() //Mobs have to be handled differently so they get a different list instead of checking them multiple times.
+	var/not_eaten = 0
 
-	for(var/thing in to_eat)
-		var/obj/as_object = thing
-		if(istype(as_object))
-			if(as_object.resistance_flags & INDESTRUCTIBLE)
-				if(!isturf(as_object.loc) && !isliving(as_object.loc))
-					as_object.forceMove(loc) // so you still cant shove it in a locker
-				continue
-			var/obj/item/bodypart/head/as_head = thing
-			var/obj/item/mmi/as_mmi = thing
-			if(istype(thing, /obj/item/organ/internal/brain) || (istype(as_head) && locate(/obj/item/organ/internal/brain) in as_head) || (istype(as_mmi) && as_mmi.brain) || istype(thing, /obj/item/dullahan_relay))
-				living_detected = TRUE
-			if(isitem(as_object))
-				var/obj/item/as_item = as_object
-				if(as_item.item_flags & ABSTRACT) //also catches organs and bodyparts *stares*
-					continue
-			nom += thing
-		else if(isliving(thing))
+	while (to_eat.len)
+		var/atom/movable/thing = to_eat[1]
+		to_eat -= thing
+
+		if (thing.flags_1 & HOLOGRAM_1)
+			qdel(thing)
+			continue
+
+		if (thing.resistance_flags & INDESTRUCTIBLE)
+			if (!isturf(thing.loc) && !isliving(thing.loc))
+				thing.forceMove(loc)
+			not_eaten += 1
+			continue
+
+		if (isliving(thing))
 			living_detected = TRUE
 			crunchy_nom += thing
+			if (!issilicon(thing))
+				to_eat |= thing.contents
+			continue
+
+		if (!isobj(thing))
+			not_eaten += 1
+			continue
+
+		if (isitem(thing))
+			var/obj/item/as_item = thing
+			if (as_item.item_flags & ABSTRACT)
+				not_eaten += 1
+				continue
+
+		if (istype(thing, /obj/item/organ/internal/brain) || istype(thing, /obj/item/dullahan_relay))
+			living_detected = TRUE
+
+		if (istype(thing, /obj/item/mmi))
+			var/obj/item/mmi/mmi = thing
+			if (!isnull(mmi.brain))
+				living_detected = TRUE
+
+		nom += thing
+		to_eat |= thing.contents
 
-	var/not_eaten = to_eat.len - nom.len - crunchy_nom.len
 	if(living_detected) // First, check if we have any living beings detected.
 		if(obj_flags & EMAGGED)
 			for(var/CRUNCH in crunchy_nom) // Eat them and keep going because we don't care about safety.
@@ -174,7 +196,7 @@
 
 	/**
 	 * we process the list in reverse so that atoms without parents/contents are deleted first & their parents are deleted next & so on.
-	 * this is the reverse order in which get_all_contents() returns it's list
+	 * this is the reverse order in which get_all_contents() returns its list
 	 * if we delete an atom containing stuff then all its stuff are deleted with it as well so we will end recycling deleted items down the list and gain nothing from them
 	 */
 	for(var/i = length(nom); i >= 1; i--)
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index ba4a5136a8978..2a8dc8bb49b22 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -277,7 +277,7 @@
 		var/value = coin_values[coin_type] //Change this to use initial value once we change to mat datum coins.
 		var/coin_count = round(remaining_payout / value)
 
-		if(!coin_count) //Cant make coins of this type, as we can't reach it's value.
+		if(!coin_count) //Cant make coins of this type, as we can't reach its value.
 			continue
 
 		remaining_payout -= value * coin_count
@@ -451,11 +451,12 @@
 	addtimer(CALLBACK(src, PROC_REF(launch_payload)), 4 SECONDS)
 
 /obj/item/roulette_wheel_beacon/proc/launch_payload()
-	var/obj/structure/closet/supplypod/centcompod/toLaunch = new()
-
-	new /obj/machinery/roulette(toLaunch)
-
-	new /obj/effect/pod_landingzone(drop_location(), toLaunch)
+	podspawn(list(
+		"target" = drop_location(),
+		"path" = /obj/structure/closet/supplypod/centcompod,
+		"spawn" = /obj/machinery/roulette
+	))
+	
 	qdel(src)
 
 #undef ROULETTE_DOZ_COL_PAYOUT
diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm
index 860a5b1bc05b1..fd99f3ccfb8a3 100644
--- a/code/game/machinery/scanner_gate.dm
+++ b/code/game/machinery/scanner_gate.dm
@@ -23,11 +23,11 @@
 	desc = "A gate able to perform mid-depth scans on any organisms who pass under it."
 	icon = 'icons/obj/machines/scangate.dmi'
 	icon_state = "scangate"
+	layer = ABOVE_MOB_LAYER
 	circuit = /obj/item/circuitboard/machine/scanner_gate
+	COOLDOWN_DECLARE(next_beep)
 
 	var/scanline_timer
-	///Internal timer to prevent audio spam.
-	var/next_beep = 0
 	///Bool to check if the scanner's controls are locked by an ID.
 	var/locked = FALSE
 	///Which setting is the scanner checking for? See defines in scanner_gate.dm for the list.
@@ -46,6 +46,10 @@
 	var/light_fail = FALSE
 	///Does the scanner ignore light_pass and light_fail for sending signals?
 	var/ignore_signals = FALSE
+	///Modifier to the chance of scanner being false positive/negative
+	var/minus_false_beep = 0
+	///Base false positive/negative chance
+	var/base_false_beep = 5
 	///Is an n-spect scanner attached to the gate? Enables contraband scanning.
 	var/obj/item/inspector/n_spect = null
 
@@ -60,10 +64,10 @@
 	AddElement(/datum/element/connect_loc, loc_connections)
 	register_context()
 
-/obj/machinery/scanner_gate/Destroy()
-	qdel(wires)
-	set_wires(null)
+/obj/machinery/scanner_gate/RefreshParts()
 	. = ..()
+	for(var/datum/stock_part/scanning_module/scanning_module in component_parts)
+		minus_false_beep = scanning_module.tier //The better are scanninning modules - the lower is chance of False Positives
 
 /obj/machinery/scanner_gate/atom_deconstruct(disassembled)
 	. = ..()
@@ -73,6 +77,8 @@
 
 /obj/machinery/scanner_gate/examine(mob/user)
 	. = ..()
+
+	. += span_notice("It's set to scan for [span_boldnotice(scangate_mode)].")
 	if(locked)
 		. += span_notice("The control panel is ID-locked. Swipe a valid ID to unlock it.")
 	else
@@ -90,13 +96,13 @@
 		return CONTEXTUAL_SCREENTIP_SET
 
 
-/obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/AM)
+/obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/thing)
 	SIGNAL_HANDLER
-	INVOKE_ASYNC(src, PROC_REF(auto_scan), AM)
+	INVOKE_ASYNC(src, PROC_REF(auto_scan), thing)
 
-/obj/machinery/scanner_gate/proc/auto_scan(atom/movable/AM)
-	if(!(machine_stat & (BROKEN|NOPOWER)) && isliving(AM) & (!panel_open))
-		perform_scan(AM)
+/obj/machinery/scanner_gate/proc/auto_scan(atom/movable/thing)
+	if(!(machine_stat & (BROKEN|NOPOWER)) && anchored && !panel_open)
+		perform_scan(thing)
 
 /obj/machinery/scanner_gate/proc/set_scanline(type, duration)
 	cut_overlays()
@@ -118,8 +124,8 @@
 			return ITEM_INTERACT_SUCCESS
 	return NONE
 
-/obj/machinery/scanner_gate/attackby(obj/item/W, mob/user, params)
-	var/obj/item/card/id/card = W.GetID()
+/obj/machinery/scanner_gate/attackby(obj/item/attacking_item, mob/user, params)
+	var/obj/item/card/id/card = attacking_item.GetID()
 	if(card)
 		if(locked)
 			if(allowed(user))
@@ -127,22 +133,26 @@
 				req_access = list()
 				to_chat(user, span_notice("You unlock [src]."))
 		else if(!(obj_flags & EMAGGED))
-			to_chat(user, span_notice("You lock [src] with [W]."))
-			var/list/access = W.GetAccess()
+			to_chat(user, span_notice("You lock [src] with [attacking_item]."))
+			var/list/access = attacking_item.GetAccess()
 			req_access = access
 			locked = TRUE
 		else
-			to_chat(user, span_warning("You try to lock [src] with [W], but nothing happens."))
+			to_chat(user, span_warning("You try to lock [src] with [attacking_item], but nothing happens."))
 	else
-		if(!locked && default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", initial(icon_state), W))
+		if(!locked && default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", initial(icon_state), attacking_item))
 			return
-		if(panel_open && is_wire_tool(W))
+		if(panel_open && is_wire_tool(attacking_item))
 			wires.interact(user)
 	return ..()
 
 /obj/machinery/scanner_gate/crowbar_act(mob/living/user, obj/item/tool)
 	. = ..()
 	if(n_spect)
+		if(locked)
+			balloon_alert(user, "locked!")
+			return ITEM_INTERACT_BLOCKING
+
 		to_chat(user, span_notice("You uninstall [n_spect] from [src]."))
 		n_spect.forceMove(drop_location())
 		return ITEM_INTERACT_SUCCESS
@@ -163,69 +173,102 @@
 	balloon_alert(user, "id checker disabled")
 	return TRUE
 
-/obj/machinery/scanner_gate/proc/perform_scan(mob/living/M)
+/obj/machinery/scanner_gate/proc/perform_scan(atom/movable/thing)
 	var/beep = FALSE
 	var/color = null
+	var/detected_thing = null
 	switch(scangate_mode)
 		if(SCANGATE_NONE)
 			return
 		if(SCANGATE_WANTED)
-			if(ishuman(M))
-				var/mob/living/carbon/human/H = M
-				var/perpname = H.get_face_name(H.get_id_name())
+			if(ishuman(thing))
+				detected_thing = "Warrant"
+				var/mob/living/carbon/human/scanned_human = thing
+				var/perpname = scanned_human.get_face_name(scanned_human.get_id_name())
 				var/datum/record/crew/target = find_record(perpname)
 				if(!target || (target.wanted_status == WANTED_ARREST))
 					beep = TRUE
 		if(SCANGATE_MINDSHIELD)
-			if(HAS_TRAIT(M, TRAIT_MINDSHIELD))
-				beep = TRUE
+			detected_thing = "Mindshield"
+			if(ishuman(thing))
+				var/mob/living/carbon/human/scanned_human = thing
+				if(HAS_TRAIT(scanned_human, TRAIT_MINDSHIELD))
+					beep = TRUE
 		if(SCANGATE_DISEASE)
-			if(iscarbon(M))
-				var/mob/living/carbon/C = M
-				if(get_disease_severity_value(C.check_virus()) >= get_disease_severity_value(disease_threshold))
+			detected_thing = "[disease_threshold] infection"
+			if(iscarbon(thing))
+				var/mob/living/carbon/scanned_carbon = thing
+				if(get_disease_severity_value(scanned_carbon.check_virus()) >= get_disease_severity_value(disease_threshold))
 					beep = TRUE
 		if(SCANGATE_SPECIES)
-			if(ishuman(M))
-				var/mob/living/carbon/human/H = M
+			if(ishuman(thing))
+				var/mob/living/carbon/human/scanned_human = thing
 				var/datum/species/scan_species = /datum/species/human
 				switch(detect_species)
 					if(SCANGATE_LIZARD)
+						detected_thing = "Lizardperson"
 						scan_species = /datum/species/lizard
 					if(SCANGATE_FLY)
+						detected_thing = "Flyperson"
 						scan_species = /datum/species/fly
 					if(SCANGATE_FELINID)
+						detected_thing = "Felinid"
 						scan_species = /datum/species/human/felinid
 					if(SCANGATE_PLASMAMAN)
+						detected_thing = "Plasmaman"
 						scan_species = /datum/species/plasmaman
 					if(SCANGATE_MOTH)
+						detected_thing = "Mothperson"
 						scan_species = /datum/species/moth
 					if(SCANGATE_JELLY)
+						detected_thing = "Jellyperson"
 						scan_species = /datum/species/jelly
 					if(SCANGATE_POD)
+						detected_thing = "Podperson"
 						scan_species = /datum/species/pod
 					if(SCANGATE_GOLEM)
+						detected_thing = "Golem"
 						scan_species = /datum/species/golem
 					if(SCANGATE_ZOMBIE)
+						detected_thing = "Zombie"
 						scan_species = /datum/species/zombie
-				if(is_species(H, scan_species))
+				if(is_species(scanned_human, scan_species))
 					beep = TRUE
 				if(detect_species == SCANGATE_ZOMBIE) //Can detect dormant zombies
-					if(H.get_organ_slot(ORGAN_SLOT_ZOMBIE))
+					detected_thing = "Romerol infection"
+					if(scanned_human.get_organ_slot(ORGAN_SLOT_ZOMBIE))
 						beep = TRUE
 		if(SCANGATE_GUNS)
-			for(var/I in M.get_contents())
-				if(isgun(I))
-					beep = TRUE
-					break
+			detected_thing = "Weapons"
+			if(isgun(thing))
+				beep = TRUE
+			else if(ishuman(thing))
+				var/mob/living/carbon/human/scanned_human = thing
+				var/obj/item/card/id/idcard = scanned_human.get_idcard(hand_first = FALSE)
+				for(var/obj/item/scanned_item in scanned_human.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+					if(isgun(scanned_item))
+						if((!HAS_TRAIT(scanned_human, TRAIT_MINDSHIELD)) && (isnull(idcard) || !(ACCESS_WEAPONS in idcard.access))) // mindshield or ID card with weapons access, like bartender
+							beep = TRUE
+							break
+						say("[detected_thing] detection bypassed.")
+						break
+			else
+				for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+					if(isgun(content))
+						beep = TRUE
+						break
 		if(SCANGATE_NUTRITION)
-			if(ishuman(M))
-				var/mob/living/carbon/human/H = M
-				if(H.nutrition <= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_STARVING)
+			if(ishuman(thing))
+				var/mob/living/carbon/human/scanned_human = thing
+				if(scanned_human.nutrition <= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_STARVING)
 					beep = TRUE
-				if(H.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
+					detected_thing = "Starvation"
+				if(scanned_human.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
 					beep = TRUE
+					detected_thing = "Obesity"
 		if(SCANGATE_CONTRABAND)
-			for(var/obj/item/content in M.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+			for(var/obj/item/content in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+				detected_thing = "Contraband"
 				if(content.is_contraband())
 					beep = TRUE
 					break
@@ -234,29 +277,36 @@
 
 	if(reverse)
 		beep = !beep
+
+	if(prob(base_false_beep - minus_false_beep)) //False positive/negative
+		beep = prob(50)
+
 	if(beep)
-		alarm_beep()
-		SEND_SIGNAL(src, COMSIG_SCANGATE_PASS_TRIGGER, M)
+		alarm_beep(detected_thing)
+		SEND_SIGNAL(src, COMSIG_SCANGATE_PASS_TRIGGER, thing)
 		if(!ignore_signals)
 			color = wires.get_color_of_wire(WIRE_ACCEPT)
 			var/obj/item/assembly/assembly = wires.get_attached(color)
 			assembly?.activate()
 	else
-		SEND_SIGNAL(src, COMSIG_SCANGATE_PASS_NO_TRIGGER, M)
+		SEND_SIGNAL(src, COMSIG_SCANGATE_PASS_NO_TRIGGER, thing)
 		if(!ignore_signals)
 			color = wires.get_color_of_wire(WIRE_DENY)
 			var/obj/item/assembly/assembly = wires.get_attached(color)
 			assembly?.activate()
-		set_scanline("scanning", 10)
+		set_scanline("scanning", 1 SECONDS)
 
 	use_energy(active_power_usage)
 
-/obj/machinery/scanner_gate/proc/alarm_beep()
-	if(next_beep <= world.time)
-		next_beep = world.time + (2 SECONDS)
-		playsound(src, 'sound/machines/scanbuzz.ogg', 100, FALSE)
-	var/mutable_appearance/alarm_display = mutable_appearance(icon, "alarm_light")
-	flick_overlay_view(alarm_display, 2 SECONDS)
+/obj/machinery/scanner_gate/proc/alarm_beep(detected_thing)
+	if(!COOLDOWN_FINISHED(src, next_beep))
+		return
+
+	if(detected_thing)
+		say("[detected_thing][reverse ? " not " : " "]detected!!")
+
+	COOLDOWN_START(src, next_beep, 2 SECONDS)
+	playsound(source = src, soundin = 'sound/machines/scanbuzz.ogg', vol = 30, vary = FALSE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, falloff_distance = 4)
 	set_scanline("alarm", 2 SECONDS)
 
 /obj/machinery/scanner_gate/can_interact(mob/user)
@@ -321,6 +371,11 @@
 						detect_nutrition = NUTRITION_LEVEL_FAT
 			. = TRUE
 
+/obj/machinery/scanner_gate/preset_guns
+	locked = TRUE
+	req_access = ACCESS_SECURITY
+	scangate_mode = SCANGATE_GUNS
+
 #undef SCANGATE_NONE
 #undef SCANGATE_MINDSHIELD
 #undef SCANGATE_DISEASE
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index d961c68dc8ed6..97b0adf5601a8 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -324,6 +324,8 @@
 
 /obj/machinery/power/shieldwallgen/Initialize(mapload)
 	. = ..()
+	//Add to the early process queue to prioritize power draw
+	SSmachines.processing_early += src
 	if(anchored)
 		connect_to_network()
 	RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active))
@@ -356,7 +358,7 @@
 		return FALSE
 	. = ..()
 
-/obj/machinery/power/shieldwallgen/process()
+/obj/machinery/power/shieldwallgen/process_early()
 	if(active)
 		if(active == ACTIVE_SETUPFIELDS)
 			var/fields = 0
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 1c69dbecb7ea0..af6221d89219d 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -2,7 +2,7 @@
 #define HEATER_MODE_HEAT "heat"
 #define HEATER_MODE_COOL "cool"
 #define HEATER_MODE_AUTO "auto"
-#define BASE_HEATING_ENERGY (STANDARD_CELL_RATE * 4)
+#define BASE_HEATING_ENERGY (40 KILO JOULES)
 
 /obj/machinery/space_heater
 	anchored = FALSE
@@ -32,7 +32,7 @@
 	///How much heat/cold we can deliver
 	var/heating_energy = BASE_HEATING_ENERGY
 	///How efficiently we can deliver that heat/cold (higher indicates less cell consumption)
-	var/efficiency = 200
+	var/efficiency = 20 MEGA JOULES / STANDARD_CELL_CHARGE
 	///The amount of degrees above and below the target temperature for us to change mode to heater or cooler
 	var/temperature_tolerance = 1
 	///What's the middle point of our settable temperature (30 °C)
@@ -176,7 +176,7 @@
 	for(var/datum/stock_part/capacitor/capacitor in component_parts)
 		cap += capacitor.tier
 
-	heating_energy = laser * BASE_HEATING_ENERGY
+	heating_energy = laser * initial(heating_energy)
 
 	settable_temperature_range = cap * initial(settable_temperature_range)
 	efficiency = (cap + 1) * initial(efficiency) * 0.5
@@ -295,7 +295,14 @@
 	on = !on
 	mode = HEATER_MODE_STANDBY
 	if(!isnull(user))
-		balloon_alert(user, "turned [on ? "on" : "off"]")
+		if(QDELETED(cell))
+			balloon_alert(user, "no cell!")
+		else if(!cell.charge())
+			balloon_alert(user, "no charge!")
+		else if(!is_operational)
+			balloon_alert(user, "not operational!")
+		else
+			balloon_alert(user, "turned [on ? "on" : "off"]")
 	update_appearance()
 	if(on)
 		SSair.start_processing_machine(src)
@@ -310,11 +317,18 @@
 	//We inherit the cell from the heater prior
 	cell = null
 	interaction_flags_click = FORBID_TELEKINESIS_REACH
+	display_panel = FALSE
+	settable_temperature_range = 50
 	///The beaker within the heater
 	var/obj/item/reagent_containers/beaker = null
-	///How powerful the heating is, upgrades with parts. (ala chem_heater.dm's method, basically the same level of heating, but this is restricted)
-	var/chem_heating_power = 1
-	display_panel = FALSE
+	/// How quickly it delivers heat to the reagents. In watts per joule of the thermal energy difference of the reagent from the temperature difference of the current and target temperatures.
+	var/beaker_conduction_power = 0.1
+	/// The subsystem we're being processed by.
+	var/datum/controller/subsystem/processing/our_subsystem
+
+/obj/machinery/space_heater/improvised_chem_heater/Initialize(mapload)
+	our_subsystem = locate(subsystem_type) in Master.subsystems
+	. = ..()
 
 /obj/machinery/space_heater/improvised_chem_heater/Destroy()
 	. = ..()
@@ -322,11 +336,10 @@
 
 /obj/machinery/space_heater/improvised_chem_heater/heating_examine()
 	. = ..()
-
-	var/power_mod = 0.1 * chem_heating_power
-	if(set_mode == HEATER_MODE_AUTO)
-		power_mod *= 0.5
-	. += span_notice("Heating power for beaker: <b>[display_power(heating_energy * power_mod, convert = TRUE)]</b>")
+	// Conducted energy per joule of thermal energy difference in a tick.
+	var/conduction_energy = beaker_conduction_power * (set_mode == HEATER_MODE_AUTO ? 0.5 : 1) * our_subsystem.wait / (1 SECONDS)
+	// This accounts for the timestep inaccuracy.
+	. += span_notice("Reagent conduction power: <b>[conduction_energy < 1 ? display_power(-log(1 - conduction_energy) SECONDS / our_subsystem.wait, convert = FALSE) : "∞W"]/J</b>")
 
 /obj/machinery/space_heater/improvised_chem_heater/toggle_power(user)
 	. = ..()
@@ -341,10 +354,10 @@
 		return PROCESS_KILL
 
 	if(beaker.reagents.total_volume)
-		var/power_mod = 0.1 * chem_heating_power
+		var/conduction_modifier = beaker_conduction_power
 		switch(set_mode)
 			if(HEATER_MODE_AUTO)
-				power_mod *= 0.5
+				conduction_modifier *= 0.5
 			if(HEATER_MODE_HEAT)
 				if(target_temperature < beaker.reagents.chem_temp)
 					return
@@ -352,7 +365,7 @@
 				if(target_temperature > beaker.reagents.chem_temp)
 					return
 
-		var/required_energy = abs(target_temperature - beaker.reagents.chem_temp) * power_mod * seconds_per_tick * beaker.reagents.heat_capacity()
+		var/required_energy = abs(target_temperature - beaker.reagents.chem_temp) * conduction_modifier * seconds_per_tick * beaker.reagents.heat_capacity()
 		required_energy = min(required_energy, heating_energy, cell.charge * efficiency)
 		if(required_energy < 1)
 			return
@@ -468,16 +481,17 @@
 	for(var/datum/stock_part/capacitor/capacitor in component_parts)
 		capacitors_rating += capacitor.tier
 
-	heating_energy = lasers_rating * BASE_HEATING_ENERGY
+	heating_energy = lasers_rating * initial(heating_energy)
 
-	settable_temperature_range = capacitors_rating * 50 //-20 - 80 at base
-	efficiency = (capacitors_rating + 1) * 10
+	settable_temperature_range = capacitors_rating * initial(settable_temperature_range) //-20 - 80 at base
+	efficiency = (capacitors_rating + 1) * initial(efficiency) * 0.5
 
 	target_temperature = clamp(target_temperature,
 		max(settable_temperature_median - settable_temperature_range, TCMB),
 		settable_temperature_median + settable_temperature_range)
 
-	chem_heating_power = efficiency / 20
+	// No time integration is used, so we should clamp this to prevent being able to overshoot if there was a subtype with a high initial value.
+	beaker_conduction_power = min((capacitors_rating + 1) * 0.5 * initial(beaker_conduction_power), 1 SECONDS / our_subsystem.wait)
 
 #undef HEATER_MODE_STANDBY
 #undef HEATER_MODE_HEAT
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index e4f7b0a8338b8..3a7cc849acd30 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -107,7 +107,6 @@
 	end_processing()
 
 /obj/machinery/syndicatebomb/Destroy()
-	QDEL_NULL(wires)
 	QDEL_NULL(countdown)
 	end_processing()
 	return ..()
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 4c53cc5e4189d..2c31dcbd98955 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -13,6 +13,10 @@
 	/// If this list contains `0`, then it will be receivable on every single
 	/// z-level.
 	var/list/levels
+	/// Blacklisted spans we don't want being put into comms by anything, ever - a place to put any new spans we want to make without letting them annoy people on comms
+	var/list/blacklisted_spans = list(
+		SPAN_SOAPBOX,
+	)
 
 /datum/signal/subspace/New(data)
 	src.data = data || list()
@@ -74,7 +78,7 @@
 	datum/language/language,  // the language of the message
 	message,  // the text content of the message
 	spans,  // the list of spans applied to the message
-	list/message_mods // the list of modification applied to the message. Whispering, singing, ect
+	list/message_mods, // the list of modification applied to the message. Whispering, singing, ect
 )
 	src.source = source
 	src.frequency = frequency
@@ -88,7 +92,7 @@
 		"compression" = rand(COMPRESSION_VOCAL_SIGNAL_MIN, COMPRESSION_VOCAL_SIGNAL_MAX),
 		"language" = lang_instance.name,
 		"spans" = spans,
-		"mods" = message_mods
+		"mods" = message_mods,
 	)
 	levels = SSmapping.get_connected_levels(get_turf(source))
 
@@ -175,7 +179,7 @@
 		if(!hearer)
 			stack_trace("null found in the hearers list returned by the spatial grid. this is bad")
 			continue
-
+		spans -= blacklisted_spans
 		hearer.Hear(rendered, virt, language, message, frequency, spans, message_mods, message_range = INFINITY)
 
 	// This following recording is intended for research and feedback in the use of department radio channels
diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm
index 83d0f6e3209a0..8136aed843514 100644
--- a/code/game/machinery/telecomms/machines/hub.dm
+++ b/code/game/machinery/telecomms/machines/hub.dm
@@ -63,7 +63,6 @@
 		"s_relay",
 		"m_relay",
 		"r_relay",
-		"h_relay",
 		"science",
 		"medical",
 		"supply",
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 21804def7e361..b3aba350c3368 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
 		DYE_QM = /obj/item/clothing/gloves/color/brown,
 		DYE_CAPTAIN = /obj/item/clothing/gloves/captain,
 		DYE_HOP = /obj/item/clothing/gloves/color/grey,
-		DYE_HOS = /obj/item/clothing/gloves/color/black,
+		DYE_HOS = /obj/item/clothing/gloves/color/black/security,
 		DYE_CE = /obj/item/clothing/gloves/chief_engineer,
 		DYE_RD = /obj/item/clothing/gloves/color/grey,
 		DYE_CMO = /obj/item/clothing/gloves/latex/nitrile,
diff --git a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
index 2e2039dfaec81..27c02fb9d1806 100644
--- a/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
+++ b/code/game/objects/effects/anomalies/anomalies_bioscrambler.dm
@@ -24,7 +24,7 @@
 	if(!COOLDOWN_FINISHED(src, pulse_cooldown))
 		return
 
-	new /obj/effect/temp_visual/bioscrambler_wave(get_turf(src))
+	new /obj/effect/temp_visual/circle_wave/bioscrambler(get_turf(src))
 	playsound(src, 'sound/magic/cosmic_energy.ogg', vol = 50, vary = TRUE)
 	COOLDOWN_START(src, pulse_cooldown, pulse_delay)
 	for(var/mob/living/carbon/nearby in hearers(range, src))
@@ -81,7 +81,7 @@
 	return
 
 /// Visual effect spawned when the bioscrambler scrambles your bio
-/obj/effect/temp_visual/bioscrambler_wave
+/obj/effect/temp_visual/circle_wave
 	icon = 'icons/effects/64x64.dmi'
 	icon_state = "circle_wave"
 	pixel_x = -16
@@ -90,7 +90,7 @@
 	color = COLOR_LIME
 	var/max_alpha = 255
 
-/obj/effect/temp_visual/bioscrambler_wave/Initialize(mapload)
+/obj/effect/temp_visual/circle_wave/Initialize(mapload)
 	transform = matrix().Scale(0.1)
 	animate(src, transform = matrix().Scale(2), time = duration, flags = ANIMATION_PARALLEL)
 	animate(src, alpha = max_alpha, time = duration * 0.6, flags = ANIMATION_PARALLEL)
@@ -98,5 +98,9 @@
 	apply_wibbly_filters(src)
 	return ..()
 
-/obj/effect/temp_visual/bioscrambler_wave/light
+/obj/effect/temp_visual/circle_wave/bioscrambler
+	color = COLOR_LIME
+
+/obj/effect/temp_visual/circle_wave/bioscrambler/light
 	max_alpha = 128
+
diff --git a/code/game/objects/effects/anomalies/anomalies_bluespace.dm b/code/game/objects/effects/anomalies/anomalies_bluespace.dm
index a16f819400252..3364bdaf0c7b2 100644
--- a/code/game/objects/effects/anomalies/anomalies_bluespace.dm
+++ b/code/game/objects/effects/anomalies/anomalies_bluespace.dm
@@ -45,7 +45,7 @@
 	var/turf/TO = get_turf(chosen) // the turf of origin we're travelling TO
 
 	playsound(TO, 'sound/effects/phasein.ogg', 100, TRUE)
-	priority_announce("Зафиксирован массивный выброс блюспейс энергии.", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Зафиксирован массивный выброс блюспейс энергии.", "Обнаружена аномалия")
 
 	var/list/flashers = list()
 	for(var/mob/living/carbon/C in viewers(TO, null))
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional.dm b/code/game/objects/effects/anomalies/anomalies_dimensional.dm
index 23efac3fbfe77..5335535049c8a 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional.dm
@@ -76,7 +76,7 @@
 	var/area/new_area = placer.findValidArea()
 	var/turf/new_turf = placer.findValidTurf(new_area)
 
-	priority_announce("Пространственная аномалия переместилась. Предполагаемая локация: [new_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Пространственная аномалия переместилась. Предполагаемая локация: [new_area.name].", "Обнаружена аномалия")
 	src.forceMove(new_turf)
 	prepare_area()
 
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index 6832b07d12568..a9d2e0bcaa0c4 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -449,3 +449,23 @@
 		/obj/structure/table = list(/obj/structure/table/greyscale = 9, /obj/structure/table/abductor = 1),
 		/obj/structure/toilet = list(/obj/structure/toilet/greyscale = 1),
 	)
+
+/datum/dimension_theme/bronze
+	name = "Bronze"
+	icon = 'icons/obj/weapons/spear.dmi'
+	icon_state = "ratvarian_spear"
+	material = /datum/material/bronze
+	replace_walls = /turf/closed/wall/mineral/bronze
+	replace_floors = list(/turf/open/floor/bronze = 1, /turf/open/floor/bronze/flat = 1, /turf/open/floor/bronze/filled = 1)
+	replace_objs = list(
+		/obj/structure/girder = list(/obj/structure/girder/bronze = 1),
+		/obj/structure/window/fulltile = list(/obj/structure/window/bronze/fulltile = 1),
+		/obj/structure/window = list(/obj/structure/window/bronze = 1),
+		/obj/structure/statue = list(/obj/structure/statue/bronze/marx = 1), // karl marx was a servant of ratvar
+		/obj/structure/table = list(/obj/structure/table/bronze = 1),
+		/obj/structure/toilet = list(/obj/structure/toilet/greyscale = 1),
+		/obj/structure/chair = list(/obj/structure/chair/bronze = 1),
+		/obj/item/reagent_containers/cup/glass/trophy = list(/obj/item/reagent_containers/cup/glass/trophy/bronze_cup = 1),
+		/obj/machinery/door/airlock = list(/obj/machinery/door/airlock/bronze = 1),
+	)
+	sound = 'sound/magic/clockwork/fellowship_armory.ogg'
diff --git a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
index e8c546ae2e172..3ece580373cf5 100644
--- a/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
+++ b/code/game/objects/effects/anomalies/anomalies_ectoplasm.dm
@@ -102,7 +102,7 @@
 
 		new /obj/structure/ghost_portal(get_turf(src), candidate_list)
 
-		priority_announce("Аномалия достигла критической массы. Обнаружен всплеск эктоплазмы.", "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce("Аномалия достигла критической массы. Обнаружен всплеск эктоплазмы.", "Обнаружена аномалия")
 
 /**
  * Manages updating the sprite for the anomaly based on how many orbiters it has.
diff --git a/code/game/objects/effects/anomalies/anomalies_gravity.dm b/code/game/objects/effects/anomalies/anomalies_gravity.dm
index 08becc48c7531..82b55542246c7 100644
--- a/code/game/objects/effects/anomalies/anomalies_gravity.dm
+++ b/code/game/objects/effects/anomalies/anomalies_gravity.dm
@@ -61,7 +61,7 @@
 			if(target && !target.stat)
 				O.throw_at(target, 5, 10)
 
-	//anomaly quickly contracts then slowly expands it's ring
+	//anomaly quickly contracts then slowly expands its ring
 	animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5))
 	animate(time = seconds_per_tick*7, transform = matrix())
 
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index f3fbf0b817caa..f423f3644f0c8 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -331,6 +331,9 @@
 /obj/effect/decal/cleanable/wrapping/pinata/syndie
 	icon_state = "syndie_pinata_shreds"
 
+/obj/effect/decal/cleanable/wrapping/pinata/donk
+	icon_state = "donk_pinata_shreds"
+
 /obj/effect/decal/cleanable/garbage
 	name = "decomposing garbage"
 	desc = "A split open garbage bag, its stinking content seems to be partially liquified. Yuck!"
diff --git a/code/game/objects/effects/phased_mob.dm b/code/game/objects/effects/phased_mob.dm
index dcd4e39189c87..b1df969b45c92 100644
--- a/code/game/objects/effects/phased_mob.dm
+++ b/code/game/objects/effects/phased_mob.dm
@@ -84,11 +84,15 @@
 		return
 	var/area/destination_area = newloc.loc
 	movedelay = world.time + movespeed
+
+	if(SEND_SIGNAL(src, COMSIG_MOB_PHASED_CHECK, user, newloc) & COMPONENT_BLOCK_PHASED_MOVE)
+		return null
+
 	if(newloc.turf_flags & NOJAUNT)
 		to_chat(user, span_warning("Some strange aura is blocking the way."))
 		return
 	if(destination_area.area_flags & NOTELEPORT || SSmapping.level_trait(newloc.z, ZTRAIT_NOPHASE))
-		to_chat(user, span_danger("Some dull, universal force is blocking the way. It's overwhelmingly oppressive force feels dangerous."))
+		to_chat(user, span_danger("Some dull, universal force is blocking the way. Its overwhelmingly oppressive force feels dangerous."))
 		return
 	if (direction == UP || direction == DOWN)
 		newloc = can_z_move(direction, get_turf(src), newloc, ZMOVE_INCAPACITATED_CHECKS | ZMOVE_FEEDBACK | ZMOVE_ALLOW_ANCHORED, user)
diff --git a/code/game/objects/effects/spawners/random/maintenance.dm b/code/game/objects/effects/spawners/random/maintenance.dm
index 997c3bb1f0cdb..e5bebdef672f1 100644
--- a/code/game/objects/effects/spawners/random/maintenance.dm
+++ b/code/game/objects/effects/spawners/random/maintenance.dm
@@ -9,6 +9,11 @@
 /// decals such as ashes will cause NeverShouldHaveComeHere() to fail on such turfs, which creates annoying rng based CI failures
 /obj/effect/spawner/random/maintenance/no_decals
 
+/obj/effect/spawner/random/maintenance/no_decals/can_spawn(loot)
+	if(ispath(loot, /obj/effect/decal))
+		return FALSE
+	return ..()
+
 /obj/effect/spawner/random/maintenance/examine(mob/user)
 	. = ..()
 	. += span_info("This spawner has an effective loot count of [get_effective_lootcount()].")
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index f18da132af0b6..12adcf15c22f7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -79,6 +79,8 @@
 	var/pickup_sound
 	///Sound uses when dropping the item, or when its thrown.
 	var/drop_sound
+	///Do the drop and pickup sounds vary?
+	var/sound_vary = FALSE
 	///Whether or not we use stealthy audio levels for this item's attack sounds
 	var/stealthy_audio = FALSE
 	///Sound which is produced when blocking an attack
@@ -677,7 +679,7 @@
 	item_flags &= ~IN_INVENTORY
 	SEND_SIGNAL(src, COMSIG_ITEM_DROPPED, user)
 	if(!silent)
-		playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE)
+		playsound(src, drop_sound, DROP_SOUND_VOLUME, vary = sound_vary, ignore_walls = FALSE)
 	user?.update_equipment_speed_mods()
 
 /// called just as an item is picked up (loc is not yet changed)
@@ -1266,7 +1268,7 @@
 	if((item_flags & ABSTRACT) || HAS_TRAIT(src, TRAIT_NODROP))
 		return
 	user.dropItemToGround(src, silent = TRUE)
-	if(throwforce && HAS_TRAIT(user, TRAIT_PACIFISM))
+	if(throwforce && (HAS_TRAIT(user, TRAIT_PACIFISM)) || HAS_TRAIT(user, TRAIT_NO_THROWING))
 		to_chat(user, span_notice("You set [src] down gently on the ground."))
 		return
 	return src
@@ -1729,7 +1731,7 @@
 				return FALSE
 			return TRUE
 	return FALSE
-	
+
 /// Fetches embedding data
 /obj/item/proc/get_embed()
 	RETURN_TYPE(/datum/embed_data)
diff --git a/code/game/objects/items/busts_and_figurines.dm b/code/game/objects/items/busts_and_figurines.dm
index afc4a58334e90..53af3228ffd36 100644
--- a/code/game/objects/items/busts_and_figurines.dm
+++ b/code/game/objects/items/busts_and_figurines.dm
@@ -50,16 +50,12 @@
 	..()
 	if(!(slot & ITEM_SLOT_HANDS))
 		return
-	var/datum/atom_hud/our_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
-	our_hud.show_to(user)
 	ADD_TRAIT(user, TRAIT_MEDICAL_HUD, type)
 
 /obj/item/statuebust/hippocratic/dropped(mob/living/carbon/human/user)
 	..()
 	if(HAS_TRAIT_NOT_FROM(user, TRAIT_MEDICAL_HUD, type))
 		return
-	var/datum/atom_hud/our_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
-	our_hud.hide_from(user)
 	REMOVE_TRAIT(user, TRAIT_MEDICAL_HUD, type)
 
 /obj/item/statuebust/hippocratic/attack_self(mob/user)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 5dc826e8fd51e..41731cdf31d8f 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -835,6 +835,11 @@
 /obj/item/card/id/proc/get_trim_sechud_icon_state()
 	return trim?.sechud_icon_state || SECHUD_UNKNOWN
 
+/obj/item/card/id/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+	if(iscash(interacting_with))
+		return insert_money(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+	return NONE
+
 /obj/item/card/id/away
 	name = "\proper a perfectly generic identification card"
 	desc = "A perfectly generic identification card. Looks like it could use some flavor."
@@ -1437,7 +1442,7 @@
 		theft_target = WEAKREF(interacting_with)
 		ui_interact(user)
 		return ITEM_INTERACT_SUCCESS
-	return NONE
+	return ..()
 
 /obj/item/card/id/advanced/chameleon/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
 	// If we're attacking a human, we want it to be covert. We're not ATTACKING them, we're trying
diff --git a/code/game/objects/items/choice_beacon.dm b/code/game/objects/items/choice_beacon.dm
index 75a3f35c80b97..4a6de50990294 100644
--- a/code/game/objects/items/choice_beacon.dm
+++ b/code/game/objects/items/choice_beacon.dm
@@ -64,7 +64,7 @@
 /obj/item/choice_beacon/proc/spawn_option(obj/choice_path, mob/living/user)
 	podspawn(list(
 		"target" = get_turf(src),
-		"style" = STYLE_BLUESPACE,
+		"path" = /obj/structure/closet/supplypod/teleporter, // BANDASTATION EDIT - Original: "style" = /datum/pod_style/advanced,
 		"spawn" = choice_path,
 	))
 
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index f4168b7b37747..64f4ee35f6076 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -329,7 +329,7 @@
 
 /obj/item/circuitboard/machine/scanner_gate
 	name = "Scanner Gate"
-	greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+	greyscale_colors = CIRCUIT_COLOR_SECURITY
 	build_path = /obj/machinery/scanner_gate
 	req_components = list(
 		/datum/stock_part/scanning_module = 3)
@@ -572,6 +572,11 @@
 		return
 	. += span_info("[src] is set to [fridges_name_paths[build_path]]. You can use a screwdriver to reconfigure it.")
 
+/obj/item/circuitboard/machine/dehydrator
+	name = "Dehydrator"
+	build_path = /obj/machinery/smartfridge/drying
+	req_components = list(/datum/stock_part/matter_bin = 1)
+	needs_anchored = FALSE
 
 /obj/item/circuitboard/machine/space_heater
 	name = "Space Heater"
@@ -703,6 +708,13 @@
 		/obj/item/stack/sheet/glass = 1,
 		/obj/item/vending_refill/donksoft = 1)
 
+/obj/item/circuitboard/machine/vending/donksnackvendor
+	name = "Donk Co Snack Vendor"
+	build_path = /obj/machinery/vending/donksnack
+	req_components = list(
+		/obj/item/stack/sheet/glass = 1,
+		/obj/item/vending_refill/donksnackvendor = 1)
+
 /obj/item/circuitboard/machine/bountypad
 	name = "Civilian Bounty Pad"
 	greyscale_colors = CIRCUIT_COLOR_GENERIC
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 3d817d24ccf2b..32a81d1f75f9c 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -89,6 +89,13 @@
 	worn_icon_state = "soapsyndie"
 	cleanspeed = 0.5 SECONDS //faster than mops so it's useful for traitors who want to clean crime scenes
 
+/obj/item/soap/drone
+	name = "\improper integrated soap module"
+	inhand_icon_state = "soapnt"
+	worn_icon_state = "soapnt"
+	cleanspeed = 0.5 SECONDS //can be changed if someone isn't happy
+	uses = INFINITY
+
 /obj/item/soap/omega
 	name = "\improper Omega soap"
 	desc = "The most advanced soap known to mankind. The beginning of the end for germs."
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 9bc86d0c7f96b..a879571e2b0aa 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -189,7 +189,7 @@
 	)
 	/// List of selectable large options
 	var/static/list/graffiti_large_h = list(
-		"furrypride" = CRAYON_COST_LARGE,
+		//"furrypride" = CRAYON_COST_LARGE, // BANDASTATION REMOVAL
 		"paint" = CRAYON_COST_LARGE,
 		"secborg" = CRAYON_COST_LARGE,
 		"yiffhell" = CRAYON_COST_LARGE,
@@ -860,7 +860,7 @@
 		if(carbon_target.client)
 			carbon_target.set_eye_blur_if_lower(6 SECONDS)
 			carbon_target.adjust_temp_blindness(2 SECONDS)
-		if(carbon_target.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks.
+		if(carbon_target.get_eye_protection() <= 0 || carbon_target.is_eyes_covered()) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks. added redundancy because gas masks don't give you eye protection
 			carbon_target.adjust_jitter(1 SECONDS)
 			carbon_target.adjust_eye_blur(0.5 SECONDS)
 			flash_color(carbon_target, flash_color=paint_color, flash_time=40)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index dc68175cafc63..02934d1a03eaa 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -147,7 +147,6 @@
 	if(!cell || !cell_removable)
 		return FALSE
 
-	cell.update_appearance()
 	cell.forceMove(get_turf(src))
 	balloon_alert(user, "removed [cell]")
 	cell = null
@@ -252,7 +251,7 @@
 	update_power()
 
 /obj/item/defibrillator/proc/cooldowncheck()
-		addtimer(CALLBACK(src, PROC_REF(finish_charging)), cooldown_duration)
+	addtimer(CALLBACK(src, PROC_REF(finish_charging)), cooldown_duration)
 
 /obj/item/defibrillator/proc/finish_charging()
 	if(cell)
diff --git a/code/game/objects/items/devices/battle_royale.dm b/code/game/objects/items/devices/battle_royale.dm
index ab871520465a5..70ae0a8f85b2d 100644
--- a/code/game/objects/items/devices/battle_royale.dm
+++ b/code/game/objects/items/devices/battle_royale.dm
@@ -295,7 +295,7 @@ GLOBAL_DATUM_INIT(battle_royale_master, /datum/battle_royale_master, new)
 	if (!isnull(winner))
 		podspawn(list(
 			"target" = get_turf(winner),
-			"style" = STYLE_SYNDICATE,
+			"style" = /datum/pod_style/syndicate,
 			"spawn" = /obj/item/food/roast_dinner,
 		))
 
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index e684c1b4959e5..968a2f11f4d4c 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -959,14 +959,10 @@
 	var/dark_light_range = 2.5
 	///Variable to preserve old lighting behavior in flashlights, to handle darkness.
 	var/dark_light_power = -3
-	var/on = FALSE
 
 /obj/item/flashlight/flashdark/update_brightness()
 	. = ..()
-	if(on)
-		set_light(dark_light_range, dark_light_power)
-	else
-		set_light(0)
+	set_light(dark_light_range, dark_light_power)
 
 //type and subtypes spawned and used to give some eyes lights,
 /obj/item/flashlight/eyelight
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 07a1db55a9c98..4039b412ebe78 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -133,7 +133,7 @@
 			if(src.uses >= max_uses)
 				break
 
-			//consume the item only if it's an light tube,bulb or shard
+			//consume the item only if it's a light tube, bulb or shard
 			loaded = FALSE
 			if(istype(item_to_check, /obj/item/light))
 				var/obj/item/light/found_light = item_to_check
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 7ae17c5343ad6..718f3ac721979 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -17,26 +17,39 @@
 	user.say("AAAAAAAAAAAARGHHHHH", forced="megaphone suicide")//he must have died while coding this
 	return OXYLOSS
 
-/obj/item/megaphone/equipped(mob/M, slot)
+/obj/item/megaphone/equipped(mob/equipper, slot)
 	. = ..()
-	if ((slot & ITEM_SLOT_HANDS) && !HAS_TRAIT(M, TRAIT_SIGN_LANG))
-		RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-	else
-		UnregisterSignal(M, COMSIG_MOB_SAY)
+	if ((slot & ITEM_SLOT_HANDS))
+		RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+		RegisterSignal(equipper, COMSIG_LIVING_TREAT_MESSAGE, PROC_REF(add_tts_filter))
 
-/obj/item/megaphone/dropped(mob/M)
+/obj/item/megaphone/dropped(mob/dropper)
 	. = ..()
-	UnregisterSignal(M, COMSIG_MOB_SAY)
+	UnregisterSignal(dropper, list(COMSIG_MOB_SAY, COMSIG_LIVING_TREAT_MESSAGE))
+
+/obj/item/megaphone/proc/handle_speech(mob/living/user, list/speech_args)
+	SIGNAL_HANDLER
+	if(HAS_TRAIT(user, TRAIT_SIGN_LANG) || user.get_active_held_item() != src)
+		return
+	if(spamcheck > world.time)
+		to_chat(user, span_warning("\The [src] needs to recharge!"))
+	else
+		playsound(loc, 'sound/items/megaphone.ogg', 100, FALSE, TRUE)
+		speech_args[SPEECH_SPANS] |= voicespan
 
-/obj/item/megaphone/proc/handle_speech(mob/living/carbon/user, list/speech_args)
+/obj/item/megaphone/proc/add_tts_filter(mob/living/carbon/user, list/message_args)
 	SIGNAL_HANDLER
-	if (user.get_active_held_item() == src)
-		if(spamcheck > world.time)
-			to_chat(user, span_warning("\The [src] needs to recharge!"))
-		else
-			playsound(loc, 'sound/items/megaphone.ogg', 100, FALSE, TRUE)
-			spamcheck = world.time + 50
-			speech_args[SPEECH_SPANS] |= voicespan
+	if(HAS_TRAIT(user, TRAIT_SIGN_LANG) || user.get_active_held_item() != src)
+		return
+	if(spamcheck > world.time)
+		return
+	spamcheck = world.time + 5 SECONDS
+	if(obj_flags & EMAGGED)
+		///somewhat compressed and ear-grating, crusty and noisy with a bit of echo.
+		message_args[TREAT_TTS_FILTER_ARG] += "acrusher=samples=9:level_out=7,aecho=delays=100:decays=0.4,aemphasis=type=emi,crystalizer=i=6,acontrast=60,rubberband=pitch=0.9"
+	else
+		///A sharper and louder sound with a bit of echo
+		message_args[TREAT_TTS_FILTER_ARG] += "acrusher=samples=2:level_out=6,aecho=delays=90:decays=0.3,aemphasis=type=cd,acontrast=30,crystalizer=i=5"
 
 /obj/item/megaphone/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 1f2cd37a5ccef..edf24b0d942d4 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -299,7 +299,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 
 /obj/item/radio/headset/headset_cargo/mining
 	name = "mining radio headset"
-	desc = "Headset used by shaft miners."
+	desc = "Headset used by shaft miners. It has a mining network uplink which allows the user to quickly transmit commands to their comrades and amplifies their voice in low-pressure environments."
 	icon_state = "mine_headset"
 	worn_icon_state = "mine_headset"
 	// "puts the antenna down" while the headset is off
@@ -307,6 +307,19 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	overlay_mic_idle = "headset_up"
 	keyslot = /obj/item/encryptionkey/headset_mining
 
+/obj/item/radio/headset/headset_cargo/mining/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/callouts, ITEM_SLOT_EARS, examine_text = span_info("Use ctrl-click to enable or disable callouts."))
+
+/obj/item/radio/headset/headset_cargo/mining/equipped(mob/living/carbon/human/user, slot)
+	. = ..()
+	if(slot & ITEM_SLOT_EARS)
+		ADD_TRAIT(user, TRAIT_SPEECH_BOOSTER, CLOTHING_TRAIT)
+
+/obj/item/radio/headset/headset_cargo/mining/dropped(mob/living/carbon/human/user)
+	. = ..()
+	REMOVE_TRAIT(user, TRAIT_SPEECH_BOOSTER, CLOTHING_TRAIT)
+
 /obj/item/radio/headset/headset_srv
 	name = "service radio headset"
 	desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 912e1d66b0929..121f0bba965b3 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -122,7 +122,6 @@
 
 /obj/item/radio/Destroy()
 	remove_radio_all(src) //Just to be sure
-	QDEL_NULL(wires)
 	if(istype(keyslot))
 		QDEL_NULL(keyslot)
 	return ..()
@@ -352,6 +351,12 @@
 		signal.broadcast()
 		return
 
+
+	if(isliving(talking_movable))
+		var/mob/living/talking_living = talking_movable
+		if(talking_living.client?.prefs.read_preference(/datum/preference/toggle/radio_noise))
+			SEND_SOUND(talking_living, 'sound/misc/radio_talk.ogg')
+
 	// All radios make an attempt to use the subspace system first
 	signal.send_to_receivers()
 
@@ -397,7 +402,6 @@
 			// left hands are odd slots
 			if (idx && (idx % 2) == (message_mods[RADIO_EXTENSION] == MODE_L_HAND))
 				return
-
 	talk_into(speaker, raw_message, , spans, language=message_language, message_mods=filtered_mods)
 
 /// Checks if this radio can receive on the given frequency.
@@ -424,6 +428,18 @@
 	SEND_SIGNAL(src, COMSIG_RADIO_RECEIVE_MESSAGE, data)
 	flick_overlay_view(overlay_speaker_active, 5 SECONDS)
 
+	if(!isliving(loc))
+		return
+
+	var/mob/living/holder = loc
+	if(!holder.client?.prefs.read_preference(/datum/preference/toggle/radio_noise))
+		return
+
+	var/list/spans = data["spans"]
+	SEND_SOUND(holder, 'sound/misc/radio_receive.ogg')
+	if(SPAN_COMMAND in spans)
+		SEND_SOUND(holder, 'sound/misc/radio_important.ogg')
+
 /obj/item/radio/ui_state(mob/user)
 	return GLOB.inventory_state
 
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index c8c76c583e103..bebafbdab83b7 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -320,7 +320,7 @@
 
 		// Hulk and body temperature
 		var/datum/species/targetspecies = humantarget.dna.species
-		var/mutant = humantarget.dna.check_mutation(/datum/mutation/human/hulk)
+		var/mutant = HAS_TRAIT(humantarget, TRAIT_HULK)
 
 		render_list += "<span class='info ml-1'>Species: [targetspecies.name][mutant ? "-derived mutant" : ""]</span>\n"
 		var/core_temperature_message = "Core temperature: [round(humantarget.coretemperature-T0C, 0.1)] &deg;C ([round(humantarget.coretemperature*1.8-459.67,0.1)] &deg;F)"
diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm
index 8be7666bf96ae..58c18f87427df 100644
--- a/code/game/objects/items/devices/spyglasses.dm
+++ b/code/game/objects/items/devices/spyglasses.dm
@@ -92,7 +92,7 @@
 	default_raw_text = @{"
 
 Thank you for your purchase of the Nerd Co SpySpeks <small>tm</small>, this paper will be your quick-start guide to violating the privacy of your crewmates in three easy steps!<br><br>Step One: Nerd Co SpySpeks <small>tm</small> upon your face. <br>
-Step Two: Place the included "ProfitProtektor <small>tm</small>" camera assembly in a place of your choosing - make sure to make heavy use of it's inconspicous design!
+Step Two: Place the included "ProfitProtektor <small>tm</small>" camera assembly in a place of your choosing - make sure to make heavy use of its inconspicous design!
 
 Step Three: Press the "Activate Remote View" Button on the side of your SpySpeks <small>tm</small> to open a movable camera display in the corner of your vision, it's just that easy!<br><br><br><center><b>TROUBLESHOOTING</b><br></center>
 My SpySpeks <small>tm</small> Make a shrill beep while attempting to use!
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 8f838c0c0412f..86b99e8c47e4e 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -56,10 +56,9 @@
 /// Triggered on wield of two handed item
 /// Specific hulk checks due to reflection chance for balance issues and switches hitsounds.
 /obj/item/dualsaber/proc/on_wield(obj/item/source, mob/living/carbon/user)
-	if(user?.has_dna())
-		if(user.dna.check_mutation(/datum/mutation/human/hulk))
-			to_chat(user, span_warning("You lack the grace to wield this!"))
-			return COMPONENT_TWOHANDED_BLOCK_WIELD
+	if(user && HAS_TRAIT(user, TRAIT_HULK))
+		to_chat(user, span_warning("You lack the grace to wield this!"))
+		return COMPONENT_TWOHANDED_BLOCK_WIELD
 	update_weight_class(w_class_on)
 	hitsound = 'sound/weapons/blade1.ogg'
 	START_PROCESSING(SSobj, src)
@@ -123,12 +122,11 @@
 	. = ..()
 
 /obj/item/dualsaber/attack(mob/target, mob/living/carbon/human/user)
-	if(user.has_dna())
-		if(user.dna.check_mutation(/datum/mutation/human/hulk))
-			to_chat(user, span_warning("You grip the blade too hard and accidentally drop it!"))
-			if(HAS_TRAIT(src, TRAIT_WIELDED))
-				user.dropItemToGround(src, force=TRUE)
-				return
+	if(HAS_TRAIT(user, TRAIT_HULK))
+		to_chat(user, span_warning("You grip the blade too hard and accidentally drop it!"))
+		if(HAS_TRAIT(src, TRAIT_WIELDED))
+			user.dropItemToGround(src, force=TRUE)
+			return
 	..()
 	if(!HAS_TRAIT(src, TRAIT_WIELDED))
 		return
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index 38e4c840694f5..8a8f26b2c8995 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -77,7 +77,7 @@
 	icon_state = "metalh2_axe0"
 	base_icon_state = "metalh2_axe"
 	name = "metallic hydrogen axe"
-	desc = "A lightweight crowbar with an extreme sharp fire axe head attached. It trades it's hefty as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack."
+	desc = "A lightweight crowbar with an extreme sharp fire axe head attached. It trades its heft as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack."
 	force_unwielded = 5
 	force_wielded = 15
 	demolition_mod = 2
diff --git a/code/game/objects/items/food/bait.dm b/code/game/objects/items/food/bait.dm
index 047a8a7cd58ce..41b50c181f287 100644
--- a/code/game/objects/items/food/bait.dm
+++ b/code/game/objects/items/food/bait.dm
@@ -66,3 +66,9 @@
 /obj/item/food/bait/doughball/synthetic/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_OMNI_BAIT, INNATE_TRAIT)
+
+/obj/item/food/bait/doughball/syntethic/unconsumable
+
+/obj/item/food/bait/doughball/synthetic/unconsumable/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_BAIT_UNCONSUMABLE, INNATE_TRAIT)
diff --git a/code/game/objects/items/food/donkpocket.dm b/code/game/objects/items/food/donkpocket.dm
index d4b4636f15c9b..b21149da8d044 100644
--- a/code/game/objects/items/food/donkpocket.dm
+++ b/code/game/objects/items/food/donkpocket.dm
@@ -259,3 +259,105 @@
 	)
 	tastes = list("meat" = 2, "dough" = 2, "inner peace" = 1)
 	foodtypes = GRAIN
+
+/obj/item/food/donkpocket/deluxe
+	name = "\improper Donk-pocket Deluxe"
+	desc = "Donk Co's latest product. Its recipe is a closely guarded secret."
+	icon_state = "donkpocketdeluxe"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/protein = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		/datum/reagent/medicine/omnizine = 2,
+	)
+	tastes = list("quality meat" = 2, "dough" = 2, "raw fanciness" = 1)
+	foodtypes = GRAIN | MEAT
+	crafting_complexity = FOOD_COMPLEXITY_4
+
+	warm_type = /obj/item/food/donkpocket/warm/deluxe
+	var/static/list/deluxe_added_reagents = list(
+		/datum/reagent/medicine/omnizine = 8,
+	)
+
+/obj/item/food/donkpocket/deluxe/make_bakeable()
+	AddComponent(/datum/component/bakeable, warm_type, rand(baking_time_short, baking_time_long), TRUE, TRUE, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/deluxe/make_microwaveable()
+	AddElement(/datum/element/microwavable, warm_type, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/warm/deluxe
+	name = "warm Donk-pocket Deluxe"
+	desc = "Donk Co's latest product. It's crispy warm and oh-so perfectly toasted. Damn, that's a good looking Donk."
+	icon_state = "donkpocketdeluxe"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/protein = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		/datum/reagent/medicine/omnizine = 10,
+	)
+	tastes = list("quality meat" = 2, "dough" = 2, "fanciness" = 1)
+	foodtypes = GRAIN | MEAT | FRIED
+
+/obj/item/food/donkpocket/deluxe/nocarb
+	name = "/improper Meat-pocket"
+	desc = "The food of choice for the carnivorous traitor."
+	icon_state = "donkpocketdeluxenocarb"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/protein = 3,
+		/datum/reagent/medicine/omnizine = 2,
+	)
+	tastes = list("raw meat" = 2, "more meat" = 2, "no carbs" = 1)
+	foodtypes = MEAT | RAW
+	crafting_complexity = FOOD_COMPLEXITY_4
+
+	warm_type = /obj/item/food/donkpocket/warm/deluxe/nocarb
+
+/obj/item/food/donkpocket/deluxe/meat/make_bakeable()
+	AddComponent(/datum/component/bakeable, warm_type, rand(baking_time_short, baking_time_long), TRUE, TRUE, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/deluxe/meat/make_microwaveable()
+	AddElement(/datum/element/microwavable, warm_type, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/warm/deluxe/nocarb
+	name = "warm Meat-pocket"
+	desc = "The warm food of choice for the carnivorous traitor."
+	icon_state = "donkpocketdeluxenocarb"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/protein = 3,
+		/datum/reagent/medicine/omnizine = 10,
+	)
+	tastes = list("meat" = 2, "more meat" = 2, "no carbs" = 1)
+	foodtypes = MEAT
+
+/obj/item/food/donkpocket/deluxe/vegan
+	name = "/improper Donk-roll"
+	desc = "The classic station snack, now with rice! Certified vegan and cruelty free by the Animal Liberation Front."
+	icon_state = "donkpocketdeluxevegan"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 3,
+		/datum/reagent/medicine/omnizine = 2,
+	)
+	tastes = list("rice patty" = 2, "dough" = 2, "peppery kick" = 1)
+	foodtypes = GRAIN | VEGETABLES
+	crafting_complexity = FOOD_COMPLEXITY_4
+
+/obj/item/food/donkpocket/deluxe/vegan/make_bakeable()
+	AddComponent(/datum/component/bakeable, warm_type, rand(baking_time_short, baking_time_long), TRUE, TRUE, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/deluxe/vegan/make_microwaveable()
+	AddElement(/datum/element/microwavable, warm_type, deluxe_added_reagents)
+
+/obj/item/food/donkpocket/warm/deluxe/vegan
+	name = "warm Donk-roll"
+	desc = "The classic station snack, now with rice! It's been fried to perfection."
+	icon_state = "donkpocketdeluxevegan"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 3,
+		/datum/reagent/medicine/omnizine = 10,
+	)
+	tastes = list("rice patty" = 2, "fried dough" = 2, "peppery kick" = 1)
+	foodtypes = GRAIN | VEGETABLES
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 537c7688d2dd4..c03470ff416b3 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -34,6 +34,7 @@
 	foodtypes = SEAFOOD
 	eatverbs = list("bite", "chew", "gnaw", "swallow", "chomp")
 	w_class = WEIGHT_CLASS_SMALL
+	starting_reagent_purity = 1.0
 
 /obj/item/food/fishmeat/carp
 	name = "carp fillet"
@@ -88,6 +89,7 @@
 	name = "donkfillet"
 	desc = "The dreaded donkfish fillet. No sane spaceman would eat this, and it does not get better when cooked."
 	icon_state = "donkfillet"
+	starting_reagent_purity = 0.3
 
 /obj/item/food/fishmeat/octopus
 	name = "octopus tentacle"
diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index 31ac87c0ff690..26852066bae28 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -16,6 +16,87 @@
 	juice_typepath = /datum/reagent/consumable/watermelonjuice
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/food/watermelonmush
+	name = "watermelon mush"
+	desc = "A plop of watery goodness."
+	icon = 'icons/obj/service/hydroponics/harvest.dmi'
+	icon_state = "watermelonpulp"
+	food_reagents = list(
+		/datum/reagent/water = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 0.1,
+		/datum/reagent/consumable/nutriment = 0.5,
+	)
+	tastes = list("watermelon" = 1)
+	foodtypes = FRUIT
+	food_flags = FOOD_FINGER_FOOD
+	juice_typepath = /datum/reagent/consumable/watermelonjuice
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/holymelonslice
+	name = "holymelon slice"
+	desc = "A slice of holy goodness."
+	icon = 'icons/obj/service/hydroponics/harvest.dmi'
+	icon_state = "holymelonslice"
+	food_reagents = list(
+		/datum/reagent/water/holywater = 0.5,
+		/datum/reagent/consumable/nutriment/vitamin = 0.2,
+		/datum/reagent/consumable/nutriment = 1,
+	)
+	tastes = list("holymelon" = 1)
+	foodtypes = FRUIT
+	food_flags = FOOD_FINGER_FOOD
+	juice_typepath = /datum/reagent/water/holywater
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/holymelonmush
+	name = "holymelon mush"
+	desc = "A plop of holy goodness."
+	icon = 'icons/obj/service/hydroponics/harvest.dmi'
+	icon_state = "holymelonpulp"
+	food_reagents = list(
+		/datum/reagent/water/holywater = 1,
+		/datum/reagent/consumable/nutriment/vitamin = 0.1,
+		/datum/reagent/consumable/nutriment = 0.5,
+	)
+	tastes = list("holymelon" = 1)
+	foodtypes = FRUIT
+	food_flags = FOOD_FINGER_FOOD
+	juice_typepath = /datum/reagent/water/holywater
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/barrelmelonslice
+	name = "barrelmelon slice"
+	desc = "A slice of beery goodness."
+	icon = 'icons/obj/service/hydroponics/harvest.dmi'
+	icon_state = "barrelmelonslice"
+	food_reagents = list(
+		/datum/reagent/consumable/ethanol/beer = 1,
+		/datum/reagent/consumable/nutriment/vitamin = 0.2,
+		/datum/reagent/consumable/nutriment = 1,
+	)
+	tastes = list("beer" = 1)
+	foodtypes = FRUIT
+	food_flags = FOOD_FINGER_FOOD
+	juice_typepath = /datum/reagent/consumable/ethanol/beer
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/barrelmelonmush
+	name = "barrelmelon mush"
+	desc = "A plop of beery goodness."
+	icon = 'icons/obj/service/hydroponics/harvest.dmi'
+	icon_state = "barrelmelonpulp"
+	food_reagents = list(
+		/datum/reagent/consumable/ethanol/beer = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 0.1,
+		/datum/reagent/consumable/nutriment = 0.5,
+	)
+	tastes = list("beer" = 1)
+	foodtypes = FRUIT
+	food_flags = FOOD_FINGER_FOOD
+	juice_typepath = /datum/reagent/consumable/ethanol/beer
+	w_class = WEIGHT_CLASS_SMALL
+
+
 /obj/item/food/appleslice
 	name = "apple slice"
 	desc = "The perfect after-school snack."
diff --git a/code/game/objects/items/granters/crafting/advanced_donk_recipes.dm b/code/game/objects/items/granters/crafting/advanced_donk_recipes.dm
new file mode 100644
index 0000000000000..1ba2502f37eec
--- /dev/null
+++ b/code/game/objects/items/granters/crafting/advanced_donk_recipes.dm
@@ -0,0 +1,21 @@
+
+/obj/item/book/granter/crafting_recipe/donk_secret_recipe
+	name = "Donk Co. Secret Recipe"
+	desc = "Documents detailing how to make several Donk Co. branded prototypes."
+	crafting_recipe_types = list(
+		/datum/crafting_recipe/food/donkpocket/deluxe,
+		/datum/crafting_recipe/food/donkpocket/deluxe/nocarb,
+		/datum/crafting_recipe/food/donkpocket/deluxe/vegan,
+	)
+	icon = 'icons/obj/service/bureaucracy.dmi'
+	icon_state = "docs_part"
+	uses = INFINITY
+	remarks = list(
+		"It's written in code...",
+		"Decyphering...",
+		"Studying...",
+		"Got to get the steps in order...",
+		"The six basic food groups...",
+		"The secret formula!",
+		"Three different variants...",
+	)
diff --git a/code/game/objects/items/granters/magic/knock.dm b/code/game/objects/items/granters/magic/knock.dm
index 11bdfeeadbfa2..0e4aaf9ee6c4d 100644
--- a/code/game/objects/items/granters/magic/knock.dm
+++ b/code/game/objects/items/granters/magic/knock.dm
@@ -9,7 +9,7 @@
 		"Slow down, book. I still haven't finished this page...",
 		"The book won't stop moving!",
 		"I think this is hurting the spine of the book...",
-		"I can't get to the next page, it's stuck t- I'm good, it just turned to the next page on it's own.",
+		"I can't get to the next page, it's stuck t- I'm good, it just turned to the next page on its own.",
 		"Yeah, staff of doors does the same thing. Go figure...",
 	)
 
diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm
index ec16b4c22fe95..bb9d275fb00b8 100644
--- a/code/game/objects/items/grenades/_grenade.dm
+++ b/code/game/objects/items/grenades/_grenade.dm
@@ -17,6 +17,8 @@
 	obj_flags = CONDUCTS_ELECTRICITY
 	slot_flags = ITEM_SLOT_BELT
 	max_integrity = 40
+	pickup_sound = 'sound/items/grenade_pick_up.ogg'
+	drop_sound = 'sound/items/grenade_drop.ogg'
 	/// Bitfields which prevent the grenade from detonating if set. Includes ([GRENADE_DUD]|[GRENADE_USED])
 	var/dud_flags = NONE
 	///Is this grenade currently armed?
@@ -25,7 +27,7 @@
 	var/type_cluster = FALSE
 	///How long it takes for a grenade to explode after being armed
 	var/det_time = 5 SECONDS
-	///Will this state what it's det_time is when examined?
+	///Will this state what its det_time is when examined?
 	var/display_timer = TRUE
 	///Used in botch_check to determine how a user's clumsiness affects that user's ability to prime a grenade correctly.
 	var/clumsy_check = GRENADE_CLUMSY_FUMBLE
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 2c01ad53edee9..cb4f419dbd809 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -35,7 +35,6 @@
 	set_wires(new /datum/wires/explosive/chem_grenade(src))
 
 /obj/item/grenade/chem_grenade/Destroy(force)
-	QDEL_NULL(wires)
 	QDEL_NULL(landminemode)
 	QDEL_LIST(beakers)
 	return ..()
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 49f66b06896b8..c9090912cc7e6 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -51,8 +51,6 @@
 	set_wires(new /datum/wires/explosive/c4(src))
 
 /obj/item/grenade/c4/Destroy()
-	qdel(wires)
-	set_wires(null)
 	target = null
 	return ..()
 
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index 371ecee6ff803..8030eed9883a9 100644
--- a/code/game/objects/items/hand_items.dm
+++ b/code/game/objects/items/hand_items.dm
@@ -143,7 +143,7 @@
 		affix_desc = "on [target.p_their()] sensitive antennae"
 		affix_desc_target = "on your highly sensitive antennae"
 		brutal_noogie = TRUE
-	if(user.dna?.check_mutation(/datum/mutation/human/hulk))
+	if(HAS_TRAIT(user, TRAIT_HULK))
 		prefix_desc = "sickeningly brutal"
 		brutal_noogie = TRUE
 
@@ -178,7 +178,7 @@
 	var/damage = rand(1, 5)
 	if(HAS_TRAIT(target, TRAIT_ANTENNAE))
 		damage += rand(3,7)
-	if(user.dna?.check_mutation(/datum/mutation/human/hulk))
+	if(HAS_TRAIT(user, TRAIT_HULK))
 		damage += rand(3,7)
 
 	if(damage >= 5)
@@ -544,6 +544,10 @@
 	damage = 0 // love can't actually hurt you
 	armour_penetration = 100 // but if it could, it would cut through even the thickest plate
 
+/obj/projectile/kiss/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile)
+
 /obj/projectile/kiss/fire(angle, atom/direct_target)
 	if(firer)
 		name = "[name] blown by [firer]"
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index c5a68260abade..dfcd6031d8729 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -48,6 +48,8 @@
 	breakouttime = 1 MINUTES
 	armor_type = /datum/armor/restraints_handcuffs
 	custom_price = PAYCHECK_COMMAND * 0.35
+	pickup_sound = 'sound/items/handcuffs_pick_up.ogg'
+	drop_sound = 'sound/items/handcuffs_drop.ogg'
 
 	///How long it takes to handcuff someone
 	var/handcuff_time = 4 SECONDS
@@ -55,6 +57,8 @@
 	var/handcuff_time_mod = 1
 	///Sound that plays when starting to put handcuffs on someone
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
+	///Sound that plays when restrain is successful
+	var/cuffsuccesssound = 'sound/items/handcuff_finish.ogg'
 	///If set, handcuffs will be destroyed on application and leave behind whatever this is set to.
 	var/trashtype = null
 	/// How strong the cuffs are. Weak cuffs can be broken with wirecutters or boxcutters.
@@ -120,6 +124,7 @@
 		return
 
 	apply_cuffs(victim, user, dispense = iscyborg(user))
+	playsound(loc, cuffsuccesssound, 30, TRUE, -2)
 
 	victim.visible_message(
 		span_notice("[user] handcuffs [victim]."),
diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index 926131151e92b..049ea8928feff 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -38,10 +38,11 @@
 /obj/item/holosign_creator/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!check_allowed_items(interacting_with, not_inside = TRUE))
 		return NONE
+
 	var/turf/target_turf = get_turf(interacting_with)
 	var/obj/structure/holosign/target_holosign = locate(holosign_type) in target_turf
+
 	if(target_holosign)
-		qdel(target_holosign)
 		return ITEM_INTERACT_BLOCKING
 	if(target_turf.is_blocked_turf(TRUE)) //can't put holograms on a tile that has dense stuff
 		return ITEM_INTERACT_BLOCKING
@@ -51,7 +52,9 @@
 	if(LAZYLEN(signs) >= max_signs)
 		balloon_alert(user, "max capacity!")
 		return ITEM_INTERACT_BLOCKING
+
 	playsound(src, 'sound/machines/click.ogg', 20, TRUE)
+
 	if(creation_time)
 		holocreator_busy = TRUE
 		if(!do_after(user, creation_time, target = interacting_with))
@@ -62,6 +65,7 @@
 			return ITEM_INTERACT_BLOCKING
 		if(target_turf.is_blocked_turf(TRUE)) //don't try to sneak dense stuff on our tile during the wait.
 			return ITEM_INTERACT_BLOCKING
+
 	target_holosign = create_holosign(interacting_with, user)
 	return ITEM_INTERACT_SUCCESS
 
@@ -105,15 +109,15 @@
 
 /obj/item/holosign_creator/security
 	name = "security holobarrier projector"
-	desc = "A holographic projector that creates holographic security barriers."
+	desc = "A holographic projector that creates holographic security barriers. You can remotely open barriers with it."
 	icon_state = "signmaker_sec"
 	holosign_type = /obj/structure/holosign/barrier
-	creation_time = 3 SECONDS
+	creation_time = 2 SECONDS
 	max_signs = 6
 
 /obj/item/holosign_creator/engineering
 	name = "engineering holobarrier projector"
-	desc = "A holographic projector that creates holographic engineering barriers."
+	desc = "A holographic projector that creates holographic engineering barriers. You can remotely open barriers with it."
 	icon_state = "signmaker_engi"
 	holosign_type = /obj/structure/holosign/barrier/engineering
 	creation_time = 1 SECONDS
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index 687b8db014e04..b8f55b0085529 100644
--- a/code/game/objects/items/implants/implant_explosive.dm
+++ b/code/game/objects/items/implants/implant_explosive.dm
@@ -109,7 +109,7 @@
 /**
  * Merges two explosive implants together, adding the stats of the latter to the former before qdeling the latter implant.
  * kept_implant = the implant that is kept
- * stat_implant = the implant which has it's stats added to kept_implant, before being deleted.
+ * stat_implant = the implant which has its stats added to kept_implant, before being deleted.
  */
 /obj/item/implant/explosive/proc/merge_implants(obj/item/implant/explosive/kept_implant, obj/item/implant/explosive/stat_implant)
 	kept_implant.explosion_devastate += stat_implant.explosion_devastate
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index b73917bfba8b6..4aff1f03388ab 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -8,7 +8,7 @@
  */
 /obj/item/inspector
 	name = "\improper N-spect scanner"
-	desc = "Central Command standard issue inspection device. Can perform either wide area scans that central command can use to verify the security of the station, or detailed scans to determine if an item is contraband."
+	desc = "Central Command standard issue inspection device. Can perform either wide area scans that central command can use to verify the security of the station, or detailed scan. Can scan people for contraband on their person or items being contraband."
 	icon = 'icons/obj/devices/scanner.dmi'
 	icon_state = "inspector"
 	worn_icon_state = "salestagger"
@@ -20,6 +20,7 @@
 	interaction_flags_click = NEED_DEXTERITY
 	throw_range = 1
 	throw_speed = 1
+	COOLDOWN_DECLARE(scanning_person) //Cooldown for scanning a carbon
 	///How long it takes to print on time each mode, ordered NORMAL, FAST, HONK
 	var/list/time_list = list(5 SECONDS, 1 SECONDS, 0.1 SECONDS)
 	///Which print time mode we're on.
@@ -91,7 +92,7 @@
 	if(!cell_cover_open)
 		. += "Its cell cover is closed. It looks like it could be <strong>pried</strong> out, but doing so would require an appropriate tool."
 		return
-	. += "It's cell cover is open, exposing the cell slot. It looks like it could be <strong>pried</strong> in, but doing so would require an appropriate tool."
+	. += "Its cell cover is open, exposing the cell slot. It looks like it could be <strong>pried</strong> in, but doing so would require an appropriate tool."
 	if(!cell)
 		. += "The slot for a cell is empty."
 	else
@@ -106,18 +107,28 @@
 	if(!cell || !cell.use(INSPECTOR_ENERGY_USAGE_LOW))
 		balloon_alert(user, "check cell!")
 		return ITEM_INTERACT_BLOCKING
-	if(!isitem(interacting_with))
-		return ITEM_INTERACT_BLOCKING
-	var/obj/item/contraband_item = interacting_with
-	var/contraband_status = contraband_item.is_contraband()
-	if((!contraband_status && scans_correctly) || (contraband_status && !scans_correctly))
+
+	if(iscarbon(interacting_with)) //Prevents insta scanning people
+		if(!COOLDOWN_FINISHED(src, scanning_person))
+			return ITEM_INTERACT_BLOCKING
+
+		visible_message(span_warning("[user] starts scanning [interacting_with] with [src]"))
+		to_chat(interacting_with, span_userdanger("[user] is trying to scan you for contraband!"))
+		balloon_alert_to_viewers("scanning...")
+		playsound(src, 'sound/effects/genetics.ogg', 40, FALSE)
+		COOLDOWN_START(src, scanning_person, 4 SECONDS)
+		if(!do_after(user, 4 SECONDS, interacting_with))
+			return ITEM_INTERACT_BLOCKING
+
+	if(contraband_scan(interacting_with, user))
+		playsound(src, 'sound/machines/uplinkerror.ogg', 40)
+		balloon_alert(user, "contraband detected!")
+		return ITEM_INTERACT_SUCCESS
+	else
 		playsound(src, 'sound/machines/ping.ogg', 20)
 		balloon_alert(user, "clear")
 		return ITEM_INTERACT_SUCCESS
 
-	playsound(src, 'sound/machines/uplinkerror.ogg', 40)
-	balloon_alert(user, "contraband detected!")
-	return ITEM_INTERACT_SUCCESS
 
 /obj/item/inspector/add_context(atom/source, list/context, obj/item/held_item, mob/user)
 	var/update_context = FALSE
@@ -145,6 +156,29 @@
 		return CONTEXTUAL_SCREENTIP_SET
 	return NONE
 
+/**
+ * Scans the carbon or item for contraband.
+ *
+ * Arguments:
+ * - scanned - what or who is scanned?
+ * - user - who is performing the scanning?
+ */
+/obj/item/inspector/proc/contraband_scan(scanned, user)
+	if(iscarbon(scanned))
+		var/mob/living/carbon/scanned_carbon = scanned
+		for(var/obj/item/content in scanned_carbon.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+			var/contraband_content = content.is_contraband()
+			if((contraband_content && scans_correctly) || (!contraband_content && !scans_correctly))
+				return TRUE
+
+	if(isitem(scanned))
+		var/obj/item/contraband_item = scanned
+		var/contraband_status = contraband_item.is_contraband()
+		if((contraband_status && scans_correctly) || (!contraband_status && !scans_correctly))
+			return TRUE
+
+	return FALSE
+
 /**
  * Create our report
  *
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index 1a16b08eb866b..4e6795c182b24 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -166,6 +166,19 @@
 	force = 15
 	throwforce = 15
 
+/obj/item/knife/combat/root
+	name = "cahn'root dagger"
+	icon = 'icons/obj/weapons/stabby.dmi'
+	icon_state = "rootdagger"
+	worn_icon_state = "root_dagger"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	inhand_icon_state = "rootshiv"
+	embed_type = /datum/embed_data/combat_knife/weak
+	desc = "A root dagger, deceptively sharp. Perfect to hide and stab someone with, or make a couple and throw them at enemies."
+	force = 15
+	throwforce = 15
+
 /obj/item/knife/combat/bone
 	name = "bone dagger"
 	inhand_icon_state = "bone_dagger"
@@ -279,3 +292,18 @@
 /obj/item/knife/shiv/carrot/suicide_act(mob/living/carbon/user)
 	user.visible_message(span_suicide("[user] forcefully drives \the [src] into [user.p_their()] eye! It looks like [user.p_theyre()] trying to commit suicide!"))
 	return BRUTELOSS
+
+/obj/item/knife/shiv/parsnip
+	name = "parsnip shiv"
+	icon_state = "parsnipshiv"
+	inhand_icon_state = "parsnipshiv"
+	desc = "Truly putting 'snip' in the 'parsnip', and it's not sub-par either!"
+	custom_materials = null
+
+/obj/item/knife/shiv/root
+	name = "cahn'root shiv"
+	icon_state = "rootshiv"
+	inhand_icon_state = "rootshiv"
+	desc = "A root sharpened into a shiv. A root source of someone's stab wounds soon, most likely."
+	custom_materials = null
+
diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm
index 3a2cbf0637afd..e50a93e0a5a52 100644
--- a/code/game/objects/items/mail.dm
+++ b/code/game/objects/items/mail.dm
@@ -1,6 +1,6 @@
 /// Mail is tamper-evident and unresealable, postmarked by CentCom for an individual recepient.
 /obj/item/mail
-	name = "mail"
+	name = "письмо"
 	gender = NEUTER
 	desc = "An officially postmarked, tamper-evident parcel regulated by CentCom and made of high-quality materials."
 	icon = 'icons/obj/service/bureaucracy.dmi'
@@ -45,7 +45,7 @@
 	var/static/list/department_colors
 
 /obj/item/mail/envelope
-	name = "envelope"
+	name = "конверт"
 	icon_state = "mail_large"
 	goodie_count = 2
 	stamp_max = 2
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 698d72b2b9c55..f1a0688796342 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -318,6 +318,8 @@
 	bare_wound_bonus = 5
 	clumsy_knockdown_time = 15 SECONDS
 	active = FALSE
+	pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
+	drop_sound = 'sound/items/stun_baton_drop.ogg'
 
 	/// The sound effecte played when our baton is extended.
 	var/on_sound = 'sound/weapons/batonextend.ogg'
@@ -436,6 +438,8 @@
 	light_on = FALSE
 	light_color = LIGHT_COLOR_ORANGE
 	light_power = 0.5
+	pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
+	drop_sound = 'sound/items/stun_baton_drop.ogg'
 
 
 	var/throw_stun_chance = 35
@@ -504,7 +508,6 @@
 /obj/item/melee/baton/security/Exited(atom/movable/mov_content)
 	. = ..()
 	if(mov_content == cell)
-		cell.update_appearance()
 		cell = null
 		active = FALSE
 		update_appearance()
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 80b1e66b2e3e9..855484c3066d4 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -164,6 +164,47 @@
 		user.death(FALSE)
 	REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT)
 
+
+/obj/item/melee/parsnip_sabre
+	name = "parsnip sabre"
+	desc = "A weird, yet elegant weapon. Suprisingly sharp for something made from a parsnip."
+	icon = 'icons/obj/weapons/sword.dmi'
+	icon_state = "parsnip_sabre"
+	inhand_icon_state = "parsnip_sabre"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	force = 15
+	throwforce = 10
+	demolition_mod = 0.3
+	w_class = WEIGHT_CLASS_BULKY
+	block_chance = 40
+	armour_penetration = 40
+	sharpness = SHARP_EDGED
+	attack_verb_continuous = list("slashes", "cuts")
+	attack_verb_simple = list("slash", "cut")
+	block_sound = 'sound/weapons/parry.ogg'
+	hitsound = 'sound/weapons/rapierhit.ogg'
+	custom_materials = null
+	wound_bonus = 5
+	bare_wound_bonus = 15
+
+/obj/item/melee/sabre/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/jousting)
+
+/obj/item/melee/parsnip_sabre/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
+	if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK)
+		final_block_chance = 0 //Don't bring a sword to a gunfight, and also you aren't going to really block someone full body tackling you with a sword
+	return ..()
+
+/obj/item/melee/parsnip_sabre/on_exit_storage(datum/storage/container)
+	. = ..()
+	playsound(container.parent, 'sound/items/unsheath.ogg', 25, TRUE)
+
+/obj/item/melee/parsnip_sabre/on_enter_storage(datum/storage/container)
+	. = ..()
+	playsound(container.parent, 'sound/items/sheath.ogg', 25, TRUE)
+
 /obj/item/melee/beesword
 	name = "The Stinger"
 	desc = "Taken from a giant bee and folded over one thousand times in pure honey. Can sting through anything."
diff --git a/code/game/objects/items/nitrium_crystals.dm b/code/game/objects/items/nitrium_crystals.dm
deleted file mode 100644
index 828f437ade2fd..0000000000000
--- a/code/game/objects/items/nitrium_crystals.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/obj/item/nitrium_crystal
-	desc = "A weird brown crystal, it smokes when broken"
-	name = "nitrium crystal"
-	icon = 'icons/obj/pipes_n_cables/atmos.dmi'
-	icon_state = "nitrium_crystal"
-	var/cloud_size = 1
-
-/obj/item/nitrium_crystal/attack_self(mob/user)
-	. = ..()
-	var/datum/effect_system/fluid_spread/smoke/chem/smoke = new
-	var/turf/location = get_turf(src)
-	create_reagents(5)
-	reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3)
-	reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2)
-	smoke.attach(location)
-	smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE)
-	smoke.start()
-	qdel(src)
diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm
index f699dd34b3bfa..b924983a4272f 100644
--- a/code/game/objects/items/pillow.dm
+++ b/code/game/objects/items/pillow.dm
@@ -131,7 +131,7 @@
 		icon_state = "pillow_[variation]_t"
 		inhand_icon_state = "pillow_t"
 
-/// Puts a brick inside the pillow, increasing it's damage
+/// Puts a brick inside the pillow, increasing its damage
 /obj/item/pillow/proc/become_bricked()
 	bricked = TRUE
 	var/datum/component/two_handed/two_handed = GetComponent(/datum/component/two_handed)
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 35e4c7ff72e9f..93fd6cb947a5d 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -793,3 +793,10 @@
 	inhand_icon_state = "blahaj"
 	attack_verb_continuous = list("gnaws", "gnashes", "chews")
 	attack_verb_simple = list("gnaw", "gnash", "chew")
+
+/obj/item/toy/plush/donkpocket
+	name = "donk pocket plushie"
+	desc = "The stuffed companion of choice for the seasoned traitor."
+	icon_state = "donkpocket"
+	attack_verb_continuous = list("donks")
+	attack_verb_simple = list("donk")
diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm
index 7e7076e842c64..335e7b3d5fbd7 100644
--- a/code/game/objects/items/puzzle_pieces.dm
+++ b/code/game/objects/items/puzzle_pieces.dm
@@ -169,7 +169,7 @@
 	trigger_item = TRUE
 	specific_item = /obj/structure/holobox
 	removable_signaller = FALSE //Being a pressure plate subtype, this can also use signals.
-	roundstart_signaller_freq = FREQ_HOLOGRID_SOLUTION //Frequency is kept on it's own default channel however.
+	roundstart_signaller_freq = FREQ_HOLOGRID_SOLUTION //Frequency is kept on its own default channel however.
 	active = TRUE
 	trigger_delay = 10
 	protected = TRUE
diff --git a/code/game/objects/items/rcd/RSF.dm b/code/game/objects/items/rcd/RSF.dm
index ef0be22acc476..ee85994143a00 100644
--- a/code/game/objects/items/rcd/RSF.dm
+++ b/code/game/objects/items/rcd/RSF.dm
@@ -30,7 +30,7 @@ RSF
 	///The cost of the object we are going to dispense
 	var/dispense_cost = 0
 	w_class = WEIGHT_CLASS_NORMAL
-	///An associated list of atoms and charge costs. This can contain a separate list, as long as it's associated item is an object
+	///An associated list of atoms and charge costs. This can contain a separate list, as long as its associated item is an object
 	///The RSF item list below shows in the player facing ui in this order, this is why it isn't in alphabetical order, but instead sorted by category
 	var/list/cost_by_item = list(
 		/obj/item/reagent_containers/cup/glass/drinkingglass = 20,
@@ -47,7 +47,7 @@ RSF
 		/obj/item/pen = 50,
 		/obj/item/cigarette = 10,
 	)
-	///An associated list of fuel and it's value
+	///An associated list of fuel and its value
 	var/list/matter_by_item = list(/obj/item/rcd_ammo = 10,)
 	///A list of surfaces that we are allowed to place things on.
 	var/list/allowed_surfaces = list(/turf/open/floor, /obj/structure/table)
diff --git a/code/game/objects/items/robot/items/storage.dm b/code/game/objects/items/robot/items/storage.dm
index 2d91128adb68d..3e030a9bd8f23 100644
--- a/code/game/objects/items/robot/items/storage.dm
+++ b/code/game/objects/items/robot/items/storage.dm
@@ -41,6 +41,11 @@
 	stored.forceMove(get_turf(usr))
 	return
 
+/obj/item/borg/apparatus/get_proxy_attacker_for(atom/target, mob/user)
+	if(stored) // Use the stored item if available
+		return stored
+	return ..()
+
 /**
 * Attack_self will pass for the stored item.
 */
@@ -57,10 +62,6 @@
 	return CLICK_ACTION_SUCCESS
 
 /obj/item/borg/apparatus/pre_attack(atom/atom, mob/living/user, params)
-	if(stored)
-		stored.melee_attack_chain(user, atom, params)
-		return TRUE
-
 	if(istype(atom.loc, /mob/living/silicon/robot) || istype(atom.loc, /obj/item/robot_model) || HAS_TRAIT(atom, TRAIT_NODROP))
 		return ..() // Borgs should not be grabbing their own modules
 
@@ -132,7 +133,6 @@
 		else
 			. += "Nothing."
 
-		. += span_notice(" <i>Right-clicking</i> will splash the beaker on the ground.")
 	. += span_notice(" <i>Alt-click</i> will drop the currently stored beaker. ")
 
 /obj/item/borg/apparatus/beaker/update_overlays()
@@ -151,15 +151,6 @@
 		arm.pixel_y = arm.pixel_y - 5
 	. += arm
 
-/// Secondary attack spills the content of the beaker.
-/obj/item/borg/apparatus/beaker/pre_attack_secondary(atom/target, mob/living/silicon/robot/user)
-	var/obj/item/reagent_containers/stored_beaker = stored
-	if(!stored_beaker)
-		return ..()
-	stored_beaker.SplashReagents(drop_location(user))
-	loc.visible_message(span_notice("[user] spills the contents of [stored_beaker] all over the ground."))
-	return ..()
-
 /obj/item/borg/apparatus/beaker/extra
 	name = "secondary beaker storage apparatus"
 	desc = "A supplementary beaker storage apparatus."
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 25c83d1b9635a..7e954fbcec5cd 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -30,7 +30,7 @@
 
 	/// If the cyborg starts movement free and not under lockdown
 	var/locomotion = TRUE
-	/// If the cyborg synchronizes it's laws with it's master AI
+	/// If the cyborg synchronizes its laws with its master AI
 	var/lawsync = TRUE
 	/// If the cyborg starts with a master AI
 	var/aisync = TRUE
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 9a3e45fac4213..e45648b0ef7b2 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -2,10 +2,10 @@
 // Contains various borg upgrades.
 
 /obj/item/borg/upgrade
-	name = "borg upgrade module."
+	name = "borg upgrade module"
 	desc = "Protected by FRM."
-	icon = 'icons/obj/devices/circuitry_n_data.dmi'
-	icon_state = "cyborg_upgrade"
+	icon = 'icons/mob/silicon/robot_items.dmi'
+	icon_state = "module_general"
 	w_class = WEIGHT_CLASS_SMALL
 	var/locked = FALSE
 	var/installed = FALSE
@@ -73,6 +73,7 @@
 /obj/item/borg/upgrade/rename
 	name = "cyborg reclassification board"
 	desc = "Used to rename a cyborg."
+	icon = 'icons/obj/devices/circuitry_n_data.dmi'
 	icon_state = "cyborg_upgrade1"
 	var/heldname = ""
 	one_use = TRUE
@@ -99,7 +100,7 @@
 /obj/item/borg/upgrade/disablercooler
 	name = "cyborg rapid disabler cooling module"
 	desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_security"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/security)
 	model_flags = BORG_MODEL_SECURITY
@@ -134,7 +135,7 @@
 /obj/item/borg/upgrade/thrusters
 	name = "ion thruster upgrade"
 	desc = "An energy-operated thruster system for cyborgs."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_general"
 
 /obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/borg, mob/living/user = usr)
 	. = ..()
@@ -156,7 +157,7 @@
 /obj/item/borg/upgrade/diamond_drill
 	name = "mining cyborg diamond drill"
 	desc = "A diamond drill replacement for the mining model's standard drill."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_miner"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/miner)
 	model_flags = BORG_MODEL_MINER
@@ -167,7 +168,7 @@
 /obj/item/borg/upgrade/soh
 	name = "mining cyborg satchel of holding"
 	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_miner"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/miner)
 	model_flags = BORG_MODEL_MINER
@@ -178,7 +179,7 @@
 /obj/item/borg/upgrade/tboh
 	name = "janitor cyborg trash bag of holding"
 	desc = "A trash bag of holding replacement for the janiborg's standard trash bag."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_janitor"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/janitor)
 	model_flags = BORG_MODEL_JANITOR
@@ -189,7 +190,7 @@
 /obj/item/borg/upgrade/amop
 	name = "janitor cyborg advanced mop"
 	desc = "An advanced mop replacement for the janiborg's standard mop."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_janitor"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/janitor)
 	model_flags = BORG_MODEL_JANITOR
@@ -200,7 +201,7 @@
 /obj/item/borg/upgrade/prt
 	name = "janitor cyborg plating repair tool"
 	desc = "A tiny heating device to repair burnt and damaged hull platings with."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_janitor"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/janitor)
 	model_flags = BORG_MODEL_JANITOR
@@ -210,7 +211,7 @@
 /obj/item/borg/upgrade/syndicate
 	name = "illegal equipment module"
 	desc = "Unlocks the hidden, deadlier functions of a cyborg."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_illegal"
 	require_model = TRUE
 
 /obj/item/borg/upgrade/syndicate/Initialize(mapload)
@@ -239,7 +240,7 @@
 /obj/item/borg/upgrade/lavaproof
 	name = "mining cyborg lavaproof chassis"
 	desc = "An upgrade kit to apply specialized coolant systems and insulation layers to a mining cyborg's chassis, enabling them to withstand exposure to molten rock and liquid plasma."
-	icon_state = "cyborg_ash_tracks"
+	icon_state = "module_miner"
 	resistance_flags = LAVA_PROOF | FIRE_PROOF | FREEZE_PROOF
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/miner)
@@ -260,7 +261,7 @@
 /obj/item/borg/upgrade/selfrepair
 	name = "self-repair module"
 	desc = "This module will repair the cyborg over time."
-	icon_state = "cyborg_upgrade5"
+	icon_state = "module_general"
 	require_model = TRUE
 	var/repair_amount = -1
 	/// world.time of next repair
@@ -360,7 +361,7 @@
 	name = "medical cyborg hypospray advanced synthesiser"
 	desc = "An upgrade to the Medical model cyborg's hypospray, allowing it \
 		to produce more advanced and complex medical reagents."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -389,7 +390,7 @@
 	name = "cyborg piercing hypospray"
 	desc = "An upgrade to a cyborg's hypospray, allowing it to \
 		pierce armor and thick material."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 
 /obj/item/borg/upgrade/piercing_hypospray/action(mob/living/silicon/robot/borg, mob/living/user = usr)
 	. = ..()
@@ -420,7 +421,7 @@
 	name = "cyborg surgical omni-tool upgrade"
 	desc = "An upgrade to the Medical model, upgrading the built-in \
 		surgical omnitool, to be on par with advanced surgical tools"
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical,  /obj/item/robot_model/syndicate_medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -452,7 +453,7 @@
 	name = "cyborg engineering omni-tool upgrade"
 	desc = "An upgrade to the Engineering model, upgrading the built-in \
 		engineering omnitool, to be on par with advanced engineering tools"
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_engineer"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/engineering,  /obj/item/robot_model/saboteur)
 	model_flags = BORG_MODEL_ENGINEERING
@@ -479,7 +480,7 @@
 	name = "medical cyborg defibrillator"
 	desc = "An upgrade to the Medical model, installing a built-in \
 		defibrillator, for on the scene revival."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -530,7 +531,7 @@
 	desc = "An upgrade to the Medical model, installing a processor \
 		capable of scanning surgery disks and carrying \
 		out procedures"
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -540,6 +541,7 @@
 /obj/item/borg/upgrade/ai
 	name = "B.O.R.I.S. module"
 	desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI."
+	icon = 'icons/obj/devices/circuitry_n_data.dmi'
 	icon_state = "boris"
 
 /obj/item/borg/upgrade/ai/action(mob/living/silicon/robot/borg, mob/living/user = usr)
@@ -563,7 +565,7 @@
 /obj/item/borg/upgrade/expand
 	name = "borg expander"
 	desc = "A cyborg resizer, it makes a cyborg huge."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_general"
 
 /obj/item/borg/upgrade/expand/action(mob/living/silicon/robot/borg, mob/living/user = usr)
 	. = ..()
@@ -590,7 +592,7 @@
 	borg.set_anchored(FALSE)
 	REMOVE_TRAIT(borg, TRAIT_NO_TRANSFORM, REF(src))
 	borg.hasExpanded = TRUE
-	borg.update_transform(2)
+	borg.update_transform(1.25) // SS220 BandaStation EDIT - RESIZE UPDATE
 
 /obj/item/borg/upgrade/expand/deactivate(mob/living/silicon/robot/borg, mob/living/user = usr)
 	. = ..()
@@ -598,13 +600,12 @@
 		return .
 	if (borg.hasExpanded)
 		borg.hasExpanded = FALSE
-		borg.update_transform(0.5)
+		borg.update_transform(0.835) // SS220 BandaStation EDIT - RESIZE UPDATE
 
 /obj/item/borg/upgrade/rped
 	name = "engineering cyborg RPED"
 	desc = "A rapid part exchange device for the engineering cyborg."
-	icon = 'icons/obj/storage/storage.dmi'
-	icon_state = "borgrped"
+	icon_state = "module_engineer"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
 	model_flags = BORG_MODEL_ENGINEERING
@@ -614,6 +615,7 @@
 /obj/item/borg/upgrade/inducer
 	name = "engineering integrated power inducer"
 	desc = "An integrated inducer that can charge a device's internal cell from power provided by the cyborg."
+	icon_state = "module_engineer"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
 	model_flags = BORG_MODEL_ENGINEERING
@@ -638,8 +640,7 @@
 /obj/item/borg/upgrade/pinpointer
 	name = "medical cyborg crew pinpointer"
 	desc = "A crew pinpointer module for the medical cyborg. Permits remote access to the crew monitor."
-	icon = 'icons/obj/devices/tracker.dmi'
-	icon_state = "pinpointer_crew"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -676,7 +677,7 @@
 /obj/item/borg/upgrade/transform
 	name = "borg model picker (Standard)"
 	desc = "Allows you to to turn a cyborg into a standard cyborg."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_general"
 	var/obj/item/robot_model/new_model = null
 
 /obj/item/borg/upgrade/transform/action(mob/living/silicon/robot/borg, mob/living/user = usr)
@@ -687,13 +688,13 @@
 /obj/item/borg/upgrade/transform/clown
 	name = "borg model picker (Clown)"
 	desc = "Allows you to to turn a cyborg into a clown, honk."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_honk"
 	new_model = /obj/item/robot_model/clown
 
 /obj/item/borg/upgrade/circuit_app
 	name = "circuit manipulation apparatus"
 	desc = "An engineering cyborg upgrade allowing for manipulation of circuit boards."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_engineer"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
 	model_flags = BORG_MODEL_ENGINEERING
@@ -703,7 +704,7 @@
 /obj/item/borg/upgrade/beaker_app
 	name = "beaker storage apparatus"
 	desc = "A supplementary beaker storage apparatus for medical cyborgs."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_medical"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/medical)
 	model_flags = BORG_MODEL_MEDICAL
@@ -713,7 +714,7 @@
 /obj/item/borg/upgrade/drink_app
 	name = "glass storage apparatus"
 	desc = "A supplementary drinking glass storage apparatus for service cyborgs."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
@@ -723,7 +724,7 @@
 /obj/item/borg/upgrade/broomer
 	name = "experimental push broom"
 	desc = "An experimental push broom used for efficiently pushing refuse."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_janitor"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/janitor)
 	model_flags = BORG_MODEL_JANITOR
@@ -733,7 +734,7 @@
 /obj/item/borg/upgrade/condiment_synthesizer
 	name = "Service Cyborg Condiment Synthesiser"
 	desc = "An upgrade to the service model cyborg, allowing it to produce solid condiments."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
@@ -743,7 +744,7 @@
 /obj/item/borg/upgrade/silicon_knife
 	name = "Service Cyborg Kitchen Toolset"
 	desc = "An upgrade to the service model cyborg, to help process foods."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
@@ -753,7 +754,7 @@
 /obj/item/borg/upgrade/service_apparatus
 	name = "Service Cyborg Service Apparatus"
 	desc = "An upgrade to the service model cyborg, to help handle foods and paper."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
@@ -763,7 +764,7 @@
 /obj/item/borg/upgrade/rolling_table
 	name = "Service Cyborg Rolling Table Dock"
 	desc = "An upgrade to the service model cyborg, to help provide mobile service."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
@@ -773,7 +774,7 @@
 /obj/item/borg/upgrade/service_cookbook
 	name = "Service Cyborg Cookbook"
 	desc = "An upgrade to the service model cyborg, that lets them create more foods."
-	icon_state = "cyborg_upgrade3"
+	icon_state = "module_service"
 	require_model = TRUE
 	model_type = list(/obj/item/robot_model/service)
 	model_flags = BORG_MODEL_SERVICE
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index a0f41574e4b47..709747efc6663 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -3,7 +3,7 @@
 *
 * Items used for sharpening stuff
 *
-* Whetstones can be used to increase an item's force, throw_force and wound_bonus and it's change it's sharpness to SHARP_EDGED. Whetstones do not work with energy weapons. Two-handed weapons will only get the throw_force bonus. A whetstone can only be used once.
+* Whetstones can be used to increase an item's force, throw_force and wound_bonus and it changes its sharpness to SHARP_EDGED. Whetstones do not work with energy weapons. Two-handed weapons will only get the throw_force bonus. A whetstone can only be used once.
 *
 */
 /obj/item/sharpener
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 1553f0e9c8f29..c980fe0dbb359 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -99,6 +99,15 @@
 	max_integrity = 55
 	w_class = WEIGHT_CLASS_NORMAL
 
+/obj/item/shield/buckler/moonflower
+	name = "moonflower buckler"
+	desc = "A buckler made from a steel-cap reinforced moonflower."
+	icon_state = "moonflower_buckler"
+	inhand_icon_state = "moonflower_buckler"
+	block_chance = 40
+	max_integrity = 40
+	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/shield/kite
 	name = "kite shield"
 	desc = "Protect your internal organs with this almond shaped shield."
@@ -140,6 +149,8 @@
 	shield_break_sound = 'sound/effects/glassbr3.ogg'
 	shield_break_leftover = /obj/item/shard
 	armor_type = /datum/armor/item_shield/riot
+	pickup_sound = 'sound/items/plastic_shield_pick_up.ogg'
+	drop_sound = 'sound/items/plastic_shield_drop.ogg'
 
 /obj/item/shield/riot/Initialize(mapload)
 	. = ..()
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
index 96fbde554b79e..53e307e31d6e0 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -221,7 +221,7 @@
 	icon_state = "military_spear0"
 	base_icon_state = "military_spear0"
 	icon_prefix = "military_spear"
-	name = "military Javelin"
+	name = "military javelin"
 	desc = "A stick with a seemingly blunt spearhead on its end. Looks like it might break bones easily."
 	attack_verb_continuous = list("attacks", "pokes", "jabs")
 	attack_verb_simple = list("attack", "poke", "jab")
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 5a8e1361c28c3..69dbe87cd5cc9 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -39,6 +39,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
 	cost = HALF_SHEET_MATERIAL_AMOUNT
 	source = /datum/robot_energy_storage/material/iron
 	merge_type = /obj/item/stack/rods
+	pickup_sound = 'sound/items/iron_rod_pick_up.ogg'
+	drop_sound = 'sound/items/metal_drop.ogg'
+	sound_vary = TRUE
 
 /datum/embed_data/rods
 	embed_chance = 50
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index a9d71fa127abb..19e290170f8af 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -32,6 +32,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	cost = SHEET_MATERIAL_AMOUNT
 	source = /datum/robot_energy_storage/material/glass
 	sniffable = TRUE
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /datum/armor/sheet_glass
 	fire = 50
@@ -102,6 +104,8 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
 	material_flags = NONE
 	tableVariant = /obj/structure/table/glass/plasmaglass
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /obj/item/stack/sheet/plasmaglass/fifty
 	amount = 50
@@ -160,6 +164,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
 	matter_amount = 6
 	tableVariant = /obj/structure/table/reinforced/rglass
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /obj/item/stack/sheet/rglass/fifty
 	amount = 50
@@ -198,6 +204,8 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	gulag_valid = TRUE
 	matter_amount = 8
 	tableVariant = /obj/structure/table/reinforced/plasmarglass
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /datum/armor/sheet_plasmarglass
 	melee = 20
@@ -228,6 +236,8 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/titaniumglass
 	tableVariant = /obj/structure/table/reinforced/titaniumglass
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /obj/item/stack/sheet/titaniumglass/fifty
 	amount = 50
@@ -258,6 +268,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plastitaniumglass
 	tableVariant = /obj/structure/table/reinforced/plastitaniumglass
+	pickup_sound = 'sound/items/glass_pick_up.ogg'
+	drop_sound = 'sound/items/glass_drop.ogg'
 
 /obj/item/stack/sheet/plastitaniumglass/fifty
 	amount = 50
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index fbd69dbd20d4b..1f13ec34a764c 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -5,6 +5,8 @@
 	inhand_icon_state = null
 	novariants = TRUE
 	merge_type = /obj/item/stack/sheet/animalhide
+	pickup_sound = 'sound/items/skin_pick_up.ogg'
+	drop_sound = 'sound/items/skin_drop.ogg'
 
 /obj/item/stack/sheet/animalhide/human
 	name = "human skin"
@@ -191,6 +193,8 @@ GLOBAL_LIST_INIT(carp_recipes, list ( \
 	icon_state = "sheet-leather"
 	inhand_icon_state = null
 	merge_type = /obj/item/stack/sheet/leather
+	pickup_sound = 'sound/items/skin_pick_up.ogg'
+	drop_sound = 'sound/items/skin_drop.ogg'
 
 GLOBAL_LIST_INIT(leather_recipes, list ( \
 	new/datum/stack_recipe("wallet", /obj/item/storage/wallet, 1, crafting_flags = NONE, category = CAT_CONTAINERS), \
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 0ec790fe74349..425a624984550 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("cat house", /obj/structure/cat_house, 5, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
 	new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
-	new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
+	new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying/rack, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
 	new/datum/stack_recipe("wooden barrel", /obj/structure/fermenting_barrel, 8, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
 	new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
 	new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
@@ -385,6 +385,8 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	grind_results = list(/datum/reagent/cellulose = 20) //no lignocellulose or lignin reagents yet,
 	walltype = /turf/closed/wall/mineral/wood
 	stairs_type = /obj/structure/stairs/wood
+	pickup_sound = 'sound/items/wood_pick_up.ogg'
+	drop_sound = 'sound/items/wood_drop.ogg'
 
 /datum/armor/mineral_wood
 	fire = 50
@@ -678,6 +680,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/cardboard
 	grind_results = list(/datum/reagent/cellulose = 10)
 	material_type = /datum/material/cardboard
+	pickup_sound = 'sound/items/cardboard_pick_up.ogg'
+	drop_sound = 'sound/items/cardboard_drop.ogg'
 
 /obj/item/stack/sheet/cardboard/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
 	. = ..()
@@ -853,6 +857,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	throwforce = 7
 	material_type = /datum/material/plastic
 	merge_type = /obj/item/stack/sheet/plastic
+	pickup_sound = 'sound/items/plastic_pick_up.ogg'
+	drop_sound = 'sound/items/plastic_drop.ogg'
 
 /obj/item/stack/sheet/plastic/fifty
 	amount = 50
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 8b81953528ee1..568fd2f49aa29 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -13,6 +13,8 @@
 	attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
 	novariants = FALSE
 	material_flags = MATERIAL_EFFECTS
+	pickup_sound = 'sound/items/metal_pick_up.ogg'
+	drop_sound = 'sound/items/metal_drop.ogg'
 	var/sheettype = null //this is used for girders in the creation of walls/false walls
 	///If true, this is worth points in the gulag labour stacker
 	var/gulag_valid = FALSE
@@ -22,6 +24,8 @@
 	var/walltype
 	/// whether this sheet can be sniffed by the material sniffer
 	var/sniffable = FALSE
+	/// this makes pickup and drop sounds vary
+	sound_vary = TRUE
 
 /obj/item/stack/sheet/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
 	. = ..()
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index c748ba4c494a1..a6571eeb1e9b3 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -34,7 +34,7 @@
 	var/merge_type = null
 	/// The weight class the stack has at amount > 2/3rds max_amount
 	var/full_w_class = WEIGHT_CLASS_NORMAL
-	/// Determines whether the item should update it's sprites based on amount.
+	/// Determines whether the item should update its sprites based on amount.
 	var/novariants = TRUE
 	/// List that tells you how much is in a single unit.
 	var/list/mats_per_unit
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 0e054ba8d1062..acfc59b64d037 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -127,12 +127,15 @@
 	singular_name = "surgical tape"
 	desc = "Made for patching broken bones back together alongside bone gel, not for playing pranks."
 	prefix = "surgical"
-	conferred_embed = list("embed_chance" = 30, "pain_mult" = 0, "jostle_pain_mult" = 0, "ignore_throwspeed_threshold" = TRUE)
+	conferred_embed = /datum/embed_data/sticky_tape/surgical
 	splint_factor = 0.5
 	custom_price = PAYCHECK_CREW
 	merge_type = /obj/item/stack/sticky_tape/surgical
 	greyscale_colors = "#70BAE7#BD6A62"
 	tape_gag = /obj/item/clothing/mask/muzzle/tape/surgical
 
+/datum/embed_data/sticky_tape/surgical
+	embed_chance = 30
+
 /obj/item/stack/sticky_tape/surgical/get_surgery_tool_overlay(tray_extended)
 	return "tape" + (tray_extended ? "" : "_out")
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 77ca77e8ba0bf..a88da6537b64e 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -377,7 +377,7 @@
 
 /obj/item/storage/backpack/satchel/flat
 	name = "smuggler's satchel"
-	desc = "A very slim satchel that can easily fit into tight spaces."
+	desc = "A very slim satchel that can easily fit into tight spaces. Its contents cannot be detected by contraband scanners."
 	icon_state = "satchel-flat"
 	inhand_icon_state = "satchel-flat"
 	w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 1bf97712ec566..bd1f52a832349 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -373,6 +373,9 @@
 		/obj/item/restraints/handcuffs,
 		/obj/item/restraints/legcuffs/bola,
 	))
+	atom_storage.open_sound = 'sound/items/holster.ogg'
+	atom_storage.open_sound_vary = TRUE
+	atom_storage.rustle_sound = FALSE
 
 /obj/item/storage/belt/security/full/PopulateContents()
 	new /obj/item/reagent_containers/spray/pepper(src)
@@ -855,6 +858,50 @@
 	new /obj/item/melee/sabre(src)
 	update_appearance()
 
+/obj/item/storage/belt/grass_sabre
+	name = "sabre sheath"
+	desc = "An simple grass sheath designed to hold a sabre of... some sort. Actual metal one might be too sharp, though..."
+	icon_state = "grass_sheath"
+	inhand_icon_state = "grass_sheath"
+	worn_icon_state = "grass_sheath"
+	w_class = WEIGHT_CLASS_BULKY
+	interaction_flags_click = parent_type::interaction_flags_click | NEED_DEXTERITY | NEED_HANDS
+
+/obj/item/storage/belt/grass_sabre/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/update_icon_updates_onmob)
+
+	atom_storage.max_slots = 1
+	atom_storage.rustle_sound = FALSE
+	atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY
+	atom_storage.set_holdable(/obj/item/melee/parsnip_sabre)
+	atom_storage.click_alt_open = FALSE
+
+/obj/item/storage/belt/grass_sabre/examine(mob/user)
+	. = ..()
+	if(length(contents))
+		. += span_notice("Alt-click it to quickly draw the blade.")
+
+/obj/item/storage/belt/grass_sabre/click_alt(mob/user)
+	if(length(contents))
+		var/obj/item/I = contents[1]
+		user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("You take [I] out of [src]."))
+		user.put_in_hands(I)
+		update_appearance()
+	else
+		balloon_alert(user, "it's empty!")
+	return CLICK_ACTION_SUCCESS
+
+/obj/item/storage/belt/grass_sabre/update_icon_state()
+	icon_state = initial(inhand_icon_state)
+	inhand_icon_state = initial(inhand_icon_state)
+	worn_icon_state = initial(worn_icon_state)
+	if(contents.len)
+		icon_state += "-sabre"
+		inhand_icon_state += "-sabre"
+		worn_icon_state += "-sabre"
+	return ..()
+
 /obj/item/storage/belt/plant
 	name = "botanical belt"
 	desc = "A sturdy leather belt used to hold most hydroponics supplies."
diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm
index ea9189cc5f2b0..a8ced4fdad48e 100644
--- a/code/game/objects/items/storage/boxes/job_boxes.dm
+++ b/code/game/objects/items/storage/boxes/job_boxes.dm
@@ -43,7 +43,7 @@
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_RADIOACTIVE_NEBULA))
 		new /obj/item/storage/pill_bottle/potassiodide(src)
 
-	if(SSmapping.is_planetary() && LAZYLEN(SSmapping.multiz_levels))
+	if(length(SSmapping.levels_by_trait(ZTRAIT_STATION)) > 1)
 		new /obj/item/climbing_hook/emergency(src)
 
 /obj/item/storage/box/survival/radio/PopulateContents()
diff --git a/code/game/objects/items/storage/boxes/security_boxes.dm b/code/game/objects/items/storage/boxes/security_boxes.dm
index 459c0ab7ce29e..935ead8f93e95 100644
--- a/code/game/objects/items/storage/boxes/security_boxes.dm
+++ b/code/game/objects/items/storage/boxes/security_boxes.dm
@@ -204,6 +204,16 @@
 	for(var/i in 1 to 7)
 		new /obj/item/ammo_casing/shotgun/breacher(src)
 
+/obj/item/storage/box/large_dart
+	name = "box of XL shotgun darts"
+	name = "A box full of shotgun darts with increased chemical storage capacity."
+	icon_state = "shotdart_box"
+	illustration = null
+
+/obj/item/storage/box/large_dart/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/ammo_casing/shotgun/dart/large(src)
+
 /obj/item/storage/box/emptysandbags
 	name = "box of empty sandbags"
 	illustration = "sandbag"
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index afb7b0f750b26..f8dee3afdc7f4 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -33,6 +33,8 @@
 		/obj/item/gun/energy/laser/captain,
 		/obj/item/gun/energy/e_gun/hos,
 	))
+	atom_storage.open_sound = 'sound/items/holster.ogg'
+	atom_storage.open_sound_vary = TRUE
 
 /obj/item/storage/belt/holster/energy
 	name = "energy shoulder holsters"
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index a1dbe0e690c71..8fa147252514c 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -199,7 +199,7 @@
 	req_access = list(ACCESS_QM)
 
 /obj/item/storage/lockbox/medal/cargo/PopulateContents()
-		new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
+	new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
 
 /obj/item/storage/lockbox/medal/service
 	name = "service award box"
@@ -207,7 +207,7 @@
 	req_access = list(ACCESS_HOP)
 
 /obj/item/storage/lockbox/medal/service/PopulateContents()
-		new /obj/item/clothing/accessory/medal/silver/excellence(src)
+	new /obj/item/clothing/accessory/medal/silver/excellence(src)
 
 /obj/item/storage/lockbox/medal/sci
 	name = "science medal box"
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index 944289598d17b..bee7fdd524f3d 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -18,6 +18,9 @@
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	throw_speed = 3
 	throw_range = 7
+	drop_sound = 'sound/items/medkit_drop.ogg'
+	pickup_sound = 'sound/items/medkit_pick_up.ogg'
+	sound_vary = TRUE
 	var/empty = FALSE
 	/// Defines damage type of the medkit. General ones stay null. Used for medibot healing bonuses
 	var/damagetype_healed
@@ -79,6 +82,8 @@
 /obj/item/storage/medkit/Initialize(mapload)
 	. = ..()
 	atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
+	atom_storage.open_sound = 'sound/items/medkit_open.ogg'
+	atom_storage.open_sound_vary = TRUE
 
 /obj/item/storage/medkit/regular
 	icon_state = "medkit"
@@ -454,6 +459,8 @@
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
+	pickup_sound = 'sound/items/handling/pill_bottle_pickup.ogg'
+	drop_sound = 'sound/items/handling/pill_bottle_place.ogg'
 
 /obj/item/storage/pill_bottle/Initialize(mapload)
 	. = ..()
@@ -462,6 +469,8 @@
 		/obj/item/reagent_containers/pill,
 		/obj/item/food/bait/natural,
 	))
+	atom_storage.open_sound = 'sound/items/handling/pill_bottle_open.ogg'
+	atom_storage.open_sound_vary = FALSE
 
 /obj/item/storage/pill_bottle/suicide_act(mob/living/user)
 	user.visible_message(span_suicide("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 7c5bc74e07550..905f2e40f47a7 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -348,6 +348,11 @@
 	weapon_to_spawn = /obj/item/gun/ballistic/automatic/c20r
 	extra_to_spawn = /obj/item/ammo_box/magazine/smgm45
 
+/obj/item/storage/toolbox/guncase/smartgun
+	name = "adielle smartgun case"
+	weapon_to_spawn = /obj/item/gun/ballistic/automatic/smartgun
+	extra_to_spawn = /obj/item/ammo_box/magazine/smartgun
+
 /obj/item/storage/toolbox/guncase/clandestine
 	name = "clandestine gun case"
 	weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/clandestine
@@ -442,12 +447,6 @@
 	weapon_to_spawn = /obj/effect/spawner/random/sakhno
 	extra_to_spawn = /obj/effect/spawner/random/sakhno/ammo
 
-/obj/item/storage/toolbox/guncase/soviet/plastikov
-	name = "ancient surplus gun case"
-	desc = "A gun case. Has the symbol of the Third Soviet Union stamped on the side."
-	weapon_to_spawn = /obj/item/gun/ballistic/automatic/plastikov
-	extra_to_spawn = /obj/item/food/rationpack //sorry comrade, cannot get you more ammo, here, have lunch
-
 /obj/item/storage/toolbox/guncase/monkeycase
 	name = "monkey gun case"
 	desc = "Everything a monkey needs to truly go ape-shit. There's a paw-shaped hand scanner lock on the front of the case."
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index d3e41b21a986b..eacd0b4b630d0 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -267,7 +267,7 @@
 
 		if(KIT_MR_FREEZE)
 			new /obj/item/clothing/glasses/cold(src)
-			new /obj/item/clothing/gloves/color/black(src)
+			new /obj/item/clothing/gloves/color/black/security/blu(src)
 			new /obj/item/clothing/mask/chameleon(src)
 			new /obj/item/clothing/suit/hooded/wintercoat(src)
 			new /obj/item/clothing/shoes/winterboots(src)
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index e485d6997f05f..e8c1fc6d19245 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -9,6 +9,7 @@
 	var/obj/item/card/id/front_id = null
 	var/list/combined_access
 	var/cached_flat_icon
+	var/overlay_icon_state = "wallet_overlay"
 
 /obj/item/storage/wallet/Initialize(mapload)
 	. = ..()
@@ -103,7 +104,7 @@
 		return
 	. += mutable_appearance(front_id.icon, front_id.icon_state)
 	. += front_id.overlays
-	. += mutable_appearance(icon, "wallet_overlay")
+	. += mutable_appearance(icon, overlay_icon_state)
 
 /obj/item/storage/wallet/proc/get_cached_flat_icon()
 	if(!cached_flat_icon)
@@ -117,9 +118,9 @@
 
 /obj/item/storage/wallet/proc/update_label()
 	if(front_id)
-		name = "wallet displaying [front_id]"
+		name = "[src::name] displaying [front_id]"
 	else
-		name = "wallet"
+		name = src::name
 
 /obj/item/storage/wallet/examine()
 	. = ..()
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index e156bf8a0a862..4e84bd3ac3559 100644
--- a/code/game/objects/items/surgery_tray.dm
+++ b/code/game/objects/items/surgery_tray.dm
@@ -42,7 +42,7 @@
 	. = ..()
 	if(is_portable)
 		desc = "The wheels and bottom storage of this medical cart have been stowed away, \
-			leaving a cumbersome tray in it's place."
+			leaving a cumbersome tray in its place."
 	else
 		desc = initial(desc)
 
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index bdbfa79001ddf..d89794f420917 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -22,6 +22,9 @@
 	slot_flags = ITEM_SLOT_BACK
 	worn_icon = 'icons/mob/clothing/back.dmi' //since these can also get thrown into suit storage slots. if something goes on the belt, set this to null.
 	hitsound = 'sound/weapons/smash.ogg'
+	pickup_sound = 'sound/items/gas_tank_pick_up.ogg'
+	drop_sound = 'sound/items/gas_tank_drop.ogg'
+	sound_vary = TRUE
 	pressure_resistance = ONE_ATMOSPHERE * 5
 	force = 5
 	throwforce = 10
@@ -69,7 +72,7 @@
 	if (QDELETED(breathing_mob))
 		breathing_mob = null
 		return
-	// Close open air tank if it got dropped by it's current user.
+	// Close open air tank if it got dropped by its current user.
 	if (loc != breathing_mob)
 		breathing_mob.cutoff_internals()
 
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index c50908738fe94..1b3367032c190 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -606,7 +606,7 @@
 
 /obj/item/toy/mecha/deathripley/super_special_attack(obj/item/toy/mecha/victim)
 	playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 20, TRUE)
-	if(victim.combat_health < combat_health) //Instantly kills the other mech if it's health is below our's.
+	if(victim.combat_health < combat_health) //Instantly kills the other mech if its health is below ours.
 		say("EXECUTE!!")
 		victim.combat_health = 0
 	else //Otherwise, just deal one damage.
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 5384a11cf3bbe..0d3e3f60d4abf 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -162,7 +162,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 
 /obj/item/claymore/carrot
 	name = "carrot sword"
-	desc = "A full-sized carrot sword. Definitely \not\ good for the eyes, not anymore."
+	desc = "A full-sized carrot sword. Definitely <b>not</b> good for the eyes, not anymore."
 	icon_state = "carrot_sword"
 	inhand_icon_state = "carrot_sword"
 	worn_icon_state = "carrot_sword"
@@ -505,6 +505,37 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!"))
 	return OXYLOSS
 
+/obj/item/bambostaff
+	name = "Bamboo Staff"
+	desc = "A long bamboo-made staff with steel-capped ends. It is rumoured that initiates of Spider Clan train with such before getting to learn how to use a katana."
+	force = 10
+	block_chance = 45
+	block_sound = 'sound/weapons/genhit.ogg'
+	slot_flags = ITEM_SLOT_BACK
+	w_class = WEIGHT_CLASS_BULKY
+	hitsound = SFX_SWING_HIT
+	attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks")
+	attack_verb_simple = list("smash", "slam", "whack", "thwack")
+	icon = 'icons/obj/weapons/staff.dmi'
+	icon_state = "bambostaff0"
+	base_icon_state = "bambostaff"
+	inhand_icon_state = "bambostaff0"
+	worn_icon_state = "bambostaff0"
+	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+
+/obj/item/bambostaff/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/two_handed, \
+		force_unwielded = 10, \
+		force_wielded = 14, \
+		icon_wielded = "[base_icon_state]1", \
+	)
+
+/obj/item/bambostaff/update_icon_state()
+	icon_state = "[base_icon_state]0"
+	return ..()
+
 /obj/item/cane
 	name = "cane"
 	desc = "A cane used by a true gentleman. Or a clown."
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index bfdd0f71426c5..f12479c66a444 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -12,7 +12,7 @@
 	/// Icon to use as a 32x32 preview in crafting menus and such
 	var/icon_preview
 	var/icon_state_preview
-	/// The vertical pixel offset applied when the object is anchored on a tile with table
+	/// The vertical pixel_z offset applied when the object is anchored on a tile with table
 	/// Ignored when set to 0 - to avoid shifting directional wall-mounted objects above tables
 	var/anchored_tabletop_offset = 0
 
@@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
 /obj/proc/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
 	return SEND_SIGNAL(src, COMSIG_PLUNGER_ACT, attacking_plunger, user, reinforced)
 
-// Should move all contained objects to it's location.
+// Should move all contained objects to its location.
 /obj/proc/dump_contents()
 	SHOULD_CALL_PARENT(FALSE)
 	CRASH("Unimplemented.")
@@ -278,7 +278,14 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
 		return FALSE
 	return TRUE
 
-/// Adjusts the vertical pixel offset when the object is anchored on a tile with table
+/// Adjusts the vertical pixel_z offset when the object is anchored on a tile with table
 /obj/proc/check_on_table()
-	if(anchored_tabletop_offset != 0 && !istype(src, /obj/structure/table) && locate(/obj/structure/table) in loc)
-		pixel_y = anchored ? anchored_tabletop_offset : initial(pixel_y)
+	if(anchored_tabletop_offset == 0)
+		return
+	if(istype(src, /obj/structure/table))
+		return
+
+	if(anchored && locate(/obj/structure/table) in loc)
+		pixel_z = anchored_tabletop_offset
+	else
+		pixel_z = initial(pixel_z)
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 1783d4b236a63..e1581422d0570 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -264,15 +264,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
 	return
 
 /obj/structure/chair/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
-	if(over_object == user)
-		if(!item_chair || has_buckled_mobs())
-			return
-		user.visible_message(span_notice("[user] grabs \the [src.name]."), span_notice("You grab \the [src.name]."))
-		var/obj/item/C = new item_chair(loc)
-		C.set_custom_materials(custom_materials)
-		TransferComponents(C)
-		user.put_in_hands(C)
-		qdel(src)
+	if(!isliving(user) || over_object != user)
+		return
+	if(!item_chair || has_buckled_mobs())
+		return
+	user.visible_message(span_notice("[user] grabs \the [src.name]."), span_notice("You grab \the [src.name]."))
+	var/obj/item/C = new item_chair(loc)
+	C.set_custom_materials(custom_materials)
+	TransferComponents(C)
+	user.put_in_hands(C)
+	qdel(src)
 
 /obj/structure/chair/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
 	return ..()
@@ -282,6 +283,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
 	desc = "It has some unsavory stains on it..."
 	icon_state = "bar"
 	item_chair = /obj/item/chair/stool/bar
+	can_buckle = TRUE
+
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
+	M.pixel_y += 4
+
+/obj/structure/chair/stool/bar/post_unbuckle_mob(mob/living/M)
+	M.pixel_y -= 4
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
 
diff --git a/code/game/objects/structures/construction_console/construction_console.dm b/code/game/objects/structures/construction_console/construction_console.dm
index d3ae2984e3170..f13dd1d78c64a 100644
--- a/code/game/objects/structures/construction_console/construction_console.dm
+++ b/code/game/objects/structures/construction_console/construction_console.dm
@@ -119,7 +119,7 @@
 		return ..()
 
 /mob/camera/ai_eye/remote/base_construction/relaymove(mob/living/user, direction)
-	//This camera eye is visible, and as such needs to keep it's dir updated
+	//This camera eye is visible, and as such needs to keep its dir updated
 	dir = direction
 	return ..()
 
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index baf239284ac2f..7b64b6569d6cc 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -62,6 +62,7 @@
 		)
 	if(paint_jobs)
 		paint_jobs = crate_paint_jobs
+	AddComponent(/datum/component/soapbox)
 
 /obj/structure/closet/crate/Destroy()
 	QDEL_NULL(manifest)
diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm
index 81f7b97a3c159..1a102fdb512fd 100644
--- a/code/game/objects/structures/crates_lockers/crates/secure.dm
+++ b/code/game/objects/structures/crates_lockers/crates/secure.dm
@@ -122,6 +122,28 @@
 	icon_state = "robo_secure"
 	base_icon_state = "robo_secure"
 
+/obj/structure/closet/crate/secure/trashcart
+	desc = "A heavy, metal trashcart with wheels. It has an electronic lock on it."
+	name = "secure trash cart"
+	max_integrity = 250
+	damage_deflection = 10
+	icon_state = "securetrashcart"
+	base_icon_state = "securetrashcart"
+	paint_jobs = null
+	req_access = list(ACCESS_JANITOR)
+
+/obj/structure/closet/crate/secure/trashcart/filled
+
+/obj/structure/closet/crate/secure/trashcart/filled/PopulateContents()
+	. = ..()
+	for(var/i in 1 to rand(8,12))
+		new /obj/effect/spawner/random/trash/deluxe_garbage(src)
+		if(prob(35))
+			new /obj/effect/spawner/random/trash/garbage(src)
+	for(var/i in 1 to rand(4,6))
+		if(prob(30))
+			new /obj/item/storage/bag/trash/filled(src)
+
 /obj/structure/closet/crate/secure/owned
 	name = "private crate"
 	desc = "A crate cover designed to only open for who purchased its contents."
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index aead6fafb017c..be4180b5fa177 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -146,7 +146,7 @@
 		set_opacity(TRUE)
 
 /obj/structure/curtain/cloth/fancy/mechanical/attack_hand(mob/user, list/modifiers)
-		return
+	return
 
 /obj/structure/curtain/cloth/fancy/mechanical/start_closed
 	icon_state = "cur_fancy-closed"
diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm
index f24df392dedef..2b1a90500ccf8 100644
--- a/code/game/objects/structures/deployable_turret.dm
+++ b/code/game/objects/structures/deployable_turret.dm
@@ -213,7 +213,7 @@
 
 /obj/machinery/deployable_turret/hmg
 	name = "heavy machine gun turret"
-	desc = "A heavy caliber machine gun commonly used by Nanotrasen forces, famed for it's ability to give people on the receiving end more holes than normal."
+	desc = "A heavy caliber machine gun commonly used by Nanotrasen forces, famed for its ability to give people on the receiving end more holes than normal."
 	icon_state = "hmg"
 	max_integrity = 250
 	projectile_type = /obj/projectile/bullet/manned_turret/hmg
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 3bd3e00cc273b..aa9af66868fdd 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -17,6 +17,8 @@
 	integrity_failure = 0.4
 	var/rods_type = /obj/item/stack/rods
 	var/rods_amount = 2
+	/// Whether or not we're disappearing but dramatically
+	var/dramatically_disappearing = FALSE
 
 /datum/armor/structure_grille
 	melee = 50
@@ -365,6 +367,31 @@
 /obj/structure/grille/get_dumping_location()
 	return null
 
+/obj/structure/grille/proc/temporary_shatter(time_to_go = 0 SECONDS, time_to_return = 4 SECONDS)
+	if(dramatically_disappearing)
+		return
+
+	//dissapear in 1 second
+	dramatically_disappearing = TRUE
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
+
+	// come back in 1 + 4 seconds
+	addtimer(VARSET_CALLBACK(src, atom_integrity, atom_integrity), time_to_go + time_to_return) //set the health back (icon is updated on move)
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys
+	addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back
+
+/// Do some very specific checks to see if we *would* get shocked. Returns TRUE if it's shocked
+/obj/structure/grille/proc/is_shocked()
+	var/turf/turf = get_turf(src)
+	var/obj/structure/cable/cable = turf.get_cable_node()
+	var/list/powernet_info = get_powernet_info_from_source(cable)
+
+	if(!powernet_info)
+		return FALSE
+
+	var/datum/powernet/powernet = powernet_info["powernet"]
+	return !!powernet.get_electrocute_damage()
+
 /obj/structure/grille/broken // Pre-broken grilles for map placement
 	icon_state = "brokengrille"
 	density = FALSE
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 1d7fc470afff8..30983c5088d67 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -3,7 +3,7 @@
 
 /obj/structure/holosign
 	name = "holo sign"
-	icon = 'icons/effects/effects.dmi'
+	icon = 'icons/effects/holosigns.dmi'
 	anchored = TRUE
 	max_integrity = 1
 	armor_type = /datum/armor/structure_holosign
@@ -21,10 +21,7 @@
 
 /obj/structure/holosign/Initialize(mapload, source_projector)
 	. = ..()
-	var/turf/our_turf = get_turf(src)
-	if(use_vis_overlay)
-		alpha = 0
-		SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, MUTATE_PLANE(GAME_PLANE, our_turf), dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+	create_vis_overlay()
 	if(source_projector)
 		projector = source_projector
 		LAZYADD(projector.signs, src)
@@ -41,6 +38,11 @@
 		return
 	attack_holosign(user, modifiers)
 
+/obj/structure/holosign/CanAllowThrough(atom/movable/mover, border_dir)
+	. = ..()
+	if(!. && isprojectile(mover)) // Its short enough to be shot over
+		return TRUE
+
 /obj/structure/holosign/proc/attack_holosign(mob/living/user, list/modifiers)
 	user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 	user.changeNext_move(CLICK_CD_MELEE)
@@ -54,38 +56,100 @@
 		if(BURN)
 			playsound(loc, 'sound/weapons/egloves.ogg', 80, TRUE)
 
+/obj/structure/holosign/proc/create_vis_overlay()
+	var/turf/our_turf = get_turf(src)
+	if(use_vis_overlay)
+		alpha = 0
+		SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+		SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, MUTATE_PLANE(GAME_PLANE, our_turf), dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+
 /obj/structure/holosign/wetsign
 	name = "wet floor sign"
 	desc = "The words flicker as if they mean nothing."
-	icon = 'icons/effects/effects.dmi'
 	icon_state = "holosign"
 
 /obj/structure/holosign/barrier
-	name = "holobarrier"
-	desc = "A short holographic barrier which can only be passed by walking."
+	name = "security holobarrier"
+	desc = "A strong short security holographic barrier used for crowd control and blocking crime scenes. Can only be passed by walking."
 	icon_state = "holosign_sec"
+	base_icon_state = "holosign_sec"
 	pass_flags_self = PASSTABLE | PASSGRILLE | PASSGLASS | LETPASSTHROW
 	density = TRUE
 	max_integrity = 20
-	var/allow_walk = TRUE //can we pass through it on walk intent
+	COOLDOWN_DECLARE(cooldown_open)
+	///Can we pass through it on walk intent?
+	var/allow_walk = TRUE
+	///Can it be temporarily opened with the holosign projector?
+	var/openable = TRUE
+	///Is it opened?
+	var/opened = FALSE
+	///What is the icon of opened holobarrier?
+	var/pass_icon_state = "holosign_pass"
 
 /obj/structure/holosign/barrier/CanAllowThrough(atom/movable/mover, border_dir)
 	. = ..()
 	if(.)
 		return
+
+	if(opened)
+		return TRUE
+
 	if(iscarbon(mover))
-		var/mob/living/carbon/C = mover
-		if(C.stat) // Lets not prevent dragging unconscious/dead people.
+		var/mob/living/carbon/moving_carbon = mover
+		if(moving_carbon.stat) // Lets not prevent dragging unconscious/dead people.
 			return TRUE
-		if(allow_walk && C.move_intent == MOVE_INTENT_WALK)
+		if(allow_walk && moving_carbon.move_intent == MOVE_INTENT_WALK)
 			return TRUE
 
+/obj/structure/holosign/barrier/ranged_item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+	. = ..()
+	if(tool != projector)
+		return
+	if(openable)
+		open(user)
+
+/obj/structure/holosign/barrier/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+	. = ..()
+	if(tool != projector)
+		return
+	qdel(src)
+
+/obj/structure/holosign/barrier/update_icon_state()
+	if(!opened)
+		icon_state = base_icon_state
+	else
+		icon_state = pass_icon_state
+
+	create_vis_overlay()
+	. = ..()
+
+/obj/structure/holosign/barrier/proc/open(user)
+	if(!openable)
+		balloon_alert(user, "unable!")
+		return
+
+	if(!COOLDOWN_FINISHED(src, cooldown_open))
+		balloon_alert(user, "on cooldown!")
+		return
+
+	if(!opened)
+		density = FALSE
+		opened = TRUE
+		playsound(src, 'sound/machines/door_open.ogg', 50, TRUE)
+	else
+		density = TRUE
+		opened = FALSE
+		playsound(src, 'sound/machines/door_close.ogg', 50, TRUE)
+
+	update_icon_state()
+	COOLDOWN_START(src, cooldown_open, 1 SECONDS)
+
 /obj/structure/holosign/barrier/wetsign
 	name = "wet floor holobarrier"
-	desc = "When it says walk it means walk."
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "holosign"
+	desc = "When it says walk it means <b>WALK!</b>"
+	icon_state = "holosign_dense"
 	max_integrity = 1
+	openable = FALSE
 
 /obj/structure/holosign/barrier/wetsign/CanAllowThrough(atom/movable/mover, border_dir)
 	. = ..()
@@ -97,7 +161,10 @@
 			return FALSE
 
 /obj/structure/holosign/barrier/engineering
+	name = "engineering holobarrier"
+	desc = "A short engineering holographic barrier used for designating hazardous zones, slightly blocks radiation. Can only be passed by walking."
 	icon_state = "holosign_engi"
+	base_icon_state = "holosign_engi"
 	rad_insulation = RAD_LIGHT_INSULATION
 	max_integrity = 1
 
@@ -105,6 +172,7 @@
 	name = "holofirelock"
 	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
 	icon_state = "holo_firelock"
+	openable = FALSE
 	density = FALSE
 	anchored = TRUE
 	can_atmos_pass = ATMOS_PASS_NO
@@ -129,11 +197,13 @@
 /obj/structure/holosign/barrier/atmos/sturdy
 	name = "sturdy holofirelock"
 	max_integrity = 150
+	openable = FALSE
 
 /obj/structure/holosign/barrier/atmos/tram
 	name = "tram atmos barrier"
 	max_integrity = 150
 	icon_state = "holo_tram"
+	openable = FALSE
 
 /obj/structure/holosign/barrier/atmos/Initialize(mapload)
 	. = ..()
@@ -166,9 +236,10 @@
 	name = "\improper PENLITE holobarrier"
 	desc = "A holobarrier that uses biometrics to detect human viruses. Denies passing to personnel with easily-detected, malicious viruses. Good for quarantines."
 	icon_state = "holo_medical"
-	alpha = 125 //lazy :)
+	base_icon_state = "holo_medical"
 	max_integrity = 1
-	var/buzzcd = 0
+	openable = FALSE
+	COOLDOWN_DECLARE(virus_detected)
 
 /obj/structure/holosign/barrier/medical/CanAllowThrough(atom/movable/mover, border_dir)
 	. = ..()
@@ -183,12 +254,18 @@
 
 /obj/structure/holosign/barrier/medical/Bumped(atom/movable/AM)
 	. = ..()
-	icon_state = "holo_medical"
-	if(ishuman(AM) && !CheckHuman(AM))
-		if(buzzcd < world.time)
-			playsound(get_turf(src),'sound/machines/buzz-sigh.ogg',65,TRUE,4)
-			buzzcd = (world.time + 60)
-		icon_state = "holo_medical-deny"
+	icon_state = base_icon_state
+	update_icon_state()
+	if(!ishuman(AM) && CheckHuman(AM))
+		return
+
+	if(!COOLDOWN_FINISHED(src, virus_detected))
+		return
+
+	playsound(get_turf(src),'sound/machines/buzz-sigh.ogg', 65, TRUE, 4)
+	COOLDOWN_START(src, virus_detected, 1 SECONDS)
+	icon_state = "holo_medical-deny"
+	update_icon_state()
 
 /obj/structure/holosign/barrier/medical/proc/CheckHuman(mob/living/carbon/human/sickboi)
 	var/threat = sickboi.check_virus()
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index cf6fe65abe274..0d7d23191742c 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -23,6 +23,7 @@
 	if(length(give_turf_traits))
 		give_turf_traits = string_list(give_turf_traits)
 		AddElement(/datum/element/give_turf_traits, give_turf_traits)
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
 
 /datum/armor/structure_lattice
 	melee = 50
@@ -98,10 +99,6 @@
 	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
 	give_turf_traits = list(TRAIT_TURF_IGNORE_SLOWDOWN, TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED, TRAIT_HYPERSPACE_STOPPED)
 
-/obj/structure/lattice/catwalk/Initialize(mapload)
-	. = ..()
-	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
-
 /obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
 	return span_notice("The supporting rods look like they could be <b>cut</b>.")
 
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
index 7ef40423e0d44..045a703250b0a 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/lavaland/geyser.dm
@@ -45,7 +45,7 @@
 
 ///start making those CHHHHHEEEEEEMS. Called whenever chems are removed, it's fine because START_PROCESSING checks if we arent already processing
 /obj/structure/geyser/proc/start_chemming()
-	START_PROCESSING(SSplumbing, src) //It's main function is to be plumbed, so use SSplumbing
+	START_PROCESSING(SSplumbing, src) //Its main function is to be plumbed, so use SSplumbing
 
 ///We're full so stop processing
 /obj/structure/geyser/proc/stop_chemming()
diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm
index cb9d203e3f2c7..f9214b989b95c 100644
--- a/code/game/objects/structures/lavaland/ore_vent.dm
+++ b/code/game/objects/structures/lavaland/ore_vent.dm
@@ -39,6 +39,7 @@
 		MEDIUM_VENT_TYPE = 5,
 		SMALL_VENT_TYPE = 7,
 	)
+	var/wave_timer = WAVE_DURATION_SMALL
 
 	/// What string do we use to warn the player about the excavation event?
 	var/excavation_warning = "Are you ready to excavate this ore vent?"
@@ -159,7 +160,7 @@
  * This proc is called when the ore vent is initialized, in order to determine what minerals boulders it spawns can contain.
  * The materials available are determined by SSore_generation.ore_vent_minerals, which is a list of all minerals that can be contained in ore vents for a given cave generation.
  * As a result, minerals use a weighted list as seen by ore_vent_minerals_lavaland, which is then copied to ore_vent_minerals.
- * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided it's own internal weight used when assigning minerals to boulders spawned by this vent.
+ * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided its own internal weight used when assigning minerals to boulders spawned by this vent.
  * May also be called after the fact, as seen in SSore_generation's initialize, to add more minerals to an existing vent.
  *
  * The above applies only when spawning in at mapload, otherwise we pick randomly from ore_vent_minerals_lavaland.
@@ -219,6 +220,9 @@
 		node.arrive(src)
 		RegisterSignal(node, COMSIG_QDELETING, PROC_REF(handle_wave_conclusion))
 		RegisterSignal(node, COMSIG_MOVABLE_MOVED, PROC_REF(handle_wave_conclusion))
+		addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.25)
+		addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.5)
+		addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.75)
 	particles = new /particles/smoke/ash()
 	for(var/i in 1 to 5) // Clears the surroundings of the ore vent before starting wave defense.
 		for(var/turf/closed/mineral/rock in oview(i))
@@ -247,11 +251,6 @@
 		spawn_distance = 4, \
 		spawn_distance_exclude = 3, \
 	)
-	var/wave_timer = 60 SECONDS
-	if(boulder_size == BOULDER_SIZE_MEDIUM)
-		wave_timer = 90 SECONDS
-	else if(boulder_size == BOULDER_SIZE_LARGE)
-		wave_timer = 150 SECONDS
 	COOLDOWN_START(src, wave_cooldown, wave_timer)
 	addtimer(CALLBACK(src, PROC_REF(handle_wave_conclusion)), wave_timer)
 	icon_state = icon_state_tapped
@@ -290,6 +289,7 @@
 		icon_state = icon_state_tapped
 		update_appearance(UPDATE_ICON_STATE)
 		qdel(GetComponent(/datum/component/gps))
+		UnregisterSignal(node, COMSIG_QDELETING)
 	else
 		visible_message(span_danger("\the [src] creaks and groans as the mining attempt fails, and the vent closes back up."))
 		icon_state = initial(icon_state)
@@ -474,18 +474,22 @@
 	switch(string_boulder_size)
 		if(LARGE_VENT_TYPE)
 			boulder_size = BOULDER_SIZE_LARGE
+			wave_timer = WAVE_DURATION_LARGE
 			if(mapload)
 				GLOB.ore_vent_sizes["large"] += 1
 		if(MEDIUM_VENT_TYPE)
 			boulder_size = BOULDER_SIZE_MEDIUM
+			wave_timer = WAVE_DURATION_MEDIUM
 			if(mapload)
 				GLOB.ore_vent_sizes["medium"] += 1
 		if(SMALL_VENT_TYPE)
 			boulder_size = BOULDER_SIZE_SMALL
+			wave_timer = WAVE_DURATION_SMALL
 			if(mapload)
 				GLOB.ore_vent_sizes["small"] += 1
 		else
 			boulder_size = BOULDER_SIZE_SMALL //Might as well set a default value
+			wave_timer = WAVE_DURATION_SMALL
 			name = initial(name)
 
 
diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm
index ecd6f54d2557a..768bd22d2abe2 100644
--- a/code/game/objects/structures/maintenance.dm
+++ b/code/game/objects/structures/maintenance.dm
@@ -81,7 +81,7 @@ at the cost of risking a vicious bite.**/
 	if(critter_infested && prob(50) && iscarbon(user))
 		var/mob/living/carbon/bite_victim = user
 		var/obj/item/bodypart/affecting = bite_victim.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
-		to_chat(user, span_danger("You feel a sharp pain as an unseen creature sinks it's [pick("fangs", "beak", "proboscis")] into your arm!"))
+		to_chat(user, span_danger("You feel a sharp pain as an unseen creature sinks its [pick("fangs", "beak", "proboscis")] into your arm!"))
 		if(affecting?.receive_damage(30))
 			bite_victim.update_damage_overlays()
 			playsound(src,'sound/weapons/bite.ogg', 70, TRUE)
diff --git a/code/game/objects/structures/pinatas.dm b/code/game/objects/structures/pinatas.dm
index 63502f12ad5e2..6483d39b1a26c 100644
--- a/code/game/objects/structures/pinatas.dm
+++ b/code/game/objects/structures/pinatas.dm
@@ -89,3 +89,28 @@
 	desc = "A papier-mâché corgi that contains various candy and explosives, must be set up before you can smash it."
 	icon_state = "pinata_syndie"
 	pinata_type = /obj/structure/pinata/syndie
+
+/obj/structure/pinata/donk
+	name = "donk corgi pinata"
+	desc = "A papier-mâché representation of a corgi that contains all sorts of savory treats."
+	icon_state = "pinata_donk_placed"
+	base_icon_state = "pinata_donk_placed"
+	debris = /obj/effect/decal/cleanable/wrapping/pinata/donk
+	candy_options = list(
+		/obj/item/food/donkpocket/warm,
+		/obj/item/food/donkpocket/warm/pizza,
+		/obj/item/food/donkpocket/warm/honk,
+		/obj/item/food/donkpocket/warm/berry,
+		/obj/item/food/donkpocket/warm,
+		/obj/item/food/tatortot,
+		/obj/item/gun/ballistic/automatic/pistol/toy,
+		/obj/item/hot_potato/harmless/toy,
+		/obj/item/storage/box/donkpockets,
+		/obj/item/toy/plush/donkpocket,
+	)
+
+/obj/item/pinata/donk
+	name = "\improper Donk Co. pinata assembly kit"
+	desc = "A papier-mâché corgi that contains various foodstuff and toys, must be set up before you can smash it."
+	icon_state = "pinata_donk"
+	pinata_type = /obj/structure/pinata/donk
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 350adcb11f1ab..1ae66f2f82f19 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -4,7 +4,7 @@
 #define SHOWER_NORMAL_TEMP 300
 #define SHOWER_BOILING "boiling"
 #define SHOWER_BOILING_TEMP 400
-/// The volume of it's internal reagents the shower applies to everything it sprays.
+/// The volume of its internal reagents the shower applies to everything it sprays.
 #define SHOWER_SPRAY_VOLUME 5
 /// How much the volume of the shower's spay reagents are amplified by when it sprays something.
 #define SHOWER_EXPOSURE_MULTIPLIER 2 // Showers effectively double exposed reagents
@@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(shower_mode_descriptions, list(
 	var/reagent_capacity = 200
 	///How many units the shower refills every second.
 	var/refill_rate = 0.5
-	///Does the shower have a water recycler to recollect it's water supply?
+	///Does the shower have a water recycler to recollect its water supply?
 	var/has_water_reclaimer = TRUE
 	///Which mode the shower is operating in.
 	var/mode = SHOWER_MODE_UNTIL_EMPTY
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 546b6ad796827..895660fafa44c 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -228,75 +228,102 @@
 	if(istype(tool, /obj/item/construction/rcd))
 		return NONE
 
+	var/deck_act_value = NONE
 	if(istype(tool, /obj/item/toy/cards/deck))
-		var/obj/item/toy/cards/deck/dealer_deck = tool
-		if(HAS_TRAIT(dealer_deck, TRAIT_WIELDED)) // deal a card faceup on the table
-			var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
-			if(card)
-				card.Flip()
-				attackby(card, user, list2params(modifiers))
-			return ITEM_INTERACT_SUCCESS
+		deck_act_value = deck_act(user, tool, modifiers, TRUE)
+	// Continue to placing if we don't do anything else
+	if(deck_act_value != NONE)
+		return deck_act_value
 
-	return item_interaction(user, tool, modifiers)
+	if(!user.combat_mode)
+		return table_place_act(user, tool, modifiers)
+
+	return NONE
 
 /obj/structure/table/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+	. = NONE
 	if(istype(tool, /obj/item/storage/bag/tray))
-		var/obj/item/storage/bag/tray/tray = tool
-		if(tray.contents.len > 0) // If the tray isn't empty
-			for(var/obj/item/thing in tray.contents)
-				AfterPutItemOnTable(thing, user)
-			tool.atom_storage.remove_all(drop_location())
-			user.visible_message(span_notice("[user] empties [tool] on [src]."))
-			return ITEM_INTERACT_SUCCESS
-		// If the tray IS empty, continue on (tray will be placed on the table like other items)
+		. = tray_act(user, tool)
+	else if(istype(tool, /obj/item/toy/cards/deck))
+		. = deck_act(user, tool, modifiers, FALSE)
+	else if(istype(tool, /obj/item/riding_offhand))
+		. = riding_offhand_act(user, tool)
 
-	if(istype(tool, /obj/item/toy/cards/deck))
-		var/obj/item/toy/cards/deck/dealer_deck = tool
-		if(HAS_TRAIT(dealer_deck, TRAIT_WIELDED)) // deal a card facedown on the table
-			var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
-			if(card)
-				attackby(card, user, list2params(modifiers))
-			return ITEM_INTERACT_SUCCESS
-
-	if(istype(tool, /obj/item/riding_offhand))
-		var/obj/item/riding_offhand/riding_item = tool
-		var/mob/living/carried_mob = riding_item.rider
-		if(carried_mob == user) //Piggyback user.
-			return NONE
-		if(user.combat_mode)
-			user.unbuckle_mob(carried_mob)
-			tablelimbsmash(user, carried_mob)
-		else
-			var/tableplace_delay = 3.5 SECONDS
-			var/skills_space = ""
-			if(HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
-				tableplace_delay = 2 SECONDS
-				skills_space = " expertly"
-			else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY))
-				tableplace_delay = 2.75 SECONDS
-				skills_space = " quickly"
-
-			var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
-			if(istype(potential_spine))
-				tableplace_delay *= potential_spine.athletics_boost_multiplier
-
-			carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [src]..."),
-				span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [src]..."))
-			if(do_after(user, tableplace_delay, target = carried_mob))
-				user.unbuckle_mob(carried_mob)
-				tableplace(user, carried_mob)
-		return ITEM_INTERACT_SUCCESS
+	// Continue to placing if we don't do anything else
+	if(. != NONE)
+		return .
 
-	// Where putting things on tables is handled.
-	if(!user.combat_mode && !(tool.item_flags & ABSTRACT) && user.transferItemToLoc(tool, drop_location(), silent = FALSE))
-		//Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
-		tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
-		tool.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
-		AfterPutItemOnTable(tool, user)
-		return ITEM_INTERACT_SUCCESS
+	if(!user.combat_mode)
+		return table_place_act(user, tool, modifiers)
 
 	return NONE
 
+/obj/structure/table/proc/tray_act(mob/living/user, obj/item/storage/bag/tray/used_tray)
+	if(used_tray.contents.len <= 0)
+		return NONE // If the tray IS empty, continue on (tray will be placed on the table like other items)
+
+	for(var/obj/item/thing in used_tray.contents)
+		AfterPutItemOnTable(thing, user)
+	used_tray.atom_storage.remove_all(drop_location())
+	user.visible_message(span_notice("[user] empties [used_tray] on [src]."))
+	return ITEM_INTERACT_SUCCESS
+
+/obj/structure/table/proc/deck_act(mob/living/user, obj/item/toy/cards/deck/dealer_deck, list/modifiers, flip)
+	if(!HAS_TRAIT(dealer_deck, TRAIT_WIELDED))
+		return NONE
+
+	var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
+	if(isnull(card))
+		return ITEM_INTERACT_BLOCKING
+	if(flip)
+		card.Flip()
+	return table_place_act(user, card, modifiers)
+
+/obj/structure/table/proc/riding_offhand_act(mob/living/user, obj/item/riding_offhand/riding_item)
+	var/mob/living/carried_mob = riding_item.rider
+	if(carried_mob == user) //Piggyback user.
+		return NONE
+
+	if(user.combat_mode)
+		user.unbuckle_mob(carried_mob)
+		tablelimbsmash(user, carried_mob)
+		return ITEM_INTERACT_SUCCESS
+
+	var/tableplace_delay = 3.5 SECONDS
+	var/skills_space = ""
+	if(HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
+		tableplace_delay = 2 SECONDS
+		skills_space = " expertly"
+	else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY))
+		tableplace_delay = 2.75 SECONDS
+		skills_space = " quickly"
+
+	var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+	if(istype(potential_spine))
+		tableplace_delay *= potential_spine.athletics_boost_multiplier
+
+	carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [src]..."),
+		span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [src]..."))
+	if(!do_after(user, tableplace_delay, target = carried_mob))
+		return ITEM_INTERACT_BLOCKING
+	user.unbuckle_mob(carried_mob)
+	tableplace(user, carried_mob)
+	return ITEM_INTERACT_SUCCESS
+
+// Where putting things on tables is handled.
+/obj/structure/table/proc/table_place_act(mob/living/user, obj/item/tool, list/modifiers)
+	if(tool.item_flags & ABSTRACT)
+		return NONE
+	if(!user.transferItemToLoc(tool, drop_location(), silent = FALSE))
+		return ITEM_INTERACT_BLOCKING
+	// Items are centered by default, but we move them if click ICON_X and ICON_Y are available
+	if(LAZYACCESS(modifiers, ICON_X) && LAZYACCESS(modifiers, ICON_Y))
+		// Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+		tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size*0.5), world.icon_size*0.5)
+		tool.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size*0.5), world.icon_size*0.5)
+	AfterPutItemOnTable(tool, user)
+	return ITEM_INTERACT_SUCCESS
+
 /obj/structure/table/proc/AfterPutItemOnTable(obj/item/thing, mob/living/user)
 	return
 
@@ -823,7 +850,7 @@
 	layer = TABLE_LAYER
 	density = TRUE
 	anchored = TRUE
-	pass_flags_self = LETPASSTHROW //You can throw objects over this, despite it's density.
+	pass_flags_self = LETPASSTHROW //You can throw objects over this, despite its density.
 	max_integrity = 20
 
 /obj/structure/rack/skeletal
diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm
index 24cb2e806965f..878dab578a52e 100644
--- a/code/game/objects/structures/water_structures/sink.dm
+++ b/code/game/objects/structures/water_structures/sink.dm
@@ -14,7 +14,7 @@
 	var/buildstacktype = /obj/item/stack/sheet/iron
 	///Number of sheets of material to drop when broken or deconstructed.
 	var/buildstackamount = 1
-	///Does the sink have a water recycler to recollect it's water supply?
+	///Does the sink have a water recycler to recollect its water supply?
 	var/has_water_reclaimer = TRUE
 	///Units of water to reclaim per second
 	var/reclaim_rate = 0.5
diff --git a/code/game/objects/structures/water_structures/water_source.dm b/code/game/objects/structures/water_structures/water_source.dm
index b7ad26a65ea7e..e06cd8c6771ef 100644
--- a/code/game/objects/structures/water_structures/water_source.dm
+++ b/code/game/objects/structures/water_structures/water_source.dm
@@ -137,6 +137,15 @@
 	base_icon_state = "puddle"
 	resistance_flags = UNACIDABLE
 
+/obj/structure/water_source/puddle/Initialize(mapload)
+	. = ..()
+	register_context()
+
+/obj/structure/water_source/puddle/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(isnull(held_item))
+		context[SCREENTIP_CONTEXT_RMB] = "Scoop Tadpoles"
+
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 /obj/structure/water_source/puddle/attack_hand(mob/user, list/modifiers)
 	icon_state = "[base_icon_state]-splash"
@@ -147,3 +156,20 @@
 	icon_state = "[base_icon_state]-splash"
 	. = ..()
 	icon_state = base_icon_state
+
+/obj/structure/water_source/puddle/attack_hand_secondary(mob/living/carbon/human/user, list/modifiers)
+	. = ..()
+	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+		return
+	if(DOING_INTERACTION_WITH_TARGET(user, src))
+		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+	icon_state = "[base_icon_state]-splash"
+	balloon_alert(user, "scooping tadpoles...")
+	if(do_after(user, src, 5 SECONDS))
+		playsound(loc, 'sound/effects/slosh.ogg', 15, TRUE)
+		balloon_alert(user, "got a tadpole")
+		var/obj/item/fish/tadpole/tadpole = new(loc)
+		tadpole.randomize_size_and_weight()
+		user.put_in_hands(tadpole)
+	icon_state = base_icon_state
+	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 6c41b2f8b157d..b2b3ee50df64c 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -35,6 +35,8 @@
 	var/bloodied = FALSE
 	///Datum that the shard and debris type is pulled from for when the glass is broken.
 	var/datum/material/glass_material_datum = /datum/material/glass
+	/// Whether or not we're disappearing but dramatically
+	var/dramatically_disappearing = FALSE
 
 /datum/armor/structure_window
 	melee = 50
@@ -428,6 +430,36 @@
 
 	return TRUE
 
+/obj/structure/window/proc/temporary_shatter(time_to_go = 1 SECONDS, time_to_return = 4 SECONDS, take_grill = TRUE)
+	if(dramatically_disappearing)
+		return
+
+	// do a cute breaking animation
+	var/static/time_interval = 2 DECISECONDS //per how many steps should we do damage?
+	for(var/damage_step in 1 to (floor(time_to_go / time_interval) - 1)) //10 ds / 2 ds = 5 damage steps, minus 1 so we dont actually break it
+		// slowly drain our total health for the illusion of shattering
+		addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, take_damage), floor(atom_integrity / (time_to_go / time_interval))), time_interval * damage_step)
+
+	//dissapear in 1 second
+	dramatically_disappearing = TRUE
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), loc, break_sound, 70, TRUE), time_to_go) //SHATTER SOUND
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
+
+	// come back in 1 + 4 seconds
+	addtimer(VARSET_CALLBACK(src, atom_integrity, atom_integrity), time_to_go + time_to_return) //set the health back (icon is updated on move)
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys
+	addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_to_go + time_to_return)
+
+	var/obj/structure/grille/grill = take_grill ? (locate(/obj/structure/grille) in loc) : null
+	if(grill)
+		grill.temporary_shatter(time_to_go, time_to_return)
+
+/obj/structure/window/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+	. = ..()
+	if(loc)
+		update_nearby_icons()
+
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/spawner, 0)
 
 /obj/structure/window/unanchored
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index 4b5e51b8f3b72..b22da7880d73e 100644
--- a/code/game/turfs/closed/indestructible.dm
+++ b/code/game/turfs/closed/indestructible.dm
@@ -180,6 +180,9 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
 	smoothing_groups = SMOOTH_GROUP_ABDUCTOR_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
 	canSmoothWith = SMOOTH_GROUP_ABDUCTOR_WALLS
 
+/turf/closed/indestructible/alien/nodiagonal
+	icon_state = "abductor_wall-15"
+	smoothing_flags = SMOOTH_BITMASK
 
 /turf/closed/indestructible/cult
 	name = "runed metal wall"
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 3ec5ee06e581f..f6e6627eff5f8 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -276,7 +276,7 @@
 /turf/closed/mineral/random
 	/// What are the base odds that this turf spawns a mineral in the wall on initialize?
 	var/mineralChance = 13
-	/// Does this mineral determine it's random chance and mineral contents based on proximity to a vent? Overrides mineralChance and mineralAmt.
+	/// Does this mineral determine its random chance and mineral contents based on proximity to a vent? Overrides mineralChance and mineralAmt.
 	var/proximity_based = FALSE
 
 /// Returns a list of the chances for minerals to spawn.
diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm
index cf28cdc3a4631..d0234b826a219 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
 /turf/open/misc/asteroid/basalt/refill_dug()
 	. = ..()
 	GLOB.dug_up_basalt -= src
-	set_basalt_light(src)
+	set_basalt_light()
 
 /turf/open/misc/asteroid/basalt/lava //lava underneath
 	baseturfs = /turf/open/lava/smooth
@@ -162,14 +162,14 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
 
 /turf/open/misc/asteroid/basalt/Initialize(mapload)
 	. = ..()
-	set_basalt_light(src)
+	set_basalt_light()
 
-/proc/set_basalt_light(turf/open/floor/B)
-	switch(B.icon_state)
+/turf/open/misc/asteroid/basalt/proc/set_basalt_light()
+	switch(icon_state)
 		if("basalt1", "basalt2", "basalt3")
-			B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light
+			set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA) //more light
 		if("basalt5", "basalt9")
-			B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything!
+			set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA) //barely anything!
 
 ///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
 
diff --git a/code/game/turfs/open/basalt.dm b/code/game/turfs/open/basalt.dm
index e52a6053a6efe..e1a423d3c47f6 100644
--- a/code/game/turfs/open/basalt.dm
+++ b/code/game/turfs/open/basalt.dm
@@ -11,7 +11,11 @@
 	AddElement(/datum/element/diggable, /obj/item/stack/ore/glass/basalt, 2)
 	if(prob(15))
 		icon_state = "basalt[rand(0, 12)]"
-		set_basalt_light(src)
+		switch(icon_state)
+			if("basalt1", "basalt2", "basalt3")
+				set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+			if("basalt5", "basalt9")
+				set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
 
 /turf/open/misc/basalt/safe
 	planetary_atmos = FALSE
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index e672b7f7294fa..370d65b92865e 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -242,7 +242,11 @@
 	AddElement(/datum/element/diggable, /obj/item/stack/ore/glass/basalt, 2, worm_chance = 0)
 	if(prob(15))
 		icon_state = "basalt[rand(0, 12)]"
-		set_basalt_light(src)
+		switch(icon_state)
+			if("basalt1", "basalt2", "basalt3")
+				set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+			if("basalt5", "basalt9")
+				set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
 
 /turf/open/floor/carpet
 	name = "carpet"
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index 7c4428c4823ec..a3915e14cabb8 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -17,12 +17,17 @@
 /turf/open/floor/circuit/Initialize(mapload)
 	SSmapping.nuke_tiles += src
 	RegisterSignal(loc, COMSIG_AREA_POWER_CHANGE, PROC_REF(handle_powerchange))
-	handle_powerchange(loc)
+	var/area/cur_area = get_area(src)
+	if (!isnull(cur_area))
+		handle_powerchange(cur_area, TRUE)
 	. = ..()
 
 /turf/open/floor/circuit/Destroy()
 	SSmapping.nuke_tiles -= src
 	UnregisterSignal(loc, COMSIG_AREA_POWER_CHANGE)
+	var/area/cur_area = get_area(src)
+	if(on && !isnull(cur_area))
+		cur_area.removeStaticPower(CIRCUIT_FLOOR_POWERUSE, AREA_USAGE_STATIC_LIGHT)
 	return ..()
 
 /turf/open/floor/circuit/update_appearance(updates)
@@ -47,7 +52,7 @@
 	handle_powerchange(new_area)
 
 /// Enables/disables our lighting based off our source area
-/turf/open/floor/circuit/proc/handle_powerchange(area/source)
+/turf/open/floor/circuit/proc/handle_powerchange(area/source, mapload = FALSE)
 	SIGNAL_HANDLER
 	var/old_on = on
 	if(always_off)
@@ -59,7 +64,7 @@
 
 	if(on)
 		source.addStaticPower(CIRCUIT_FLOOR_POWERUSE, AREA_USAGE_STATIC_LIGHT)
-	else
+	else if (!mapload)
 		source.removeStaticPower(CIRCUIT_FLOOR_POWERUSE, AREA_USAGE_STATIC_LIGHT)
 	update_appearance()
 
diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm
index 893942fc49c52..e0fe7e842b941 100644
--- a/code/game/turfs/open/planet.dm
+++ b/code/game/turfs/open/planet.dm
@@ -78,6 +78,9 @@
 /turf/open/misc/grass/jungle/lavaland
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 
+/turf/open/misc/grass/jungle/station
+	baseturfs = /turf/open/misc/dirt/station
+
 /turf/closed/mineral/random/jungle
 	baseturfs = /turf/open/misc/dirt/dark/jungle
 
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 10165f869174f..b0493ce0a8ad4 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -3,6 +3,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
 /// Any floor or wall. What makes up the station and the rest of the map.
 /turf
 	icon = 'icons/turf/floors.dmi'
+	datum_flags = DF_STATIC_OBJECT
 	vis_flags = VIS_INHERIT_ID // Important for interaction with and visualization of openspace.
 	luminosity = 1
 	light_height = LIGHTING_HEIGHT_FLOOR
diff --git a/code/game/world.dm b/code/game/world.dm
index 9e57dbba343c5..b7de61e8c93e5 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -339,7 +339,6 @@ GLOBAL_VAR(restart_counter)
 	#endif
 
 /world/proc/auxcleanup()
-	AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)
 		call_ext(debug_server, "auxtools_shutdown")()
@@ -472,6 +471,7 @@ GLOBAL_VAR(restart_counter)
 
 /world/proc/on_tickrate_change()
 	SStimer?.reset_buckets()
+	DREAMLUAU_SET_EXECUTION_LIMIT_MILLIS(tick_lag * 100)
 
 /world/proc/init_byond_tracy()
 	var/library
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index fa1b832ecc31a..52c9c65e5b917 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,6 +1,6 @@
 //Blocks an attempt to connect before even creating our client datum thing.
 
-//How many new ckey matches before we revert the stickyban to it's roundstart state
+//How many new ckey matches before we revert the stickyban to its roundstart state
 //These are exclusive, so once it goes over one of these numbers, it reverts the ban
 #define STICKYBAN_MAX_MATCHES 15
 #define STICKYBAN_MAX_EXISTING_USER_MATCHES 3 //ie, users who were connected before the ban triggered
diff --git a/code/modules/admin/outfit_manager.dm b/code/modules/admin/outfit_manager.dm
index f3ef7d2685c22..c5f14db8ae3e8 100644
--- a/code/modules/admin/outfit_manager.dm
+++ b/code/modules/admin/outfit_manager.dm
@@ -7,9 +7,6 @@ ADMIN_VERB(outfit_manager, R_DEBUG|R_ADMIN, "Outfit Manager", "View and edit out
 /datum/outfit_manager/ui_state(mob/user)
 	return GLOB.admin_state
 
-/datum/outfit_manager/ui_close(mob/user)
-	qdel(src)
-
 /datum/outfit_manager/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
diff --git a/code/modules/admin/smites/supply_pod_quick.dm b/code/modules/admin/smites/supply_pod_quick.dm
index 6012e84ccac43..f222857860e39 100644
--- a/code/modules/admin/smites/supply_pod_quick.dm
+++ b/code/modules/admin/smites/supply_pod_quick.dm
@@ -37,7 +37,7 @@
 	podspawn(list(
 		"target" = get_turf(target),
 		"path" = /obj/structure/closet/supplypod/centcompod,
-		"style" = STYLE_CENTCOM,
+		"style" = /datum/pod_style/centcom,
 		"spawn" = target_path,
 		"damage" = SUPPLY_POD_QUICK_DAMAGE,
 		"explosionSize" = list(0, 0, 0, SUPPLY_POD_QUICK_FIRE_RANGE),
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index 9a713588abd6d..74955324dffd4 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -396,6 +396,7 @@
 				ROLE_SYNDICATE,
 				ROLE_TRAITOR,
 				ROLE_WIZARD,
+				ROLE_VOIDWALKER,
 			),
 		)
 		for(var/department in long_job_lists)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index e5f6c8b5f4260..1a3cf0468c6d7 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1722,6 +1722,16 @@
 		if(!paper_to_show)
 			return
 		paper_to_show.ui_interact(usr)
+
+	else if (href_list["print_fax"])
+		if(!check_rights(R_ADMIN))
+			return
+
+		for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
+			if(!is_centcom_level(FAX.z))
+				continue
+
+			FAX.receive(locate(href_list["print_fax"]), href_list["fax_name"])
 	else if(href_list["play_internet"])
 		if(!check_rights(R_SOUND))
 			return
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index bc74347475ae9..1305e5a660d6e 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -51,6 +51,9 @@
 /proc/_get_step(Ref, Dir)
 	return get_step(Ref, Dir)
 
+/proc/_hascall(object, procname)
+	return hascall(object, procname)
+
 /proc/_hearers(Depth = world.view, Center = usr)
 	return hearers(Depth, Center)
 
diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm
index 0e1e6809daae0..57311446961ed 100644
--- a/code/modules/admin/verbs/admingame.dm
+++ b/code/modules/admin/verbs/admingame.dm
@@ -361,7 +361,7 @@ ADMIN_VERB(combo_hud, R_ADMIN, "Toggle Combo HUD", "Toggles the Admin Combo HUD.
 
 	combo_hud_enabled = TRUE
 
-	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED))
+	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC, DATA_HUD_BOT_PATH))
 		var/datum/atom_hud/atom_hud = GLOB.huds[hudtype]
 		atom_hud.show_to(mob)
 
@@ -377,7 +377,7 @@ ADMIN_VERB(combo_hud, R_ADMIN, "Toggle Combo HUD", "Toggles the Admin Combo HUD.
 
 	combo_hud_enabled = FALSE
 
-	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED))
+	for (var/hudtype in list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC, DATA_HUD_BOT_PATH))
 		var/datum/atom_hud/atom_hud = GLOB.huds[hudtype]
 		atom_hud.hide_from(mob)
 
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 0e8053c7ab06e..8540ff99e5733 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -246,7 +246,7 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM
 			request = "[request] an Administrator."
 		else
 			request = "[request] [recipient_print_key]."
-		//get message text, limit it's length.and clean/escape html
+		//get message text, limit its length.and clean/escape html
 		msg = input(src,"Message:", request) as message|null
 		msg = trim(msg)
 
diff --git a/code/modules/admin/verbs/anonymousnames.dm b/code/modules/admin/verbs/anonymousnames.dm
index ad38615d8bed6..88b28e647d1c8 100644
--- a/code/modules/admin/verbs/anonymousnames.dm
+++ b/code/modules/admin/verbs/anonymousnames.dm
@@ -268,7 +268,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
 	set_station_name("[pick(GLOB.first_names)] [pick(GLOB.last_names)]")
 
 /datum/anonymous_theme/station/announce_to_all_players()
-	priority_announce("Подтверджена ошибка реальности 9 уровня угрозы возле [station_name()]. Все сотрудники должны изо всех сил стараться продолжать работу, чтобы случайно не спровоцировать новые проблемы с реальностью.", "Отдел паранормальных явлений Центрального Коммандования", 'sound/misc/notice1.ogg')
+	priority_announce("Подтверджена ошибка реальности 9 уровня угрозы возле [station_name()]. Все сотрудники должны изо всех сил стараться продолжать работу, чтобы случайно не спровоцировать новые проблемы с реальностью.", "Отдел паранормальных явлений Центрального Командования", 'sound/misc/notice1.ogg')
 
 /datum/anonymous_theme/station/anonymous_name(mob/target)
 	return new_station_name()
diff --git a/code/modules/admin/verbs/lua/README.md b/code/modules/admin/verbs/lua/README.md
index 707184d4d772b..9b9bfbe05f93f 100644
--- a/code/modules/admin/verbs/lua/README.md
+++ b/code/modules/admin/verbs/lua/README.md
@@ -1,150 +1,225 @@
-# Auxlua
+# Objects
 
----
+Datums, lists, typepaths, static appearances, and some other objects are represented in Luau as userdata. Certain operations can be performed on these types of objects.
 
-## Datums
+## Common metamethods
 
-DM datums are treated as lua userdata, and can be stored in fields. Due to fundamental limitations in lua, userdata is inherently truthy. Since datum userdata can correspond to a deleted datum, which would evaluate to `null` in DM, the function [`datum:is_null()`](#datumisnull) is provided to offer a truthiness test consistent with DM.
+The following metamethods are defined for all objects.
 
-Keep in mind that BYOND can't see that a datum is referenced in a lua field, and will garbage collect it if it is not referenced anywhere in DM.
+### \_\_tostring(): string
 
-### datum:get_var(var)
+Returns the string representation of the object. This uses BYOND's internal string conversion function.
 
-Equivalent to DM's `datum.var`
+### \_\_eq(other: any): boolean
 
-### datum:set_var(var, value)
+Compare the equality of two objects. While passing the same object into luau twice will return two references to the same userdata, some DM projects may override the equality operator using an `__operator==` proc definition.
 
-Equivalent to DM's `datum.var = value`
+## Datum-like Objects
 
-### datum:call_proc(procName, ...)
+Datum-like objects include datums themselves, clients (if they have not been redefined to be children of `/datum`), static appearances, and the world.
 
-Equivalent to DM's `datum.procName(...)`
+### \_\_index(index: string): any
 
-### datum:is_null()
+Access the member specified by `index`.
 
-This function is used to evaluate the truthiness of a DM var. The lua statement `if datum:is_null() then` is equivalent to the DM statement `if(datum)`.
+If `index` is a valid var for the object, the index operation will return that var's value.
+If the var getting wrapper proc is set, the operation will instead call that proc with the arguments `(object, index)`.
 
-### datum.vars
+For objects other than static appearances, if `index` is a valid proc for the object, the operation will return a wrapper for that proc that can be invoked using call syntax (e.g. `object:proc(...arguments)`). If the object proc calling wrapper is set, calling the returned function will instead call the wrapper proc with the arguments `(object, proc, {...arguments})`. Note that vars will be shadowed by procs with the same name. To work around this, use the `dm.get_var` function.
 
-Returns a userdatum that allows you to access and modifiy the vars of a DM datum by index. `datum.vars.foo` is equivalent to `datum:get_var("foo")`, while `datum.vars.foo = bar` is equivalent to `datum:set_var("foo", bar)`
+### \_\_newindex(index: string, value: any): ()
 
----
+Set the var specified by `index` to `value`, if that var exists on the object.
+
+If the var setting wrapper proc is set, the operation will instead call that proc with the arguments `(object, index, value)`.
 
 ## Lists
 
-In order to allow lists to be modified in-place across the DM-to-lua language barrier, lists are treated as userdata. Whenever running code that expects a DM value, auxlua will attempt to convert tables into lists.
+Lists are syntactically similar to tables, with one crucial difference.
+Unlike tables, numeric indices must be non-zero integers within the bounds of the list.
+
+### \_\_index(index: any): any
+
+Read the list at `index`. This works both for numeric indices and assoc keys.
+Vars lists cannot be directly read this way if the var getting wrapper proc is set.
+
+### \_\_newindex(index: any, value: any): any
+
+Write `value` to the list at `index`. This works both for writing numeric indices and assoc keys.
+Vars lists cannot be directly written this way if the var setting wrapper proc is set.
+
+### \_\_len(): integer
+
+Returns the length of the list, similarly to the `length` builtin in DM.
+
+### Iteration
+
+Lists support Luau's generalized iteration. Iteration this way returns pairs of numeric indices and list values.
+For example, the statement `for _, v in L do` is logically equivalent to the DM statement `for(var/v in L)`.
+
+# Global Fields and Modules
+
+In addition to the full extent of Luau's standard library modules, some extra functions and modules have been added.
+
+## Global-Level Fields
+
+### sleep(): ()
+
+Yields the active thread, without worrying about passing data into or out of the state.
+
+Threads yielded this way are placed at the end of a queue. Call the `awaken` hook function from DM to execute the thread at the front of the queue.
+
+### loadstring(code: string): function
+
+Luau does not inherently include the `loadstring` function common to a number of other versions of lua. This is an effective reimplementation of `loadstring`.
+
+### print(...any): ()
+
+Calls the print wrapper with the passed in arguments.
+Raises an error if no print wrapper is set, as that means there is nothing to print with.
+
+### \_state_id: integer
+
+The handle to the underlying luau state in the dreamluau binary.
+
+## \_exec
+
+The `_exec` module includes volatile fields related to the current execution context.
+
+### \_next_yield_index: integer
+
+When yielding a thread with `coroutine.yield`, it will be inserted into an internal table at the first open integer index.
+This field corresponds to that first open integer index.
+
+### \_limit: integer?
+
+If set, the execution limit, rounded to the nearest millisecond.
+
+### \_time: integer
+
+The length of successive time luau code has been executed, including recursive calls to DM and back into luau, rounded to the nearest millisecond.
+
+## dm
 
-List references are subject to the same limitations as datum userdata, but you are less likely to encounter these limitations for regular lists.
+The `dm` module includes fields and functions for basic interaction with DM.
 
-Some lists (`vars`, `contents`, `overlays`, `underlays`, `vis_contents`, and `vis_locs`) are inherently attached to datums, and as such, their corresponding userdata contains a weak reference to the containing datum. Use [`list:is_null`](#listisnull) to validate these types of lists.
+### world: userdata
 
-### list.len
+A static reference to the DM `world`.
 
-Equivalent to DM's `list.len`
+### global_vars: userdata
 
-### list:get(index)
+A static reference that functions like the DM keyword `global`. This can be indexed to read/write global vars.
 
-Equivalent to DM's `list[index]`
+### global_procs: table
 
-### list:set(index, value)
+A table that can be indexed by string for functions that wrap global procs.
 
-Equivalent to DM's `list[index] = value`
+Due to BYOND limitations, attempting to index an invalid proc returns a function logically equivalent to a no-op.
 
-### list:add(value)
+### get_var(object: userdata, var: string): function
 
-Equivalent to DM's `list.Add(value)`
+Reads the var `var` on `object`. This function can be used to get vars that are shadowed by procs declared with the same name.
 
-### list:remove(value)
+### new(path: string, ...any): userdata
 
-Equivalent to DM's `list.Remove(value)`
+Creates an instance of the object specified by `path`, with `...` as its arguments.
+If the "new" wrapper is set, that proc will be called instead, with the arguments `(path, {...})`.
 
-### list:to_table()
+### is_valid_ref(ref: any): boolean
 
-Converts a DM list into a lua table.
+Returns true if the value passed in corresponds to a valid reference-counted DM object.
 
-### list:of_type(type_path)
+### usr: userdata?
 
-Will extract only values of type `type_path`.
+Corresponds to the DM var `usr`.
 
-### list:is_null()
+## list
 
-A similar truthiness test to [`datum:is_null()`](#datumisnull). This function only has the possibility of returning `false` for lists that are inherently attached to a datum (`vars`, `contents`, `overlays`, `underlays`, `vis_contents`, and `vis_locs`).
+The `list` module contains wrappers for the builtin list procs, along with several other utility functions for working with lists.
 
-### list.entries
+### add(list: userdata, ...any): ()
 
-Returns a userdatum that allows you to access and modifiy the entries of the list by index. `list.entries.foo` is equivalent to `list:get("foo")`, while `list.entries.foo = bar` is equivalent to `list:set("foo", bar)`
+Logically equivalent to the DM statement `list.Add(...)`.
 
----
+### copy(list: userdata, start?: integer, end?: integer): userdata
 
-## The dm table
+Logically equivalent to the DM statement `list.Copy(start, end)`.
 
-The `dm` table consists of the basic hooks into the DM language.
+### cut(list: userdata, start?: integer, end?: integer): userdata
 
-### dm.state_id
+Logically equivalent to the DM statement `list.Cut(start, end)`.
 
-The address of the lua state in memory. This is a copy of the internal value used by auxlua to locate the lua state in a global hash map. `state_id` is a registry value that is indirectly obtained using the `dm` table's `__index` metamethod.
+### find(list: userdata, item: any, start?: integer, end?: integer): integer
 
-### dm.global_proc(proc, ...)
-Calls the global proc `/proc/[proc]` with `...` as its arguments.
+Logically equivalent to the DM statement `list.Find(item, start, end)`.
 
-### dm.world
-A reference to DM's `world`, in the form of datum userdata. This reference is always valid, since `world` always exists.
+### insert(list: userdata, index: integer, ...any): integer
 
-Due to limitations inherent in the wrapper functions used on tgstation, `world:set_var` and `world:call_proc` will raise an error.
+Logically equivalent to the DM statement `list.Insert(item, ...)`.
 
-### dm.global_vars
-A reference to DM's `global`, in the form of datum userdata. Subject to the same limitations as `dm.world`
+### join(list: userdata, glue: string, start?: integer, end?: integer): string
 
-### dm.usr
-A weak reference to DM's `usr`. As a rule of thumb, this is a reference to the mob of the client who triggered the chain of procs leading to the execution of Lua code. The following is a list of what `usr` is for the most common ways of executing Lua code:
-- For resumes and awakens, which are generally executed by the MC, `usr` is (most likely) null.
-- `SS13.wait` queues a resume, which gets executed by the MC. Therefore, `usr` is null after `SS13.wait` finishes.
-- For chunk loads, `usr` is generally the current mob of the admin that loaded that chunk.
-- For function calls done from the Lua editor, `usr` is the current mob of the admin calling the function.
-- `SS13.register_signal` creates a `/datum/callback` that gets executed by the `SEND_SIGNAL` macro for the corresponding signal. As such, `usr` is the mob that triggered the chain of procs leading to the invocation of `SEND_SIGNAL`.
+Logically equivalent to the statement `list.Join(glue, start, end)`.
 
----
+### remove(list: userdata, ...any): integer
 
-## Execution Limit
+Logically equivalent to the DM statement `list.Remove(...)`.
 
-In order to prevent freezing the server with infinite loops, auxlua enforces an execution limit, defaulting to 100ms. When a single lua state has been executing for longer than this limit, it will eventually stop and produce an error.
+### remove_all(list: userdata, ...any): integer
 
-To avoid exceeding the execution limit, call `sleep()` or `coroutine.yield()` before the execution limit is reached.
+Logically equivalent to the DM statement `list.RemoveAll(...)`.
 
-### over_exec_usage(fraction = 0.95)
+### splice(list: userdata, start?: integer, end?: integer, ...any): ()
 
-This function returns whether the current run of the Lua VM has executed for longer than the specified fraction of the execution limit. You can use this function to branch to a call to `sleep()` or `coroutine.yield()` to maximize the amount of work done in a single run of the Lua VM. If nil, `fraction` will default to 0.95, otherwise, it will be clamped to the range \[0, 1\].
+Logically equivalent to the DM statement `list.Splice(start, end, ...)`.
 
----
+### swap(list: userdata, index_1: integer, index_2: integer): ()
 
-## Task management
-The Lua Scripting subsystem manages the execution of tasks for each Lua state. A single fire of the subsystem behaves as follows:
-- All tasks that slept since the last fire are resumed in the order they slept.
-- For each queued resume, the corresponding task is resumed.
+Logically equivalent to the DM statement `list.Swap(index_1, index_2)`.
 
-### sleep()
-Yields the current thread, scheduling it to be resumed during the next fire of SSlua. Use this function to prevent your Lua code from exceeding its allowed execution duration. Under the hood, `sleep` performs the following:
+### to_table(list: userdata, deep?: boolean): table
 
-- Sets the [`sleep_flag`](#sleep_flag)
-- Calls `coroutine.yield()`
-- Clears the sleep flag when determining whether the task slept or yielded
-- Ignores the return values of `coroutine.yield()` once resumed
+Creates a table that is a copy of `list`. If `deep` is true, `to_table` will be called on any lists inside that list.
 
----
+### from_table(table: table): userdata
 
-## The SS13 package
+Creates a list that is a copy of `table`. This is not strictly necessary, as tables are automatically converted to lists when passed back into DM, using the same internal logic as `from_table`.
+
+### filter(list: userdata, path: string): userdata
+
+Returns a copy of `list`, containing only elements that are objects descended from `path`.
+
+## pointer
+
+The `pointer` module contains utility functions for interacting with pointers.
+Keep in mind that passing DM pointers into luau and manipulating them in this way can bypass wrapper procs.
+
+### read(pointer: userdata): any
+
+Gets the underlying data the pointer references.
+
+### write(pointer: userdata, value: any): ()
+
+Writes `value` to the underlying data the pointer references.
+
+### unwrap(possible_pointer: any): any
+
+If `possible_pointer` is a pointer, reads it. Otherwise, it is returned as-is.
+
+# The SS13 package
 The `SS13` package contains various helper functions that use code specific to tgstation.
 
-### SS13.state
+## SS13.state
 A reference to the state datum (`/datum/lua_state`) handling this Lua state.
 
-### SS13.get_runner_ckey()
+## SS13.get_runner_ckey()
 The ckey of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping.
 
-### SS13.get_runner_client()
+## SS13.get_runner_client()
 Returns the client of the user who ran the lua script in the current context. Can be unreliable if accessed after sleeping.
 
-### SS13.global_proc
+## SS13.global_proc
 A wrapper for the magic string used to tell `WrapAdminProcCall` to call a global proc.
 For instance, `/datum/callback` must be instantiated with `SS13.global_proc` as its first argument to specify that it will be invoking a global proc.
 The following example declares a callback which will execute the global proc `to_chat`:
@@ -152,25 +227,18 @@ The following example declares a callback which will execute the global proc `to
 local callback = SS13.new("/datum/callback", SS13.global_proc, "to_chat", dm.world, "Hello World")
 ```
 
-### SS13.istype(thing, type)
+## SS13.istype(thing, type)
 Equivalent to the DM statement `istype(thing, text2path(type))`.
 
-### SS13.new(type, ...)
-Instantiates a datum of type `type` with `...` as the arguments passed to `/proc/_new`
-The following example spawns a singularity at the caller's current turf:
-```lua
-SS13.new("/obj/singularity", dm.global_proc("_get_step", dm.usr, 0))
-```
-
-### SS13.new_untracked(type, ...)
-Works exactly like SS13.new but it does not store the value to the lua state's `references` list variable. This means that the variable could end up deleted if nothing holds a reference to it. 
+## SS13.new(type, ...)
+An alias for `dm.new`
 
-### SS13.is_valid(datum)
+## SS13.is_valid(datum)
 Can be used to determine if the datum passed is not nil, not undefined and not qdel'd all in one. A helper function that allows you to check the validity from only one function.
 Example usage:
 ```lua
 local datum = SS13.new("/datum")
-dm.global_proc("qdel", datum)
+dm.global_procs.qdel(datum)
 print(SS13.is_valid(datum)) -- false
 
 local null = nil
@@ -180,13 +248,13 @@ local datum = SS13.new("/datum")
 print(SS13.is_valid(datum)) -- true
 ```
 
-### SS13.type(string)
-Converts a string into a type. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")`
+## SS13.type(string)
+Converts a string into a typepath. Equivalent to doing `dm.global_proc("_text2path", "/path/to/type")`
 
-### SS13.qdel(datum)
+## SS13.qdel(datum)
 Deletes a datum. You shouldn't try to reference it after calling this function. Equivalent to doing `dm.global_proc("qdel", datum)`
 
-### SS13.await(thing_to_call, proc_to_call, ...)
+## SS13.await(thing_to_call, proc_to_call, ...)
 Calls `proc_to_call` on `thing_to_call`, with `...` as its arguments, and sleeps until that proc returns.
 Returns two return values - the first is the return value of the proc, and the second is the message of any runtime exception thrown by the called proc.
 The following example calls and awaits the return of `poll_ghost_candidates`:
@@ -194,59 +262,59 @@ The following example calls and awaits the return of `poll_ghost_candidates`:
 local ghosts, runtime = SS13.await(SS13.global_proc, "poll_ghost_candidates", "Would you like to be considered for something?")
 ```
 
-### SS13.wait(time, timer)
+## SS13.wait(time, timer)
 Waits for a number of **seconds** specified with the `time` argument. You can optionally specify a timer subsystem using the `timer` argument.
 
 Internally, this function creates a timer that will resume the current task after `time` seconds, then yields the current task by calling `coroutine.yield` with no arguments and ignores the return values. If the task is prematurely resumed, the timer will be safely deleted.
 
-### SS13.register_signal(datum, signal, func, make_easy_clear_function)
+## SS13.register_signal(datum, signal, func)
 Registers the Lua function `func` as a handler for `signal` on `datum`.
 
 Like with signal handlers written in DM, Lua signal handlers should not sleep (either by calling `sleep` or `coroutine.yield`).
 
-If `make_easy_clear_function` is truthy, a member function taking no arguments will be created in the `SS13` table to easily unregister the signal handler.
-
-This function returns the `/datum/callback` created to call `func` from DM.
+This function returns whether the signal registration was successful.
 
 The following example defines a function which will register a signal that makes `target` make a honking sound any time it moves:
 ```lua
 function honk(target)
 	SS13.register_signal(target, "movable_moved", function(source)
-		dm.global_proc("playsound", target, "sound/items/bikehorn.ogg", 100, true)
+		dm.global_procs.playsound(target, "sound/items/bikehorn.ogg", 100, true)
 	end)
 end
 ```
 
-### SS13.unregister_signal(datum, signal, callback)
-Unregister a signal previously registered using `SS13.register_signal`. `callback` should be a `datum/callback` previously returned by `SS13.register_signal`. If `callback` is not specified, **ALL** signal handlers registered on `datum` for `signal` will be unregistered.
+NOTE: if `func` is an anonymous function declared inside the call to `SS13.register_signal`, it cannot be referenced in order to unregister that signal with `SS13.unregister_signal`
 
-### SS13.set_timeout(time, func)
+## SS13.unregister_signal(datum, signal, func)
+Unregister a signal previously registered using `SS13.register_signal`. `func` must be a function for which a handler for the specified signal has already been registered. If `func` is `nil`, all handlers for that signal will be unregistered.
+
+## SS13.set_timeout(time, func)
 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Unlike `SS13.wait`, `SS13.set_timeout` does not yield or sleep the current task, making it suitable for use in signal handlers for `SS13.register_signal`
 
 The following example will output a message to chat after 5 seconds:
 ```lua
 SS13.set_timeout(5, function()
-	dm.global_proc("to_chat", dm.world, "Hello World!")
+	dm.global_procs.to_chat(dm.world, "Hello World!")
 end)
 ```
 
-### SS13.start_loop(time, amount, func)
+## SS13.start_loop(time, amount, func)
 Creates a timer which will execute `func` after `time` **seconds**. `func` should not expect to be passed any arguments, as it will not be passed any. Works exactly the same as `SS13.set_timeout` except it will loop the timer `amount` times. If `amount` is set to -1, it will loop indefinitely. Returns a number value, which represents the timer's id. Can be stopped with `SS13.end_loop`
 Returns a number, the timer id, which is needed to stop indefinite timers.
 The following example will output a message to chat every 5 seconds, repeating 10 times:
 ```lua
 SS13.start_loop(5, 10, function()
-	dm.global_proc("to_chat", dm.world, "Hello World!")
+	dm.global_procs.to_chat(dm.world, "Hello World!")
 end)
 ```
 The following example will output a message to chat every 5 seconds, until `SS13.end_loop(timerid)` is called:
 ```lua
 local timerid = SS13.start_loop(5, -1, function()
-	dm.global_proc("to_chat", dm.world, "Hello World!")
+	dm.global_proc.to_chat(dm.world, "Hello World!")
 end)
 ```
 
-### SS13.end_loop(id)
+## SS13.end_loop(id)
 Prematurely ends a loop that hasn't ended yet, created with `SS13.start_loop`. Silently fails if there is no started loop with the specified id.
 The following example will output a message to chat every 5 seconds and delete it after it has repeated 20 times:
 ```lua
@@ -254,7 +322,7 @@ local repeated_amount = 0
 -- timerid won't be in the looping function's scope if declared before the function is declared.
 local timerid
 timerid = SS13.start_loop(5, -1, function()
-	dm.global_proc("to_chat", dm.world, "Hello World!")
+	dm.global_procs.to_chat(dm.world, "Hello World!")
 	repeated_amount += 1
 	if repeated_amount >= 20 then
 		SS13.end_loop(timerid)
@@ -262,35 +330,6 @@ timerid = SS13.start_loop(5, -1, function()
 end)
 ```
 
-### SS13.stop_all_loops()
+## SS13.stop_all_loops()
 Stops all current running loops that haven't ended yet.
 Useful in case you accidentally left a indefinite loop running without storing the id anywhere.
-
-### SS13.stop_tracking(datum)
-Stops tracking a datum that was created via `SS13.new` so that it can be garbage collected and deleted without having to qdel. Should be used for things like callbacks and other such datums where the reference to the variable is no longer needed.
-
----
-
-## Internal globals
-
-Auxlua defines several registry values for each state. Note that there is no way to access registry values from lua code.
-
-### sleep_flag
-
-This flag is used to designate that a yielding task should be put in the sleep queue instead of the yield table. Once auxlua determines that a task should sleep, `sleep_flag` is cleared.
-
-### sleep_queue
-
-A sequence of threads, each corresponding to a task that has slept. When calling `/proc/__lua_awaken`, auxlua will dequeue the first thread from the sequence and resume it.
-
-### yield_table
-
-A table of threads, each corresponding to a coroutine that has yielded. When calling `/proc/__lua_resume`, auxlua will look for a thread at the index specified in the `index` argument, and resume it with the arguments specified in the `arguments` argument.
-
-### task_info
-
-A table of key-value-pairs, where the keys are threads, and the values are tables consisting of the following fields:
-
-- name: A string containing the name of the task
-- status: A string, either "sleep" or "yield"
-- index: The task's index in `sleep_queue` or `yield_table`
diff --git a/code/modules/admin/verbs/lua/_hooks.dm b/code/modules/admin/verbs/lua/_hooks.dm
deleted file mode 100644
index a092947e06ec9..0000000000000
--- a/code/modules/admin/verbs/lua/_hooks.dm
+++ /dev/null
@@ -1,239 +0,0 @@
-/datum
-	var/__auxtools_weakref_id //used by auxtools for weak references
-
-/**
- * Sets a global proc to call in place of just outright setting a datum's var to a given value
- *
- * The proc will be called with the arguments (datum/datum_to_modify, var_name, value)
- *
- * required wrapper text the name of the proc to use as the wrapper
- */
-/proc/__lua_set_set_var_wrapper(wrapper)
-	CRASH("auxlua not loaded")
-
-/**
- * Sets a global proc to call in place of just outright calling a given proc on a datum
- *
- * The proc will be called with the arguments (datum/thing_to_call, proc_to_call, list/arguments)
- *
- * required wrapper text the name of the proc to use as the wrapper
- */
-/proc/__lua_set_datum_proc_call_wrapper(wrapper)
-	CRASH("auxlua not loaded")
-
-/**
- * Sets a global proc to call in place of just outright calling a given global proc
- *
- * The proc will be called with the arguments (proc_to_call, list/arguments)
- *
- * required wrapper text the name of the proc to use as the wrapper
- */
-/proc/__lua_set_global_proc_call_wrapper(wrapper)
-	CRASH("auxlua not loaded")
-
-/**
- * Sets a global proc as a wrapper for lua's print function
- *
- * The proc will be called with the arguments (state_id, list/arguments)
- *
- * required wrapper text the name of the proc to use as the wrapper
- */
-/proc/__lua_set_print_wrapper(wrapper)
-	CRASH("auxlua not loaded")
-
-/**
- * Sets the maximum amount of time a lua chunk or function can execute without sleeping or yielding.
- * Chunks/functions that exceed this duration will produce an error.
- *
- * required limit number the execution limit, in milliseconds
- */
-/proc/__lua_set_execution_limit(limit)
-	CRASH("auxlua not loaded")
-
-/**
- * Creates a new lua state.
- *
- * return text a pointer to the created state.
- */
-/proc/__lua_new_state()
-	CRASH("auxlua not loaded")
-
-/**
- * Loads a chunk of lua source code and executes it
- *
- * required state text a pointer to the state
- * in which to execute the code
- * required script text the lua source code to execute
- * optional name text a name to give to the chunk
- *
- * return list|text a list of lua return information
- * or an error message if the state was corrupted
- *
- * Lua return information is formatted as followed:
- * - ["status"]: How the chunk or function stopped code execution
- *     - "sleeping": The chunk or function called dm.sleep,
- *       placing it in the sleep queue. Items in the sleep
- *       queue can be resumed using /proc/__lua_awaken
- *     - "yielded": The chunk or function called coroutine.yield,
- *       placing it in the yield table. Items in the yield
- *       table can can be resumed by passing their index
- *       to /proc/__lua_resume
- *     - "finished": The chunk or function finished
- *     - "errored": The chunk or function produced an error
- *     - "bad return": The chunk or function yielded or finished,
- *       but its return value could not be converted to DM values
- * - ["param"]: Depends on status.
- *     - "sleeping": null
- *     - "yielded" or "finished": The return/yield value(s)
- *     - "errored" or "bad return": The error message
- * - ["yield_index"]: The index in the yield table where the
- *   chunk or function is located, for calls to __lua_resume
- * - ["name"]: The name of the chunk or function, for logging
- */
-/proc/__lua_load(state, script, name)
-	CRASH("auxlua not loaded")
-
-/**
- * Calls a lua function
- *
- * required state text a pointer to the state
- * in which to call the function
- * required function text the name of the function to call
- * optional arguments list arguments to pass to the function
- *
- * return list|text a list of lua return information
- * or an error message if the state was corrupted
- *
- * Lua return information is formatted as followed:
- * - ["status"]: How the chunk or function stopped code execution
- *     - "sleeping": The chunk or function called dm.sleep,
- *       placing it in the sleep queue. Items in the sleep
- *       queue can be resumed using /proc/__lua_awaken
- *     - "yielded": The chunk or function called coroutine.yield,
- *       placing it in the yield table. Items in the yield
- *       table can can be resumed by passing their index
- *       to /proc/__lua_resume
- *     - "finished": The chunk or function finished
- *     - "errored": The chunk or function produced an error
- *     - "bad return": The chunk or function yielded or finished,
- *       but its return value could not be converted to DM values
- * - ["param"]: Depends on status.
- *     - "sleeping": null
- *     - "yielded" or "finished": The return/yield value(s)
- *     - "errored" or "bad return": The error message
- * - ["yield_index"]: The index in the yield table where the
- *   chunk or function is located, for calls to __lua_resume
- * - ["name"]: The name of the chunk or function, for logging
- */
-/proc/__lua_call(state, function, arguments)
-	CRASH("auxlua not loaded")
-
-/**
- * Dequeues the task at the front of the sleep queue and resumes it
- *
- * required state text a pointer to the state in which
- * to resume a task
- *
- * return list|text|null a list of lua return information,
- * an error message if the state is corrupted,
- * or null if the sleep queue is empty
- *
- * Lua return information is formatted as followed:
- * - ["status"]: How the chunk or function stopped code execution
- *     - "sleeping": The chunk or function called dm.sleep,
- *       placing it in the sleep queue. Items in the sleep
- *       queue can be resumed using /proc/__lua_awaken
- *     - "yielded": The chunk or function called coroutine.yield,
- *       placing it in the yield table. Items in the yield
- *       table can can be resumed by passing their index
- *       to /proc/__lua_resume
- *     - "finished": The chunk or function finished
- *     - "errored": The chunk or function produced an error
- *     - "bad return": The chunk or function yielded or finished,
- *       but its return value could not be converted to DM values
- * - ["param"]: Depends on status.
- *     - "sleeping": null
- *     - "yielded" or "finished": The return/yield value(s)
- *     - "errored" or "bad return": The error message
- * - ["yield_index"]: The index in the yield table where the
- *   chunk or function is located, for calls to __lua_resume
- * - ["name"]: The name of the chunk or function, for logging
- */
-/proc/__lua_awaken(state)
-	CRASH("auxlua not loaded")
-
-/**
- * Removes the task at the specified index from the yield table
- * and resumes it
- *
- * required state text a pointer to the state in which to
- * resume a task
- * required index number the index in the yield table of the
- * task to resume
- * optional arguments list the arguments to resume the task with
- *
- * return list|text|null a list of lua return information,
- * an error message if the state is corrupted,
- * or null if there is no task at the specified index
- *
- * Lua return information is formatted as followed:
- * - ["status"]: How the chunk or function stopped code execution
- *     - "sleeping": The chunk or function called dm.sleep,
- *       placing it in the sleep queue. Items in the sleep
- *       queue can be resumed using /proc/__lua_awaken
- *     - "yielded": The chunk or function called coroutine.yield,
- *       placing it in the yield table. Items in the yield
- *       table can can be resumed by passing their index
- *       to /proc/__lua_resume
- *     - "finished": The chunk or function finished
- *     - "errored": The chunk or function produced an error
- *     - "bad return": The chunk or function yielded or finished,
- *       but its return value could not be converted to DM values
- * - ["param"]: Depends on status.
- *     - "sleeping": null
- *     - "yielded" or "finished": The return/yield value(s)
- *     - "errored" or "bad return": The error message
- * - ["yield_index"]: The index in the yield table where the
- *   chunk or function is located, for calls to __lua_resume
- * - ["name"]: The name of the chunk or function, for logging
- */
-/proc/__lua_resume(state, index, arguments)
-	CRASH("auxlua not loaded")
-
-/**
- * Get the variables within a state's environment.
- * Values not convertible to DM values are substituted
- * for their types as text
- *
- * required state text a pointer to the state
- * to get the variables from
- *
- * return list the variables of the state's environment
- */
-/proc/__lua_get_globals(state)
-	CRASH("auxlua not loaded")
-
-/**
- * Get a list of all tasks currently in progress within a state
- *
- * required state text a pointer to the state
- * to get the tasks from
- *
- * return list a list of the state's tasks, formatted as follows:
- * - name: The name of the task
- * - status: Whether the task is sleeping or yielding
- * - index: The index of the task in the sleep queue
- *   or yield table, whichever is applicable
- */
-/proc/__lua_get_tasks(state)
-	CRASH("auxlua not loaded")
-
-/**
- * Kills a task in progress
- *
- * required state text a pointer to the state
- * in which to kill a task
- * required info list the task info
- */
-/proc/__lua_kill_task(state, info)
-	CRASH("auxlua not loaded")
diff --git a/code/modules/admin/verbs/lua/_wrappers.dm b/code/modules/admin/verbs/lua/_wrappers.dm
index 8e05453d29d5d..d516f064f847f 100644
--- a/code/modules/admin/verbs/lua/_wrappers.dm
+++ b/code/modules/admin/verbs/lua/_wrappers.dm
@@ -1,3 +1,12 @@
+/proc/wrap_lua_get_var(datum/thing, var_name)
+	SHOULD_NOT_SLEEP(TRUE)
+	if(thing == world)
+		return world.vars[var_name]
+	if(ref(thing) == "\[0xe000001\]") //This weird fucking thing is like global.vars, but it's not a list and vars is not a valid index for it and I really don't fucking know.
+		return global.vars[var_name]
+	if(thing.can_vv_get(var_name))
+		return thing.vars[var_name]
+
 /proc/wrap_lua_set_var(datum/thing_to_set, var_name, value)
 	SHOULD_NOT_SLEEP(TRUE)
 	thing_to_set.vv_edit_var(var_name, value)
@@ -11,8 +20,6 @@
 		ret = WrapAdminProcCall(thing_to_call, proc_name, arguments)
 	else
 		ret = HandleUserlessProcCall("lua", thing_to_call, proc_name, arguments)
-	if(isdatum(ret))
-		SSlua.gc_guard += ret
 	return ret
 
 /proc/wrap_lua_global_proc_call(proc_name, list/arguments)
@@ -24,8 +31,6 @@
 		ret = WrapAdminProcCall(GLOBAL_PROC, proc_name, arguments)
 	else
 		ret = HandleUserlessProcCall("lua", GLOBAL_PROC, proc_name, arguments)
-	if(isdatum(ret))
-		SSlua.gc_guard += ret
 	return ret
 
 /proc/wrap_lua_print(state_id, list/arguments)
@@ -38,6 +43,6 @@
 	if(!target_state)
 		return
 	var/print_message = jointext(arguments, "\t")
-	var/result = list("status" = "print", "param" = print_message)
+	var/result = list("status" = "print", "message" = print_message)
 	INVOKE_ASYNC(target_state, TYPE_PROC_REF(/datum/lua_state, log_result), result, TRUE)
 	log_lua("[target_state]: [print_message]")
diff --git a/code/modules/admin/verbs/lua/helpers.dm b/code/modules/admin/verbs/lua/helpers.dm
index 66b7c835e9ab1..c3072f15e74cd 100644
--- a/code/modules/admin/verbs/lua/helpers.dm
+++ b/code/modules/admin/verbs/lua/helpers.dm
@@ -3,27 +3,27 @@
 #define PROMISE_REJECTED 2
 
 /**
- * Auxtools hooks act as "set waitfor = 0" procs. This means that whenever
- * a proc directly called from auxtools sleeps, the hook returns with whatever
+ * Byondapi hooks act as "set waitfor = 0" procs. This means that whenever
+ * a proc directly called from an external library sleeps, the hook returns with whatever
  * the called proc had as its return value at the moment it slept. This may not
  * be desired behavior, so this datum exists to wrap these procs.
  *
  * Some procs that don't sleep could take longer than the execution limit would
  * allow for. We can wrap these in a promise as well.
  */
-/datum/auxtools_promise
+/datum/promise
 	var/datum/callback/callback
 	var/return_value
 	var/runtime_message
 	var/status = PROMISE_PENDING
 
-/datum/auxtools_promise/New(...)
+/datum/promise/New(...)
+	if(!usr)
+		usr = GLOB.lua_usr
 	callback = CALLBACK(arglist(args))
-	perform()
+	INVOKE_ASYNC(src, PROC_REF(perform))
 
-/datum/auxtools_promise/proc/perform()
-	set waitfor = 0
-	sleep() //In case we have to call a super-expensive non-sleeping proc (like getFlatIcon)
+/datum/promise/proc/perform()
 	try
 		return_value = callback.Invoke()
 		status = PROMISE_RESOLVED
diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm
index d4a4bc2ee50b7..c0b37fd87c1ec 100644
--- a/code/modules/admin/verbs/lua/lua_editor.dm
+++ b/code/modules/admin/verbs/lua/lua_editor.dm
@@ -16,6 +16,12 @@
 	/// If set, we will force the editor to look at this chunk
 	var/force_view_chunk
 
+	/// If set, we will force the script input to be this
+	var/force_input
+
+	/// If set, the latest code execution performed from the editor raised an error, and this is the message from that error
+	var/last_error
+
 /datum/lua_editor/New(state, _quick_log_index)
 	. = ..()
 	if(state)
@@ -37,37 +43,51 @@
 /datum/lua_editor/ui_state(mob/user)
 	return GLOB.debug_state
 
-/datum/lua_editor/ui_static_data(mob/user)
-	var/list/data = list()
-	data["documentation"] = file2text('code/modules/admin/verbs/lua/README.md')
-	data["auxtools_enabled"] = CONFIG_GET(flag/auxtools_enabled)
-	data["ss_lua_init"] = SSlua.initialized
-	return data
-
 /datum/lua_editor/ui_data(mob/user)
 	var/list/data = list()
-	if(!CONFIG_GET(flag/auxtools_enabled) || !SSlua.initialized)
+	data["ss_lua_init"] = SSlua.initialized
+	if(!SSlua.initialized)
 		return data
 
 	data["noStateYet"] = !current_state
 	data["showGlobalTable"] = show_global_table
 	if(current_state)
 		if(current_state.log)
-			data["stateLog"] = kvpify_list(refify_list(current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1))))
+			var/list/logs = current_state.log.Copy((page*50)+1, min((page+1)*50+1, current_state.log.len+1))
+			for(var/i in 1 to logs.len)
+				var/list/log = logs[i]
+				log = log.Copy()
+				if(log["return_values"])
+					log["return_values"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(log["return_values"])))
+					logs[i] = log
+			data["stateLog"] = logs
 		data["page"] = page
 		data["pageCount"] = CEILING(current_state.log.len/50, 1)
 		data["tasks"] = current_state.get_tasks()
 		if(show_global_table)
 			current_state.get_globals()
-			data["globals"] = kvpify_list(refify_list(current_state.globals))
-	data["states"] = SSlua.states
-	data["callArguments"] = kvpify_list(refify_list(arguments))
+			var/list/values = current_state.globals["values"]
+			values = deep_copy_without_cycles(values)
+			values = prepare_lua_editor_list(values)
+			values = kvpify_list(values)
+			var/list/variants = current_state.globals["variants"]
+			data["globals"] = list("values" = values, "variants" = variants)
+		if(last_error)
+			data["lastError"] = last_error
+			last_error = null
+	data["states"] = list()
+	for(var/datum/lua_state/state as anything in SSlua.states)
+		data["states"] += state.display_name
+	data["callArguments"] = kvpify_list(prepare_lua_editor_list(deep_copy_without_cycles(arguments)))
 	if(force_modal)
 		data["forceModal"] = force_modal
 		force_modal = null
 	if(force_view_chunk)
 		data["forceViewChunk"] = force_view_chunk
 		force_view_chunk = null
+	if(force_input)
+		data["force_input"] = force_input
+		force_input = null
 	return data
 
 /datum/lua_editor/proc/traverse_list(list/path, list/root, traversal_depth_offset = 0)
@@ -99,6 +119,15 @@
 	else
 		return root
 
+/datum/lua_editor/proc/run_code(code)
+	var/ckey = usr.ckey
+	current_state.ckey_last_runner = ckey
+	var/result = current_state.load_script(code)
+	var/index_with_result = current_state.log_result(result)
+	if(result["status"] == "error")
+		last_error = result["message"]
+	message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]")
+
 /datum/lua_editor/ui_act(action, list/params)
 	. = ..()
 	if(.)
@@ -116,6 +145,8 @@
 			if(!length(state_name))
 				return TRUE
 			var/datum/lua_state/new_state = new(state_name)
+			if(QDELETED(new_state))
+				return
 			SSlua.states += new_state
 			LAZYREMOVEASSOC(SSlua.editors, text_ref(current_state), src)
 			current_state = new_state
@@ -130,11 +161,14 @@
 			page = 0
 			return TRUE
 		if("runCode")
-			var/code = params["code"]
-			current_state.ckey_last_runner = usr.ckey
-			var/result = current_state.load_script(code)
-			var/index_with_result = current_state.log_result(result)
-			message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]")
+			run_code(params["code"])
+			return TRUE
+		if("runFile")
+			var/code_file = input(usr, "Select a script to run.", "Lua") as file|null
+			if(!code_file)
+				return TRUE
+			var/code = file2text(code_file)
+			run_code(code)
 			return TRUE
 		if("moveArgUp")
 			var/list/path = params["path"]
@@ -168,27 +202,31 @@
 			return TRUE
 		if("callFunction")
 			var/list/recursive_indices = params["indices"]
-			var/list/current_list = kvpify_list(current_state.globals)
+			var/list/current_list = kvpify_list(current_state.globals["values"])
+			var/list/current_variants = current_state.globals["variants"]
 			var/function = list()
 			while(LAZYLEN(recursive_indices))
 				var/index = popleft(recursive_indices)
 				var/list/element = current_list[index]
 				var/key = element["key"]
 				var/value = element["value"]
-				if(!(istext(key) || isnum(key)))
-					to_chat(usr, span_warning("invalid key \[[key]] for function call (expected text or num)"))
+				var/list/variant_pair = current_variants[index]
+				var/key_variant = variant_pair["key"]
+				if(key_variant == "function" || key_variant == "thread" || key_variant == "userdata" || key_variant == "error_as_value")
+					to_chat(usr, span_warning("invalid table key \[[key]] for function call (expected text, num, path, list, or ref, got [key_variant])"))
 					return
 				function += key
 				if(islist(value))
 					current_list = value
+					current_variants = variant_pair["value"]
 				else
-					var/regex/function_regex = regex("^function: 0x\[0-9a-fA-F]+$")
-					if(function_regex.Find(value))
-						break
-					to_chat(usr, span_warning("invalid path element \[[value]] for function call (expected list or text matching [function_regex])"))
-					return
+					if(variant_pair["value"] != "function")
+						to_chat(usr, span_warning("invalid value \[[value]] for function call (expected list or function)"))
+						return
 			var/result = current_state.call_function(arglist(list(function) + arguments))
 			current_state.log_result(result)
+			if(result["status"] == "error")
+				last_error = result["message"]
 			arguments.Cut()
 			return TRUE
 		if("resumeTask")
@@ -197,20 +235,21 @@
 			arguments.Cut()
 			return TRUE
 		if("killTask")
-			var/task_info = params["info"]
-			SSlua.kill_task(current_state, task_info)
+			var/is_sleep = params["is_sleep"]
+			var/index = params["index"]
+			SSlua.kill_task(current_state, is_sleep, index)
 			return TRUE
 		if("vvReturnValue")
 			var/log_entry_index = params["entryIndex"]
 			var/list/log_entry = current_state.log[log_entry_index]
-			var/thing_to_debug = traverse_list(params["tableIndices"], log_entry["param"])
+			var/thing_to_debug = traverse_list(params["indices"], log_entry["return_values"])
 			if(isweakref(thing_to_debug))
 				var/datum/weakref/ref = thing_to_debug
 				thing_to_debug = ref.resolve()
 			INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug)
 			return FALSE
 		if("vvGlobal")
-			var/thing_to_debug = traverse_list(params["indices"], current_state.globals)
+			var/thing_to_debug = traverse_list(params["indices"], current_state.globals["values"])
 			if(isweakref(thing_to_debug))
 				var/datum/weakref/ref = thing_to_debug
 				thing_to_debug = ref.resolve()
@@ -228,6 +267,9 @@
 		if("previousPage")
 			page = max(page-1, 0)
 			return TRUE
+		if("nukeLog")
+			current_state.log.Cut()
+			return TRUE
 
 /datum/lua_editor/ui_close(mob/user)
 	. = ..()
diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm
index bf2bcbd5a9003..b3ede12238444 100644
--- a/code/modules/admin/verbs/lua/lua_state.dm
+++ b/code/modules/admin/verbs/lua/lua_state.dm
@@ -1,15 +1,15 @@
 #define MAX_LOG_REPEAT_LOOKBACK 5
 
-GLOBAL_VAR_INIT(IsLuaCall, FALSE)
-GLOBAL_PROTECT(IsLuaCall)
-
 GLOBAL_DATUM(lua_usr, /mob)
 GLOBAL_PROTECT(lua_usr)
 
+GLOBAL_LIST_EMPTY_TYPED(lua_state_stack, /datum/weakref)
+GLOBAL_PROTECT(lua_state_stack)
+
 /datum/lua_state
-	var/name
+	var/display_name
 
-	/// The internal ID of the lua state stored in auxlua's global map
+	/// The internal ID of the lua state stored in dreamluau's state list
 	var/internal_id
 
 	/// A log of every return, yield, and error for each chunk execution and function call
@@ -18,9 +18,6 @@ GLOBAL_PROTECT(lua_usr)
 	/// A list of all the variables in the state's environment
 	var/list/globals = list()
 
-	/// A list in which to store datums and lists instantiated in lua, ensuring that they don't get garbage collected
-	var/list/references = list()
-
 	/// Ckey of the last user who ran a script on this lua state.
 	var/ckey_last_runner = ""
 
@@ -39,55 +36,65 @@ GLOBAL_PROTECT(lua_usr)
 	if(SSlua.initialized != TRUE)
 		qdel(src)
 		return
-	name = _name
-	internal_id = __lua_new_state()
+	display_name = _name
+	internal_id = DREAMLUAU_NEW_STATE()
+	if(!isnum(internal_id))
+		stack_trace(internal_id)
+		qdel(src)
 
 /datum/lua_state/proc/check_if_slept(result)
-	if(result["status"] == "sleeping")
+	if(result["status"] == "sleep")
 		SSlua.sleeps += src
 
 /datum/lua_state/proc/log_result(result, verbose = TRUE)
 	if(!islist(result))
 		return
-	if(!verbose && result["status"] != "errored" && result["status"] != "bad return" \
-		&& !(result["name"] == "input" && (result["status"] == "finished" || length(result["param"]))))
+	var/status = result["status"]
+	if(!verbose && status != "error" && status != "panic" && status != "runtime" && !(result["name"] == "input" && (status == "finished" || length(result["return_values"]))))
 		return
 	var/append_to_log = TRUE
 	var/index_of_log
 	if(log.len)
 		for(var/index in log.len to max(log.len - MAX_LOG_REPEAT_LOOKBACK, 1) step -1)
 			var/list/entry = log[index]
-			if(entry["status"] == result["status"] \
-				&& entry["chunk"] == result["chunk"] \
-				&& entry["name"] == result["name"] \
-				&& ((entry["param"] == result["param"]) || deep_compare_list(entry["param"], result["param"])))
-				if(!entry["repeats"])
-					entry["repeats"] = 0
-				index_of_log = index
-				entry["repeats"]++
-				append_to_log = FALSE
-				break
+			if(!compare_lua_logs(entry, result))
+				continue
+			if(!entry["repeats"])
+				entry["repeats"] = 0
+			index_of_log = index
+			entry["repeats"]++
+			append_to_log = FALSE
+			break
 	if(append_to_log)
-		if(islist(result["param"]))
-			result["param"] = weakrefify_list(encode_text_and_nulls(result["param"]))
+		if(islist(result["return_values"]))
+			add_lua_return_value_variants(result["return_values"], result["variants"])
+			result["return_values"] = weakrefify_list(result["return_values"])
 		log += list(result)
 		index_of_log = log.len
 	INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/lua_state, update_editors))
 	return index_of_log
 
+/datum/lua_state/proc/parse_error(message, name)
+	if(copytext(message, 1, 7) == "PANIC:")
+		return list("status" = "panic", "message" = copytext(message, 7), "name" = name)
+	else
+		return list("status" = "error", "message" = message, "name" = name)
+
 /datum/lua_state/proc/load_script(script)
-	GLOB.IsLuaCall = TRUE
 	var/tmp_usr = GLOB.lua_usr
 	GLOB.lua_usr = usr
-	var/result = __lua_load(internal_id, script)
-	GLOB.IsLuaCall = FALSE
+	DREAMLUAU_SET_USR
+	GLOB.lua_state_stack += WEAKREF(src)
+	var/result = DREAMLUAU_LOAD(internal_id, script, "input")
+	SSlua.needs_gc_cycle |= src
+	pop(GLOB.lua_state_stack)
 	GLOB.lua_usr = tmp_usr
 
 	// Internal errors unrelated to the code being executed are returned as text rather than lists
 	if(isnull(result))
-		result = list("status" = "errored", "param" = "__lua_load returned null (it may have runtimed - check the runtime logs)", "name" = "input")
+		result = list("status" = "error", "message" = "load returned null (it may have runtimed - check the runtime logs)", "name" = "input")
 	if(istext(result))
-		result = list("status" = "errored", "param" = result, "name" = "input")
+		result = parse_error(result, "input")
 	result["chunk"] = script
 	check_if_slept(result)
 
@@ -109,67 +116,106 @@ GLOBAL_PROTECT(lua_usr)
 	if(islist(function))
 		var/list/new_function_path = list()
 		for(var/path_element in function)
-			new_function_path += path_element
+			if(isweakref(path_element))
+				var/datum/weakref/weak_ref = path_element
+				var/resolved = weak_ref.hard_resolve()
+				if(!resolved)
+					return list("status" = "error", "message" = "Weakref in function path ([weak_ref] [text_ref(weak_ref)]) resolved to null.", "name" = jointext(function, "."))
+				new_function_path += resolved
+			else
+				new_function_path += path_element
 		function = new_function_path
+	else
+		function = list(function)
 
 	var/tmp_usr = GLOB.lua_usr
 	GLOB.lua_usr = usr
-	GLOB.IsLuaCall = TRUE
-	var/result = __lua_call(internal_id, function, call_args)
-	GLOB.IsLuaCall = FALSE
+	DREAMLUAU_SET_USR
+	GLOB.lua_state_stack += WEAKREF(src)
+	var/result = DREAMLUAU_CALL_FUNCTION(internal_id, function, call_args)
+	SSlua.needs_gc_cycle |= src
+	pop(GLOB.lua_state_stack)
 	GLOB.lua_usr = tmp_usr
 
 	if(isnull(result))
-		result = list("status" = "errored", "param" = "__lua_call returned null (it may have runtimed - check the runtime logs)", "name" = islist(function) ? jointext(function, ".") : function)
+		result = list("status" = "error", "message" = "call_function returned null (it may have runtimed - check the runtime logs)", "name" = jointext(function, "."))
 	if(istext(result))
-		result = list("status" = "errored", "param" = result, "name" = islist(function) ? jointext(function, ".") : function)
+		result = parse_error(result, jointext(function, "."))
 	check_if_slept(result)
 	return result
 
 /datum/lua_state/proc/call_function_return_first(function, ...)
+	SHOULD_NOT_SLEEP(TRUE) // This function is meant to be used for signal handlers.
 	var/list/result = call_function(arglist(args))
-	log_result(result, verbose = FALSE)
+	INVOKE_ASYNC(src, PROC_REF(log_result), deep_copy_list(result), /*verbose = */FALSE)
 	if(length(result))
-		if(islist(result["param"]) && length(result["param"]))
-			return result["param"][1]
+		if(islist(result["return_values"]) && length(result["return_values"]))
+			var/return_value = result["return_values"][1]
+			var/variant = (islist(result["variants"]) && length(result["variants"])) && result["variants"][1]
+			if(islist(return_value) && islist(variant))
+				remove_non_dm_variants(return_value, variant)
+			return return_value
 
 /datum/lua_state/proc/awaken()
-	GLOB.IsLuaCall = TRUE
-	var/result = __lua_awaken(internal_id)
-	GLOB.IsLuaCall = FALSE
+	DREAMLUAU_SET_USR
+	GLOB.lua_state_stack += WEAKREF(src)
+	var/result = DREAMLUAU_AWAKEN(internal_id)
+	SSlua.needs_gc_cycle |= src
+	pop(GLOB.lua_state_stack)
 
 	if(isnull(result))
-		result = list("status" = "errored", "param" = "__lua_awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken")
+		result = list("status" = "error", "message" = "awaken returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted awaken")
 	if(istext(result))
-		result = list("status" = "errored", "param" = result, "name" = "An attempted awaken")
+		result = parse_error(result, "An attempted awaken")
 	check_if_slept(result)
 	return result
 
 /// Prefer calling SSlua.queue_resume over directly calling this
 /datum/lua_state/proc/resume(index, ...)
 	var/call_args = length(args) > 1 ? args.Copy(2) : list()
-	var/msg = "[key_name(usr)] resumed a lua coroutine with arguments: [english_list(call_args)]"
-	log_lua(msg)
 
-	GLOB.IsLuaCall = TRUE
-	var/result = __lua_resume(internal_id, index, call_args)
-	GLOB.IsLuaCall = FALSE
+	DREAMLUAU_SET_USR
+	GLOB.lua_state_stack += WEAKREF(src)
+	var/result = DREAMLUAU_RESUME(internal_id, index, call_args)
+	SSlua.needs_gc_cycle |= src
+	pop(GLOB.lua_state_stack)
 
 	if(isnull(result))
-		result = list("status" = "errored", "param" = "__lua_resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume")
+		result = list("status" = "error", "param" = "resume returned null (it may have runtimed - check the runtime logs)", "name" = "An attempted resume")
 	if(istext(result))
-		result = list("status" = "errored", "param" = result, "name" = "An attempted resume")
+		result = parse_error(result, "An attempted resumt")
 	check_if_slept(result)
 	return result
 
 /datum/lua_state/proc/get_globals()
-	globals = weakrefify_list(encode_text_and_nulls(__lua_get_globals(internal_id)))
+	var/result = DREAMLUAU_GET_GLOBALS(internal_id)
+	if(isnull(result))
+		CRASH("get_globals returned null")
+	if(istext(result))
+		CRASH(result)
+	var/list/new_globals = result
+	var/list/values = new_globals["values"]
+	var/list/variants = new_globals["variants"]
+	add_lua_editor_variants(values, variants)
+	globals = list("values" = weakrefify_list(values), "variants" = variants)
 
 /datum/lua_state/proc/get_tasks()
-	return __lua_get_tasks(internal_id)
+	var/result = DREAMLUAU_LIST_THREADS(internal_id)
+	if(isnull(result))
+		CRASH("list_threads returned null")
+	if(istext(result))
+		CRASH(result)
+	return result
+
+/datum/lua_state/proc/kill_task(is_sleep, index)
+	var/result = is_sleep ? DREAMLUAU_KILL_SLEEPING_THREAD(internal_id, index) : DREAMLUAU_KILL_YIELDED_THREAD(internal_id, index)
+	SSlua.needs_gc_cycle |= src
+	return result
 
-/datum/lua_state/proc/kill_task(task_info)
-	__lua_kill_task(internal_id, task_info)
+/datum/lua_state/proc/collect_garbage()
+	var/result = DREAMLUAU_COLLECT_GARBAGE(internal_id)
+	if(!isnull(result))
+		CRASH(result)
 
 /datum/lua_state/proc/update_editors()
 	var/list/editor_list = LAZYACCESS(SSlua.editors, text_ref(src))
@@ -177,18 +223,4 @@ GLOBAL_PROTECT(lua_usr)
 		for(var/datum/lua_editor/editor as anything in editor_list)
 			SStgui.update_uis(editor)
 
-/// Called by lua scripts when they add an atom to var/list/references so that it gets cleared up on delete.
-/datum/lua_state/proc/clear_on_delete(datum/to_clear)
-	RegisterSignal(to_clear, COMSIG_QDELETING, PROC_REF(on_delete))
-
-/// Called by lua scripts when an atom they've added should soft delete and this state should stop tracking it.
-/// Needs to unregister all signals.
-/datum/lua_state/proc/let_soft_delete(datum/to_clear)
-	UnregisterSignal(to_clear, COMSIG_QDELETING, PROC_REF(on_delete))
-	references -= to_clear
-
-/datum/lua_state/proc/on_delete(datum/to_clear)
-	SIGNAL_HANDLER
-	references -= to_clear
-
 #undef MAX_LOG_REPEAT_LOOKBACK
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 268f0d6e7a1c8..12c7b3accb06f 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -337,7 +337,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
 				if(is_station_level(W.z) && !istype(get_area(W), /area/station/command) && !istype(get_area(W), /area/station/commons) && !istype(get_area(W), /area/station/service) && !istype(get_area(W), /area/station/command/heads_quarters) && !istype(get_area(W), /area/station/security/prison))
 					W.req_access = list()
 			message_admins("[key_name_admin(holder)] activated Egalitarian Station mode")
-			priority_announce("Центральное Коммандование активировало блокировку всех шлюзов. Пожалуйста, потратьте это время на знакомство с коллегами.", null, SSstation.announcer.get_rand_report_sound())
+			priority_announce("Центральное Командование активировало блокировку всех шлюзов. Пожалуйста, потратьте это время на знакомство с коллегами.", null, SSstation.announcer.get_rand_report_sound())
 		if("ancap")
 			if(!is_funmin)
 				return
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 3a2ed4281ca77..ef8559a0c0713 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 	///Public name for this antagonist. Appears for player prompts and round-end reports.
 	var/name = "\improper Antagonist"
 	///Section of roundend report, datums with same category will be displayed together, also default header for the section
-	var/roundend_category = "other antagonists"
+	var/roundend_category = "Другими антагонистами"
 	///Set to false to hide the antagonists from roundend report
 	var/show_in_roundend = TRUE
 	///If false, the roundtype will still convert with this antag active
@@ -405,9 +405,9 @@ GLOBAL_LIST_EMPTY(antagonists)
 				break
 
 	if(objectives.len == 0 || objectives_complete)
-		report += "<span class='greentext big'>The [name] was successful!</span>"
+		report += "<span class='greentext big'>[name] был успешен!</span>"
 	else
-		report += "<span class='redtext big'>The [name] has failed!</span>"
+		report += "<span class='redtext big'>[name] провалился!</span>"
 
 	return report.Join("<br>")
 
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 58e57a3308d9f..27c92cc81e798 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -105,7 +105,7 @@
 	/// The antag datum applied
 	var/antag_datum = /datum/antagonist/nukeop/reinforcement
 	/// Style used by the droppod
-	var/pod_style = STYLE_SYNDICATE
+	var/pod_style = /datum/pod_style/syndicate
 	/// Do we use a random subtype of the outfit?
 	var/use_subtypes = TRUE
 	/// Where do we land our pod?
@@ -187,8 +187,8 @@
 	desc = "A single-use beacon designed to quickly launch reinforcement clown operatives into the field."
 	special_role_name = ROLE_CLOWN_OPERATIVE
 	outfit = /datum/outfit/syndicate/clownop/no_crystals
-	antag_datum = /datum/antagonist/nukeop/clownop
-	pod_style = STYLE_HONK
+	antag_datum = /datum/antagonist/nukeop/reinforcement/clownop
+	pod_style = /datum/pod_style/clown
 	use_subtypes = FALSE
 
 //////SYNDICATE BORG
@@ -313,7 +313,7 @@
 	/// The antag datum applied
 	var/datum/antagonist/antag_datum
 	/// Style used by the droppod
-	var/pod_style = STYLE_SYNDICATE
+	var/pod_style = /datum/pod_style/syndicate
 	/// Do we use a random subtype of the outfit?
 	var/use_subtypes = TRUE
 	/// The antag role we check if the ghosts have enabled to get the poll.
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index f1e3931fbac5f..36394dbc48dd3 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 			qdel(src)
 	else if(!victory_in_progress && (blobs_legit.len >= blobwincount))
 		victory_in_progress = TRUE
-		priority_announce("Биоугроза достигла критической массы. Потеря станции неминуема.", "ВНИМАНИЕ: Биологическая угроза")
+		priority_announce("Биоугроза достигла критической массы. Потеря станции неминуема.", "Биологическая угроза")
 		SSsecurity_level.set_level(SEC_LEVEL_DELTA)
 		max_blob_points = INFINITY
 		blob_points = INFINITY
@@ -162,7 +162,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 		max_count = blobs_legit.len
 
 	if(announcement_time && (world.time >= announcement_time || blobs_legit.len >= announcement_size) && !has_announced)
-		priority_announce("Вспышка биологической угрозы 5-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение любой ценой!", "ВНИМАНИЕ: Биологическая угроза", ANNOUNCER_OUTBREAK5)
+		priority_announce("Вспышка биологической угрозы 5-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение любой ценой!", "Биологическая угроза", ANNOUNCER_OUTBREAK5)
 		has_announced = TRUE
 
 /// Create a blob spore and link it to us
@@ -206,7 +206,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 			if(live_guy.stat != DEAD)
 				live_guy.investigate_log("has died from blob takeover.", INVESTIGATE_DEATHS)
 			live_guy.death()
-			create_spore(guy_turf)
+			create_spore(guy_turf, spore_type = /mob/living/basic/blob_minion/spore)
 		else
 			live_guy.fully_heal()
 
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index 12e642aa82de8..6041e271e54b2 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -14,7 +14,7 @@
 	if(!.)
 		return FALSE
 
-	if(HAS_TRAIT_FROM(user, TRAIT_IGNOREDAMAGESLOWDOWN, CHANGELING_TRAIT))
+	if(HAS_TRAIT_FROM(user, TRAIT_PARALYSIS_L_ARM, CHANGELING_TRAIT) || HAS_TRAIT_FROM(user, TRAIT_PARALYSIS_R_ARM, CHANGELING_TRAIT))
 		user.balloon_alert(user, "уже усилены!")
 		return FALSE
 
@@ -40,7 +40,8 @@
 	var/our_leg_zones = (GLOB.all_body_zones - GLOB.leg_zones)
 	user.regenerate_limbs(excluded_zones = our_leg_zones) // why is this exclusive rather than inclusive
 
-	user.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+	user.add_traits(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+	user.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
 
 	// Revert above mob changes.
 	addtimer(CALLBACK(src, PROC_REF(unsting_action), user), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
@@ -57,4 +58,5 @@
 
 /datum/action/changeling/adrenaline/proc/unsting_action(mob/living/user)
 	to_chat(user, span_changeling("Мускулы в наших конечностях возвращаются в норму."))
-	user.remove_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+	user.remove_traits(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+	user.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm
index 130b6c9af5f1b..1e566b7d1975e 100644
--- a/code/modules/antagonists/clown_ops/clown_weapons.dm
+++ b/code/modules/antagonists/clown_ops/clown_weapons.dm
@@ -192,7 +192,7 @@
 //BOMBANANA
 
 /obj/item/seeds/banana/bombanana
-	name = "pack of bombanana seeds"
+	name = "bombanana seed pack"
 	desc = "They're seeds that grow into bombanana trees. When grown, give to the clown."
 	plantname = "Bombanana Tree"
 	product = /obj/item/food/grown/banana/bombanana
diff --git a/code/modules/antagonists/clown_ops/clownop.dm b/code/modules/antagonists/clown_ops/clownop.dm
index 85cf2c0f631e7..07c1cc84ad756 100644
--- a/code/modules/antagonists/clown_ops/clownop.dm
+++ b/code/modules/antagonists/clown_ops/clownop.dm
@@ -65,6 +65,11 @@
 	if(liver)
 		ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, CLOWNOP_TRAIT)
 
+// Clown op reinforcements
+/datum/antagonist/nukeop/reinforcement/clownop
+	name = "Clown Operative Reinforcement"
+	nukeop_outfit = /datum/outfit/syndicate/clownop/no_crystals
+
 /datum/outfit/clown_operative
 	name = "Clown Operative (Preview only)"
 
diff --git a/code/modules/antagonists/clown_ops/outfits.dm b/code/modules/antagonists/clown_ops/outfits.dm
index 7dc84b56d856f..fb025e40dbd20 100644
--- a/code/modules/antagonists/clown_ops/outfits.dm
+++ b/code/modules/antagonists/clown_ops/outfits.dm
@@ -24,6 +24,7 @@
 	id_trim = /datum/id_trim/chameleon/operative/clown
 
 /datum/outfit/syndicate/clownop/no_crystals
+	name = "Clown Operative - Reinforcement"
 	tc = 0
 
 /datum/outfit/syndicate/clownop/leader
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index eb55138a4483a..39cd9b550ae45 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -12,7 +12,7 @@
 	default_button_position = DEFAULT_BLOODSPELLS
 	var/list/spells = list()
 	var/channeling = FALSE
-	/// If the magic has been enhanced somehow, likely due to a crimson focus.
+	/// If the magic has been enhanced somehow, likely due to a crimson medallion.
 	var/magic_enhanced = FALSE
 
 /datum/action/innate/cult/blood_magic/Remove()
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 969cd49a19ad5..cf53ba1809939 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -211,6 +211,7 @@ Striking a noncultist, however, will tear their flesh."}
 			awakener = awakener,\
 			allow_renaming = FALSE,\
 			allow_channeling = FALSE,\
+			allow_exorcism = FALSE,\
 		)
 
 	// Get the heretic's new body and antag datum.
@@ -724,7 +725,7 @@ Striking a noncultist, however, will tear their flesh."}
 		var/curse_message = pick_n_take(remaining_curses) || "Something has gone horrendously wrong..."
 
 		curse_message += " Эвакуационный шаттл задерживается на три минуты."
-		priority_announce("[curse_message]", "ВНИМАНИЕ: Обнаружена неисправность в системе", 'sound/misc/notice1.ogg')
+		priority_announce("[curse_message]", "Обнаружена неисправность в системе", 'sound/misc/notice1.ogg')
 		if(MAX_SHUTTLE_CURSES-totalcurses <= 0)
 			to_chat(user, span_danger(span_big("You sense that the emergency escape shuttle can no longer be cursed. It would be unwise to create more cursed orbs.")))
 		else if(MAX_SHUTTLE_CURSES-totalcurses == 1)
diff --git a/code/modules/antagonists/cult/cult_structure_archives.dm b/code/modules/antagonists/cult/cult_structure_archives.dm
index d3a96dd1f77aa..9917d9505f7be 100644
--- a/code/modules/antagonists/cult/cult_structure_archives.dm
+++ b/code/modules/antagonists/cult/cult_structure_archives.dm
@@ -2,7 +2,7 @@
 #define CULT_BLINDFOLD "Zealot's Blindfold"
 #define CURSE_ORB "Shuttle Curse"
 #define VEIL_WALKER "Veil Walker Set"
-#define CRIMSON_FOCUS "Crimson Focus"
+#define CRIMSON_MEDALLION "Crimson Medallion"
 
 // Cult archives. Gives out utility items.
 /obj/structure/destructible/cult/item_dispenser/archives
@@ -38,11 +38,11 @@
 		options += extra_item
 
 /obj/structure/destructible/cult/item_dispenser/archives/extra_options()
-	if(!cult_team?.unlocked_heretic_items[CRIMSON_FOCUS_UNLOCKED])
+	if(!cult_team?.unlocked_heretic_items[CRIMSON_MEDALLION_UNLOCKED])
 		return
-	return list(CRIMSON_FOCUS = list(
-			PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/neck.dmi', icon_state = "crimson_focus"),
-			OUTPUT_ITEMS = list(/obj/item/clothing/neck/heretic_focus/crimson_focus),
+	return list(CRIMSON_MEDALLION = list(
+			PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/neck.dmi', icon_state = "crimson_medallion"),
+			OUTPUT_ITEMS = list(/obj/item/clothing/neck/heretic_focus/crimson_medallion),
 			),
 	)
 
@@ -56,4 +56,4 @@
 #undef CULT_BLINDFOLD
 #undef CURSE_ORB
 #undef VEIL_WALKER
-#undef CRIMSON_FOCUS
+#undef CRIMSON_MEDALLION
diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm
index 09d4a25a321c4..72c7df8bf5d14 100644
--- a/code/modules/antagonists/cult/datums/cult_team.dm
+++ b/code/modules/antagonists/cult/datums/cult_team.dm
@@ -22,7 +22,7 @@
 	/// List that keeps track of which items have been unlocked after a heretic was sacked.
 	var/list/unlocked_heretic_items = list(
 		CURSED_BLADE_UNLOCKED = FALSE,
-		CRIMSON_FOCUS_UNLOCKED = FALSE,
+		CRIMSON_MEDALLION_UNLOCKED = FALSE,
 		PROTEON_ORB_UNLOCKED = FALSE,
 	)
 
diff --git a/code/modules/antagonists/cult/sword_fling.dm b/code/modules/antagonists/cult/sword_fling.dm
index 766f97917de60..83238b0d8a2f4 100644
--- a/code/modules/antagonists/cult/sword_fling.dm
+++ b/code/modules/antagonists/cult/sword_fling.dm
@@ -55,6 +55,8 @@
 			particle_to_spawn = /obj/effect/particle_effect/sparks/electricity
 
 		new particle_to_spawn(get_turf(loccer))
+		loccer.shake_up_animation()
+		playsound(loccer, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
 
 		if(prob(resist_chance))
 			flinged_sword.forceMove(get_turf(loccer))
@@ -82,6 +84,9 @@
 		flinged_sword.throw_at(cast_on, cast_range, flinged_sword.throw_speed, owner)
 		flinged_sword.visible_message(\
 			span_warning("\the [flinged_sword] lunges at \the [cast_on]!"))
+		playsound(flinged_sword, 'sound/items/haunted/ghostitemattack.ogg', 100, TRUE)
+		flinged_sword.add_filter("cool_glow", 2, list("type" = "outline", "color" = COLOR_HERETIC_GREEN, "size" = 0.7))
+		addtimer(CALLBACK(flinged_sword, TYPE_PROC_REF(/datum, remove_filter), "cool_glow"), 0.7 SECONDS)
 
 /obj/effect/temp_visual/eldritch_sparks
 	icon_state = "purplesparkles"
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index d2db4cb65d596..f79c639ed0751 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -88,7 +88,7 @@
 	/// List that keeps track of which items have been gifted to the heretic after a cultist was sacrificed. Used to alter drop chances to reduce dupes.
 	var/list/unlocked_heretic_items = list(
 		/obj/item/melee/sickly_blade/cursed = 0,
-		/obj/item/clothing/neck/heretic_focus/crimson_focus = 0,
+		/obj/item/clothing/neck/heretic_focus/crimson_medallion = 0,
 		/mob/living/basic/construct/harvester/heretic = 0,
 	)
 	/// Simpler version of above used to limit amount of loot that can be hoarded
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 61745102a0eb6..33718af5ddfa4 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -228,7 +228,7 @@
 
 /**
  * A knowledge subtype for knowledge that can only
- * have a limited amount of it's resulting atoms
+ * have a limited amount of its resulting atoms
  * created at once.
  */
 /datum/heretic_knowledge/limited_amount
@@ -584,7 +584,6 @@
 
 	var/datum/antagonist/heretic_monster/heretic_monster = summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster)
 	heretic_monster.set_owner(user.mind)
-	summoned.RegisterSignal(user, COMSIG_LIVING_DEATH, TYPE_PROC_REF(/mob/living/, on_master_death))
 
 	var/datum/objective/heretic_summon/summon_objective = locate() in user.mind.get_all_objectives()
 	summon_objective?.num_summoned++
@@ -641,7 +640,6 @@
 		/obj/item/restraints/handcuffs/cable/zipties,
 		/obj/item/circular_saw,
 		/obj/item/scalpel,
-		/obj/item/binoculars,
 		/obj/item/clothing/gloves/color/yellow,
 		/obj/item/melee/baton/security,
 		/obj/item/clothing/glasses/sunglasses,
diff --git a/code/modules/antagonists/heretic/heretic_monsters.dm b/code/modules/antagonists/heretic/heretic_monsters.dm
index 6aa28394309ba..5819f7e4dd820 100644
--- a/code/modules/antagonists/heretic/heretic_monsters.dm
+++ b/code/modules/antagonists/heretic/heretic_monsters.dm
@@ -28,6 +28,7 @@
  */
 /datum/antagonist/heretic_monster/proc/set_owner(datum/mind/master)
 	src.master = master
+	owner.enslave_mind_to_creator(master.current)
 
 	var/datum/objective/master_obj = new()
 	master_obj.owner = owner
@@ -38,7 +39,3 @@
 	owner.announce_objectives()
 	to_chat(owner, span_boldnotice("Ты - [ishuman(owner.current) ? "возвращенный труп":"ужасное создание, принесенное"] в этот мир через врата Мансуса"))
 	to_chat(owner, span_notice("Твой хозяин - [master]. Помогай ему во всех деяниях."))
-
-	if(istype(owner.current, /mob/living/basic/construct/harvester/heretic))
-		var/mob/living/basic/construct/harvester/heretic/shitcode = owner.current
-		shitcode.master = master
diff --git a/code/modules/antagonists/heretic/items/heretic_necks.dm b/code/modules/antagonists/heretic/items/heretic_necks.dm
index e1a2b0a70558d..28f7d08de2789 100644
--- a/code/modules/antagonists/heretic/items/heretic_necks.dm
+++ b/code/modules/antagonists/heretic/items/heretic_necks.dm
@@ -9,16 +9,16 @@
 	. = ..()
 	AddElement(/datum/element/heretic_focus)
 
-/obj/item/clothing/neck/heretic_focus/crimson_focus
-	name = "Crimson Focus"
+/obj/item/clothing/neck/heretic_focus/crimson_medallion
+	name = "Crimson Medallion"
 	desc = "A blood-red focusing glass that provides a link to the world beyond, and worse. Its eye is constantly twitching and gazing in all directions. It almost seems to be silently screaming..."
-	icon_state = "crimson_focus"
+	icon_state = "crimson_medallion"
 	/// The aura healing component. Used to delete it when taken off.
 	var/datum/component/component
 	/// If active or not, used to add and remove its cult and heretic buffs.
 	var/active = FALSE
 
-/obj/item/clothing/neck/heretic_focus/crimson_focus/equipped(mob/living/user, slot)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/equipped(mob/living/user, slot)
 	. = ..()
 	if(!(slot & ITEM_SLOT_NECK))
 		return
@@ -51,7 +51,7 @@
 		healing_color = team_color, \
 	)
 
-/obj/item/clothing/neck/heretic_focus/crimson_focus/dropped(mob/living/user)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/dropped(mob/living/user)
 	. = ..()
 
 	if(!istype(user))
@@ -75,7 +75,7 @@
 	magic_holder?.magic_enhanced = FALSE
 
 
-/obj/item/clothing/neck/heretic_focus/crimson_focus/attack_self(mob/living/user, modifiers)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/attack_self(mob/living/user, modifiers)
 	. = ..()
 	to_chat(user, span_danger("You start tightly squeezing [src]..."))
 	if(!do_after(user, 1.25 SECONDS, src))
@@ -90,7 +90,7 @@
 	user.reagents?.add_reagent(/datum/reagent/eldritch, rand(6, 10))
 	qdel(src)
 
-/obj/item/clothing/neck/heretic_focus/crimson_focus/examine(mob/user)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/examine(mob/user)
 	. = ..()
 
 	var/magic_dude
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index 6d2f231d31ddf..a435668a520b6 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of Ash.
- * Spell names are in this language: OLD NORDIC
- * Both are related: Nordic Mythology-Yggdrassil-Ash Tree Genus-Ash
  *
  * Goes as follows:
  *
@@ -233,7 +231,7 @@
 		text = "[generate_heretic_text()] Бойтесь пламени, ибо Пепельный лорд, [user.real_name], вознесся! Пламя поглотит всех! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_ash.ogg',
-		color_override = "white",
+		color_override = "pink",
 	)
 
 	var/datum/action/cooldown/spell/fire_sworn/circle_spell = new(user.mind)
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index d263980169b2c..6711cc7177126 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of Blades. Stab stab.
- * Spell names are in this language: ARAMAIC
- * Both are related: Aramaic-Damascus-Blade
  *
  * Goes as follows:
  *
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 670fb8fac6fd8..9295178bfb9ea 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of Cosmos.
- * Spell names are in this language: SUMERIAN
- * Both are related: Sumerian-Original-Primordial-Cosmic
  *
  * Goes as follows:
  *
@@ -285,7 +283,7 @@
 		text = "[generate_heretic_text()] Звездочет прибыл на станцию, [user.real_name] вознесся! Эта станция - владения Космоса! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_cosmic.ogg',
-		color_override = "purple",
+		color_override = "pink",
 	)
 	var/mob/living/basic/heretic_summon/star_gazer/star_gazer_mob = new /mob/living/basic/heretic_summon/star_gazer(loc)
 	star_gazer_mob.maxHealth = INFINITY
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 5547bb974758c..13e35f4ab013c 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -5,8 +5,6 @@
 
 /**
  * # The path of Flesh.
- * Spell names are in this language: LATIN
- * Both are related: Latin-Rome-Hedonism-Flesh
  *
  * Goes as follows:
  *
@@ -332,7 +330,7 @@
 		text = "[generate_heretic_text()] Вечно закручивающийся вихрь. Реальность развернулась. С ВЫТЯНУТЫМИ РУКАМИ, ВЛАСТЕЛИН НОЧИ, [user.real_name] вознесся! Бойтесь вечно изгибающейся руки! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_flesh.ogg',
-		color_override = "red",
+		color_override = "pink",
 	)
 
 	var/datum/action/cooldown/spell/shapeshift/shed_human_form/worm_spell = new(user.mind)
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index 5c41a793355da..61d0d4739d1d2 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of Lock.
- * Spell names are in this language: EGYPTIAN
- * Both are related: Egyptian-Mysteries-Secrets-Lock
  *
  * Goes as follows:
  *
@@ -243,7 +241,7 @@
 		text = "Пространственная аномалия Дельта-класса обнар[generate_heretic_text()] Реальность разрушена, разорвана. Врата открыты, двери открыты, [user.real_name] вознесся! Бойтесь нашествия! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_knock.ogg',
-		color_override = "yellow",
+		color_override = "pink",
 	)
 
 	// buffs
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 511ac0f0cafbd..bad84b041651a 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of Moon.
- * Spell names are in this language: ANCIENT HEBREW
- * Both are related: Ancient Hebrew-Moon Mysticism-Moon
  *
  * Goes as follows:
  *
@@ -211,7 +209,7 @@
 				Правда наконец поглотит ложь! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_moon.ogg',
-		color_override = "blue",
+		color_override = "pink",
 	)
 
 	ADD_TRAIT(user, TRAIT_MADNESS_IMMUNE, REF(src))
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index 0fe648d8ecbb4..677851fec2581 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -1,6 +1,5 @@
 /**
  * # The path of Rust.
- * Spell names are in this language: OLD SLAVIC
  *
  * Goes as follows:
  *
@@ -220,7 +219,6 @@
 	/// A static list of traits we give to the heretic when on rust.
 	var/static/list/conditional_immunities = list(
 		TRAIT_BOMBIMMUNE,
-		TRAIT_IGNOREDAMAGESLOWDOWN,
 		TRAIT_IGNORESLOWDOWN,
 		TRAIT_NO_SLIP_ALL,
 		TRAIT_NOBREATH,
@@ -258,7 +256,7 @@
 		text = "[generate_heretic_text()] Бойтесь разложения, ведь Повелитель ржавчины, [user.real_name] вознесся! Никто не избежит коррозии! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_rust.ogg',
-		color_override = "brown",
+		color_override = "pink",
 	)
 	trigger(loc)
 	RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
@@ -306,7 +304,7 @@
  *
  * Gives our heretic ([source]) buffs if they stand on rust.
  */
-/datum/heretic_knowledge/ultimate/rust_final/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs)
+/datum/heretic_knowledge/ultimate/rust_final/proc/on_move(mob/living/source, atom/old_loc, dir, forced, list/old_locs)
 	SIGNAL_HANDLER
 
 	// If we're on a rusty turf, and haven't given out our traits, buff our guy
@@ -314,12 +312,14 @@
 	if(HAS_TRAIT(our_turf, TRAIT_RUSTY))
 		if(!immunities_active)
 			source.add_traits(conditional_immunities, type)
+			source.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
 			immunities_active = TRUE
 
 	// If we're not on a rust turf, and we have given out our traits, nerf our guy
 	else
 		if(immunities_active)
 			source.remove_traits(conditional_immunities, type)
+			source.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
 			immunities_active = FALSE
 
 /**
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index 25656f377a68b..af364371808d2 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -214,7 +214,7 @@
 		heretic_datum.knowledge_points += 3
 		heretic_datum.high_value_sacrifices++
 		feedback += " <i>с великодушием</i>"
-	else if(cultist_datum)
+	if(cultist_datum)
 		heretic_datum.knowledge_points += 1
 		grant_reward(user, sacrifice, loc)
 		// easier to read
@@ -229,9 +229,9 @@
 					span_narsie(" one of our own. Destroy and sacrifice the infidel before it claims more!")
 					to_chat(mind.current, message)
 			// he(retic) gets a warn too
-			var/message = span_cult_bold("You feel that your action has attracted") + \
-			span_cult_bold_italic(" attention.")
-			to_chat(user, message)
+			to_chat(user, span_narsiesmall("How DARE you!? I will see you destroyed for this."))
+			var/non_flavor_warning = span_cult_bold("You feel that your action has attracted ") + span_hypnophrase("attention") + span_cult_bold(".")
+			to_chat(user, non_flavor_warning)
 		return
 	else
 		heretic_datum.knowledge_points += 2
@@ -263,12 +263,6 @@
 	var/datum/antagonist/heretic/antag = IS_HERETIC(user)
 	antag.rewards_given++
 
-	// We limit the amount so the heretic doesn't just turn into a frickin' god (early)
-	to_chat(user, span_hierophant("You feel the rotten energies of the infidel warp and twist, mixing with that of your own..."))
-	if(prob(8 * antag.rewards_given))
-		to_chat(user, span_hierophant("Faint, dark red sparks flit around the dust, then fade. It looks like your patrons weren't able to fashion something out of it."))
-		return
-
 	// Cool effect for the rune as well as the item
 	var/obj/effect/heretic_rune/rune = locate() in range(2, user)
 	if(rune)
@@ -285,7 +279,7 @@
 /datum/heretic_knowledge/hunt_and_sacrifice/proc/deposit_reward(mob/user, turf/loc, loop = 0, obj/rune)
 	if(loop > 5) // Max limit for retrying a reward
 		return
-	// Remove the rays, we don't need them anymore.
+	// Remove the outline, we don't need it anymore.
 	rune?.remove_filter("reward_outline")
 	playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE)
 	var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
index 0953db4571aad..a09b741e6fcfe 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks)
 	has_gravity = STANDARD_GRAVITY
 	ambience_index = AMBIENCE_SPOOKY
 	sound_environment = SOUND_ENVIRONMENT_CAVE
-	area_flags = UNIQUE_AREA | NOTELEPORT | HIDDEN_AREA | BLOCK_SUICIDE
+	area_flags = UNIQUE_AREA | NOTELEPORT | HIDDEN_AREA | BLOCK_SUICIDE | NO_BOH
 
 /area/centcom/heretic_sacrifice/Initialize(mapload)
 	if(!ambientsounds)
diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
index af7bc1c98ae56..fa474ee51bd0e 100644
--- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
@@ -1,5 +1,4 @@
 // Heretic starting knowledge.
-// Default heretic language is Ancient Greek, because, uh, they're like ancient and shit.
 
 /// Global list of all heretic knowledge that have route = PATH_START. List of PATHS.
 GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm
index 0d8dbbec36f3d..a876b36df17da 100644
--- a/code/modules/antagonists/heretic/knowledge/void_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm
@@ -1,7 +1,5 @@
 /**
  * # The path of VOID.
- * Spell names are in this language: PALI
- * Both are related: Pali-Buddhism-Nothingness-Void
  *
  * Goes as follows:
  *
@@ -221,7 +219,7 @@
 		text = "[generate_heretic_text()] Дворянин пустоты [user.real_name] прибыл, танцуя Вальс, уничтожающий миры! [generate_heretic_text()]",
 		title = "[generate_heretic_text()]",
 		sound = 'sound/ambience/antag/heretic/ascend_void.ogg',
-		color_override = "blue",
+		color_override = "pink",
 	)
 	ADD_TRAIT(user, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
 
diff --git a/code/modules/antagonists/heretic/magic/aggressive_spread.dm b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
index c7eb726b459d4..bd77b7804dba5 100644
--- a/code/modules/antagonists/heretic/magic/aggressive_spread.dm
+++ b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
@@ -10,8 +10,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Agresiv'noe rasprostra-neniye!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "A'GRSV SPR'D"
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	aoe_radius = 2
diff --git a/code/modules/antagonists/heretic/magic/apetravulnera.dm b/code/modules/antagonists/heretic/magic/apetravulnera.dm
index 8a8f2f931d85d..b64d906c53332 100644
--- a/code/modules/antagonists/heretic/magic/apetravulnera.dm
+++ b/code/modules/antagonists/heretic/magic/apetravulnera.dm
@@ -10,8 +10,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 45 SECONDS
 
-	invocation = "Shea' shen-eh!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "AP'TRA VULN'RA!"
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	cast_range = 4
diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm
index bc7b67a0ce121..0a71f025ebbd6 100644
--- a/code/modules/antagonists/heretic/magic/ash_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm
@@ -10,7 +10,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 70 SECONDS
 
-	invocation = "EID'R-ELDR!!!"
+	invocation = "FL'MS"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
@@ -72,8 +72,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "ILLA-LASARA'FOSS!!!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "C'SC'DE"
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	/// The radius the flames will go around the caster.
@@ -112,7 +112,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 300
 
-	invocation = "Eld'sky!"
+	invocation = "F'RE"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
index 7e6e03d392e66..b831665a84bae 100644
--- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm
+++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
@@ -10,7 +10,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 15 SECONDS
 
-	invocation = "Askgraar' goetur!"
+	invocation = "ASH'N P'SSG'"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/blood_cleave.dm b/code/modules/antagonists/heretic/magic/blood_cleave.dm
index 672dd23a98f71..41c415843b791 100644
--- a/code/modules/antagonists/heretic/magic/blood_cleave.dm
+++ b/code/modules/antagonists/heretic/magic/blood_cleave.dm
@@ -10,7 +10,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 45 SECONDS
 
-	invocation = "Fer're!"
+	invocation = "CL'VE!"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm
index ef0f485815a06..7b269730ec05f 100644
--- a/code/modules/antagonists/heretic/magic/blood_siphon.dm
+++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 15 SECONDS
 
-	invocation = "Sanguis suctio!"
+	invocation = "FL'MS O'ET'RN'ITY."
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/burglar_finesse.dm b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
index 93bd5e354623e..74c753dc3b9a7 100644
--- a/code/modules/antagonists/heretic/magic/burglar_finesse.dm
+++ b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
@@ -9,7 +9,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 40 SECONDS
 
-	invocation = "Khenem"
+	invocation = "Y'O'K!"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
index cb3a8db081c03..f025e40ce6743 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 45 SECONDS
 
-	invocation = "An'gar baltil!"
+	invocation = "C'SM'S 'XP'ND"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/cosmic_runes.dm b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
index 513d7d43af346..bf1d64c2ed13d 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_runes.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 15 SECONDS
 
-	invocation = "Is'zara-runen"
+	invocation = "ST'R R'N'"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/eldritch_blind.dm b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
index 413ff4fe67810..8df20503821b0 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_blind.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
@@ -5,7 +5,7 @@
 	overlay_icon_state = "bg_heretic_border"
 
 	school = SCHOOL_FORBIDDEN
-	invocation = "Caecus"
+	invocation = "E'E'S"
 	spell_requirements = NONE
 
 	cast_range = 10
diff --git a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
index 931642f96b1a9..b2f7a9886e49f 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
@@ -8,7 +8,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Pulsus Energiae"
+	invocation = "E'P"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
index a3fbd64728869..f17e10458122d 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
@@ -7,7 +7,7 @@
 	overlay_icon_state = "bg_heretic_border"
 
 	school = SCHOOL_FORBIDDEN
-	invocation = "Forma"
+	invocation = "SH'PE"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm
index 98fe5bbdb3ea6..3c57b8f6de5b8 100644
--- a/code/modules/antagonists/heretic/magic/fire_blast.dm
+++ b/code/modules/antagonists/heretic/magic/fire_blast.dm
@@ -12,7 +12,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 45 SECONDS
 
-	invocation = "Eld'fjall!"
+	invocation = "V'LC'N!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 	channel_time = 5 SECONDS
diff --git a/code/modules/antagonists/heretic/magic/flesh_ascension.dm b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
index 08e2f144066e9..1bd8fe97a89ed 100644
--- a/code/modules/antagonists/heretic/magic/flesh_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
@@ -9,7 +9,7 @@
 
 	school = SCHOOL_FORBIDDEN
 
-	invocation = "REALITAS EXSERPAT!!"
+	invocation = "REALITY UNCOIL!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index 9b4c0f5279dd0..c47b72ab7dc63 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -11,8 +11,8 @@
 
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 20 SECONDS
-	invocation = "Carnis chirurgia"
-	invocation_type = INVOCATION_WHISPER
+	invocation = "CL'M M'N!" // "CLAIM MINE", but also almost "KALI MA"
+	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
 	hand_path = /obj/item/melee/touch_attack/flesh_surgery
@@ -83,7 +83,7 @@
 
 	return .
 
-/// If cast on an organ, we'll restore it's health and even un-fail it.
+/// If cast on an organ, we'll restore its health and even un-fail it.
 /datum/action/cooldown/spell/touch/flesh_surgery/proc/heal_organ(obj/item/melee/touch_attack/hand, obj/item/organ/to_heal, mob/living/carbon/caster)
 	if(to_heal.damage == 0)
 		to_heal.balloon_alert(caster, "уже в хорошем состоянии!")
diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm
index 64b15d65f9570..31af20d9126e9 100644
--- a/code/modules/antagonists/heretic/magic/furious_steel.dm
+++ b/code/modules/antagonists/heretic/magic/furious_steel.dm
@@ -11,7 +11,7 @@
 
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 60 SECONDS
-	invocation = "Ham'sana-qasep!"
+	invocation = "F'LSH'NG S'LV'R!"
 	invocation_type = INVOCATION_SHOUT
 
 	spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/manse_link.dm b/code/modules/antagonists/heretic/magic/manse_link.dm
index fddb253dbbb42..d9fe06f3fb4d0 100644
--- a/code/modules/antagonists/heretic/magic/manse_link.dm
+++ b/code/modules/antagonists/heretic/magic/manse_link.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 20 SECONDS
 
-	invocation = "Diaperaste' to-myalo!"
+	invocation = "PI'RC' TH' M'ND."
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 	antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND
diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
index c464506cb3314..df4e68c91bf58 100644
--- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm
+++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
@@ -10,7 +10,7 @@
 	school = SCHOOL_EVOCATION
 	cooldown_time = 10 SECONDS
 
-	invocation = "Ad verum per aspera!"
+	invocation = "R'CH T'H TR'TH!"
 	invocation_type = INVOCATION_SHOUT
 	// Mimes can cast it. Chaplains can cast it. Anyone can cast it, so long as they have a hand.
 	spell_requirements = SPELL_CASTABLE_WITHOUT_INVOCATION
diff --git a/code/modules/antagonists/heretic/magic/mind_gate.dm b/code/modules/antagonists/heretic/magic/mind_gate.dm
index 205e54d779bbe..2db7c989ff5d5 100644
--- a/code/modules/antagonists/heretic/magic/mind_gate.dm
+++ b/code/modules/antagonists/heretic/magic/mind_gate.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 20 SECONDS
 
-	invocation = "Sha'ar ha-da'at"
+	invocation = "Op' 'oY 'Mi'd"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 	cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/moon_parade.dm b/code/modules/antagonists/heretic/magic/moon_parade.dm
index e0247bf9f47f0..b645f65bd4880 100644
--- a/code/modules/antagonists/heretic/magic/moon_parade.dm
+++ b/code/modules/antagonists/heretic/magic/moon_parade.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Tsiyun' levani!"
+	invocation = "L'N'R P'RAD"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/moon_ringleader.dm b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
index 77c75ff0c9e80..7697a8774f132 100644
--- a/code/modules/antagonists/heretic/magic/moon_ringleader.dm
+++ b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
@@ -12,7 +12,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 1 MINUTES
 
-	invocation = "Manahel-qomem!"
+	invocation = "R''S 'E"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/moon_smile.dm b/code/modules/antagonists/heretic/magic/moon_smile.dm
index 92fde68f37795..dab49f213e638 100644
--- a/code/modules/antagonists/heretic/magic/moon_smile.dm
+++ b/code/modules/antagonists/heretic/magic/moon_smile.dm
@@ -12,7 +12,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 20 SECONDS
 
-	invocation = "Hiyuk-levana!"
+	invocation = "Mo'N S'M'LE"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 	cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
index bac0fde3606d3..a4df7d1da68a0 100644
--- a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
+++ b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 1 MINUTES
 
-	invocation = "Dyrth-a Vaktry'ggjandi"
+	invocation = "GL'RY T' TH' N'GHT'W'TCH'ER"
 	invocation_type = INVOCATION_WHISPER
 	spell_requirements = SPELL_REQUIRES_HUMAN
 
diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm
index 5afabd2c8b7c3..5c02d8ac312ce 100644
--- a/code/modules/antagonists/heretic/magic/realignment.dm
+++ b/code/modules/antagonists/heretic/magic/realignment.dm
@@ -14,8 +14,8 @@
 	cooldown_reduction_per_rank = -6 SECONDS // we're not a wizard spell but we use the levelling mechanic
 	spell_max_level = 10 // we can get up to / over a minute duration cd time
 
-	invocation = "Rasut"
-	invocation_type = INVOCATION_WHISPER
+	invocation = "R'S'T."
+	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
 /datum/action/cooldown/spell/realignment/is_valid_target(atom/cast_on)
diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm
index 714244f645f8d..2a316e98d9730 100644
--- a/code/modules/antagonists/heretic/magic/rust_wave.dm
+++ b/code/modules/antagonists/heretic/magic/rust_wave.dm
@@ -13,8 +13,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Entro'pichniy-plim!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "'NTR'P'C PL'M'"
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	cone_levels = 5
@@ -78,8 +78,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 35 SECONDS
 
-	invocation = "Diffunde' verbum!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "SPR'D TH' WO'D"
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	projectile_type = /obj/projectile/magic/aoe/rust_wave
diff --git a/code/modules/antagonists/heretic/magic/space_crawl.dm b/code/modules/antagonists/heretic/magic/space_crawl.dm
index c27f8da88cade..2e998aca2b1b9 100644
--- a/code/modules/antagonists/heretic/magic/space_crawl.dm
+++ b/code/modules/antagonists/heretic/magic/space_crawl.dm
@@ -84,8 +84,8 @@
 
 	RegisterSignal(jaunter, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost))
 	RegisterSignal(jaunter, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
-	our_turf.visible_message(span_warning("[jaunter] погружается в [our_turf]!"))
 	playsound(our_turf, 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
+	our_turf.visible_message(span_warning("[jaunter] погружается в [our_turf]!"))
 	new /obj/effect/temp_visual/space_explosion(our_turf)
 	jaunter.extinguish_mob()
 
@@ -102,7 +102,6 @@
 
 	if(!exit_jaunt(jaunter, our_turf))
 		return FALSE
-
 	our_turf.visible_message(span_boldwarning("[jaunter] встаёт из [our_turf]!"))
 	return TRUE
 
diff --git a/code/modules/antagonists/heretic/magic/star_blast.dm b/code/modules/antagonists/heretic/magic/star_blast.dm
index b98cdfc842cd7..607ce3f52d84e 100644
--- a/code/modules/antagonists/heretic/magic/star_blast.dm
+++ b/code/modules/antagonists/heretic/magic/star_blast.dm
@@ -10,7 +10,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 20 SECONDS
 
-	invocation = "Pi-rig is'zara!"
+	invocation = "R'T'T' ST'R!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm
index 58d52cbaf48c6..1558c8a622975 100644
--- a/code/modules/antagonists/heretic/magic/star_touch.dm
+++ b/code/modules/antagonists/heretic/magic/star_touch.dm
@@ -13,7 +13,7 @@
 	sound = 'sound/items/welder.ogg'
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 15 SECONDS
-	invocation = "An'gar sig!"
+	invocation = "ST'R 'N'RG'!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 	antimagic_flags = MAGIC_RESISTANCE
diff --git a/code/modules/antagonists/heretic/magic/void_cold_cone.dm b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
index 0daf3577f1aee..d29f29d3d35f4 100644
--- a/code/modules/antagonists/heretic/magic/void_cold_cone.dm
+++ b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
@@ -11,7 +11,7 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Sunya'kop!"
+	invocation = "FR'ZE!"
 	invocation_type = INVOCATION_SHOUT
 	spell_requirements = NONE
 
diff --git a/code/modules/antagonists/heretic/magic/void_phase.dm b/code/modules/antagonists/heretic/magic/void_phase.dm
index 39059d5d712b1..7588c82ceb925 100644
--- a/code/modules/antagonists/heretic/magic/void_phase.dm
+++ b/code/modules/antagonists/heretic/magic/void_phase.dm
@@ -12,8 +12,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 30 SECONDS
 
-	invocation = "Sunya'sthiti!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "RE'L'TY PH'S'E."
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	cast_range = 9
diff --git a/code/modules/antagonists/heretic/magic/void_pull.dm b/code/modules/antagonists/heretic/magic/void_pull.dm
index 3d4409e8d49ee..233e78e1560f5 100644
--- a/code/modules/antagonists/heretic/magic/void_pull.dm
+++ b/code/modules/antagonists/heretic/magic/void_pull.dm
@@ -11,8 +11,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 40 SECONDS
 
-	invocation = "Sunya'apamkti!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "BR'NG F'RTH TH'M T' M'."
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	aoe_radius = 7
diff --git a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
index 87caca7496fd2..bfe0fc1d203e4 100644
--- a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
+++ b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
@@ -11,8 +11,8 @@
 	school = SCHOOL_FORBIDDEN
 	cooldown_time = 5 MINUTES
 
-	invocation = "Kher' Sekh-em waaef'k!"
-	invocation_type = INVOCATION_SHOUT
+	invocation = "F'K 'FF."
+	invocation_type = INVOCATION_WHISPER
 	spell_requirements = NONE
 
 	aoe_radius = 3
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index cd354ee860ac9..cfdc99a68c659 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -53,11 +53,11 @@
 	alert_type = /atom/movable/screen/alert/status_effect/marshal
 
 /datum/status_effect/marshal/on_apply()
-	ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+	owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 	return TRUE
 
 /datum/status_effect/marshal/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+	owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
 
 /datum/status_effect/marshal/tick(seconds_between_ticks)
 	if(!iscarbon(owner))
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 077bd2158b8f6..a1c31241e0b75 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -12,6 +12,7 @@
 		TRAIT_NODISMEMBER,
 		TRAIT_NOFIRE,
 		TRAIT_NOGUNS,
+		TRAIT_TOSS_GUN_HARD,
 		TRAIT_SHOCKIMMUNE,
 	)
 
diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
index 14bbe52c2cf69..695e4df39e6b6 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -266,7 +266,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
 		active = FALSE
 		return
 	if (owner_AI.stat != DEAD)
-		priority_announce("Во всех системах станций обнаружены вредоносные процессы. Пожалуйста, уничтожьте свой ИИ, чтобы предотвратить возможный ущерб его моральному ядру.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_AIMALF)
+		priority_announce("Во всех системах станций обнаружены вредоносные процессы. Пожалуйста, уничтожьте свой ИИ, чтобы предотвратить возможный ущерб его моральному ядру.", "Обнаружена аномалия", ANNOUNCER_AIMALF)
 		SSsecurity_level.set_level(SEC_LEVEL_DELTA)
 		var/obj/machinery/doomsday_device/DOOM = new(owner_AI)
 		owner_AI.nuking = TRUE
@@ -1044,14 +1044,14 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
 				owner.speech_span = say_span
 			to_chat(usr, span_notice("Голос установлен на [selection]."))
 		if("verb")
-			say_verb = params["verb"]
+			say_verb = strip_html(params["verb"], MAX_NAME_LEN)
 			if(changing_voice)
 				owner.verb_say = say_verb
 				owner.verb_ask = say_verb
 				owner.verb_exclaim = say_verb
 				owner.verb_yell = say_verb
 		if("name")
-			say_name = params["name"]
+			say_name = strip_html(params["name"], MAX_NAME_LEN)
 
 /datum/ai_module/utility/emag
 	name = "Targeted Safeties Override"
diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm
index ec07639cb449c..6fbe6c6097bec 100644
--- a/code/modules/antagonists/nightmare/nightmare_equipment.dm
+++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm
@@ -52,10 +52,9 @@
 	if(!has_crit)
 		return
 	playsound(target, 'sound/effects/wounds/crackandbleed.ogg', 100, TRUE)
-	var/datum/dna/target_dna = target.has_dna()
 	if(target.stat == DEAD)
 		user.visible_message(span_warning("[user] gores [target] with [src]!"), span_warning("You gore [target] with [src], which doesn't accomplish much, but it does make you feel a little better."))
-	else if(!target_dna?.check_mutation(/datum/mutation/human/hulk) && (iscarbon(target) || issilicon(target)))
+	else if(!HAS_TRAIT(target, TRAIT_HULK) && (iscarbon(target) || issilicon(target)))
 		user.visible_message(span_boldwarning("[user] gores [target] with [src], bringing them to a halt!"), span_userdanger("You gore [target] with [src], bringing them to a halt!"))
 		target.Paralyze(issilicon(target) ? 2 SECONDS : 1 SECONDS)
 	else
diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm
index 576b911652fa0..a77aaa79b23ea 100644
--- a/code/modules/antagonists/nightmare/nightmare_organs.dm
+++ b/code/modules/antagonists/nightmare/nightmare_organs.dm
@@ -70,6 +70,8 @@
 	visual = TRUE
 	color = COLOR_CRAYON_BLACK
 	decay_factor = 0
+	// No love is to be found in a heart so twisted.
+	food_reagents = list(/datum/reagent/consumable/nutriment = 5)
 	/// How many life ticks in the dark the owner has been dead for. Used for nightmare respawns.
 	var/respawn_progress = 0
 	/// The armblade granted to the host of this heart.
diff --git a/code/modules/antagonists/ninja/energy_katana.dm b/code/modules/antagonists/ninja/energy_katana.dm
index 61a9b81c364c1..e52367f6a0c84 100644
--- a/code/modules/antagonists/ninja/energy_katana.dm
+++ b/code/modules/antagonists/ninja/energy_katana.dm
@@ -12,7 +12,7 @@
 /obj/item/energy_katana
 	name = "energy katana"
 	desc = "A katana infused with strong energy."
-	desc_controls = "Right-click to dash."
+	desc_controls = "ПКМ для скачка."
 	icon = 'icons/obj/weapons/sword.dmi'
 	icon_state = "energy_katana"
 	inhand_icon_state = "energy_katana"
diff --git a/code/modules/antagonists/ninja/energy_net_nets.dm b/code/modules/antagonists/ninja/energy_net_nets.dm
index 111d1f2651548..6a3ccf17a8d57 100644
--- a/code/modules/antagonists/ninja/energy_net_nets.dm
+++ b/code/modules/antagonists/ninja/energy_net_nets.dm
@@ -34,7 +34,7 @@
 
 /obj/structure/energy_net/atom_destruction(damage_flag)
 	for(var/mob/recovered_mob as anything in buckled_mobs)
-		recovered_mob.visible_message(span_notice("[recovered_mob] is recovered from the energy net!"), span_notice("You are recovered from the energy net!"), span_hear("You hear a grunt."))
+		recovered_mob.visible_message(span_notice("[recovered_mob] высвобождается из энергетической сети!"), span_notice("Вы высвобождаетесь из энергетической сети!"), span_hear("Вы слышите треск."))
 	return ..()
 
 /obj/structure/energy_net/attack_paw(mob/user, list/modifiers)
diff --git a/code/modules/antagonists/ninja/ninjaDrainAct.dm b/code/modules/antagonists/ninja/ninjaDrainAct.dm
index f160ebb9c6244..8778658b19bf3 100644
--- a/code/modules/antagonists/ninja/ninjaDrainAct.dm
+++ b/code/modules/antagonists/ninja/ninjaDrainAct.dm
@@ -110,9 +110,9 @@
 	// If the traitor theft objective is still present, this will destroy it...
 	if(!source_code_hdd)
 		return ..()
-	to_chat(ninja, span_notice("Hacking \the [src]..."))
+	to_chat(ninja, span_notice("Взламываем [src.name]..."))
 	AI_notify_hack()
-	to_chat(ninja, span_notice("Encrypted source code detected. Overloading storage device..."))
+	to_chat(ninja, span_notice("Обнаружен зашифрованный исходный код. Перегрузка устройства хранения данных..."))
 	INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -120,7 +120,7 @@
 	if(!do_after(ninja, 30 SECONDS, target = src, hidden = TRUE))
 		return
 	overload_source_code_hdd()
-	to_chat(ninja, span_notice("Sabotage complete. Storage device overloaded."))
+	to_chat(ninja, span_notice("Саботаж завершен. Устройство хранения перегружено."))
 	var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
 	if(!ninja_antag)
 		return
@@ -131,7 +131,7 @@
 /obj/machinery/rnd/server/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(!ninja || !hacking_module)
 		return NONE
-	to_chat(ninja, span_notice("Research notes detected. Corrupting data..."))
+	to_chat(ninja, span_notice("Обнаружены исследовательские материалы. Повреждаем данные..."))
 	INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -139,7 +139,7 @@
 	if(!do_after(ninja, 30 SECONDS, target = src, hidden = TRUE))
 		return
 	stored_research.modify_points_all(0)
-	to_chat(ninja, span_notice("Sabotage complete. Research notes corrupted."))
+	to_chat(ninja, span_notice("Саботаж завершен. Исследовательские материалы повреждены."))
 	var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja)
 	if(!ninja_antag)
 		return
@@ -175,12 +175,12 @@
 /obj/machinery/computer/records/security/proc/can_hack(mob/living/hacker, feedback = FALSE)
 	if(machine_stat & (NOPOWER|BROKEN))
 		if(feedback && hacker)
-			balloon_alert(hacker, "can't hack!")
+			balloon_alert(hacker, "невозможно взломать!")
 		return FALSE
 	var/area/console_area = get_area(src)
 	if(!console_area || !(console_area.area_flags & VALID_TERRITORY))
 		if(feedback && hacker)
-			balloon_alert(hacker, "signal too weak!")
+			balloon_alert(hacker, "слишком слабый сигнал!")
 		return FALSE
 	return TRUE
 
@@ -259,7 +259,7 @@
 /obj/vehicle/sealed/mecha/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(!ninja || !hacking_module)
 		return NONE
-	to_chat(occupants, "[icon2html(src, occupants)][span_danger("Warning: Unauthorized access through sub-route 4, block H, detected.")]")
+	to_chat(occupants, "[icon2html(src, occupants)][span_danger("Внимание: обнаружен несанкционированный доступ через подмаршрут 4 блока H.")]")
 	INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -290,7 +290,7 @@
 	if(!ninja || !hacking_module || (ROLE_NINJA in faction))
 		return NONE
 
-	to_chat(src, span_danger("Warni-***BZZZZZZZZZRT*** UPLOADING SPYDERPATCHER VERSION 9.5.2..."))
+	to_chat(src, span_danger("Внима-***БЗЗЗЗЗЗЗЗРРТ*** ЗАГРУЗКА SPYDERPATCHER ВЕРСИИ 9.5.2..."))
 	INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -299,7 +299,7 @@
 		return
 	spark_system.start()
 	playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
-	to_chat(src, span_danger("UPLOAD COMPLETE. NEW CYBORG MODEL DETECTED.  INSTALLING..."))
+	to_chat(src, span_danger("ЗАГРУЗКА ЗАВЕРШЕНА. ОБНАРУЖЕНА НОВАЯ МОДЕЛЬ КИБОРГА.  УСТАНОВКА..."))
 	faction = list(ROLE_NINJA)
 	bubble_icon = "syndibot"
 	UnlinkSelf()
@@ -324,7 +324,7 @@
 		var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
 		spark_system.set_up(5, 0, loc)
 		spark_system.start()
-		visible_message(span_danger("[ninja] electrocutes [src] with [ninja.p_their()] touch!"), span_userdanger("[ninja] electrocutes you with [ninja.p_their()] touch!"))
+		visible_message(span_danger("[ninja] бьет током [src] косанием!"), span_userdanger("[ninja] бьет вас током косанием!"))
 		addtimer(CALLBACK(src, PROC_REF(ninja_knockdown)), 0.3 SECONDS)
 	return NONE
 
@@ -335,7 +335,7 @@
 //CAMERAS//
 /obj/machinery/camera/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(isEmpProof(TRUE))
-		balloon_alert(ninja, "camera is shielded!")
+		balloon_alert(ninja, "камера экранирована!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	if(!hacking_module.mod.subtract_charge(DEFAULT_CHARGE_DRAIN * 5))
@@ -346,7 +346,7 @@
 
 //BOTS//
 /mob/living/simple_animal/bot/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
-	to_chat(src, span_boldwarning("Your circutry suddenly begins heating up!"))
+	to_chat(src, span_boldwarning("Ваши микросхемы внезапно начинают нагреваться!"))
 	if(!do_after(ninja, 1.5 SECONDS, target = src, hidden = TRUE))
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -355,7 +355,7 @@
 
 	do_sparks(number = 3, cardinal_only = FALSE, source = src)
 	playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 35, TRUE)
-	balloon_alert(ninja, "stand back!")
+	balloon_alert(ninja, "отойдите!")
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), src, 0, 1, 2, 3), 2.5 SECONDS)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
@@ -370,7 +370,7 @@
 //ENERGY WEAPONS//
 /obj/item/gun/energy/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(cell.charge == 0)
-		balloon_alert(ninja, "no energy!")
+		balloon_alert(ninja, "нет энергии!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	if(!do_after(ninja, 1.5 SECONDS, target = src, hidden = TRUE))
@@ -380,14 +380,14 @@
 	hacking_module.charge_message(src, cell.charge)
 	cell.charge = 0
 	update_appearance()
-	visible_message(span_warning("[ninja] drains the energy from the [src]!"))
+	visible_message(span_warning("[ninja] вытягивает энергию из [src.name]!"))
 	do_sparks(number = 3, cardinal_only = FALSE, source = src)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
 //VENDING MACHINES//
 /obj/machinery/vending/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(shoot_inventory)
-		balloon_alert(ninja, "already hacked!")
+		balloon_alert(ninja, "уже взломано!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	if(!do_after(ninja, 2 SECONDS, target = src, hidden = TRUE))
@@ -397,14 +397,14 @@
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	do_sparks(number = 3, cardinal_only = FALSE, source = src)
-	balloon_alert(ninja, "system overloaded!")
+	balloon_alert(ninja, "система перегружена!")
 	wires.on_pulse(WIRE_THROW)
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
 //RECYCLER//
 /obj/machinery/recycler/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(obj_flags & EMAGGED)
-		balloon_alert(ninja, "already hacked!")
+		balloon_alert(ninja, "уже взломано!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	AI_notify_hack()
@@ -419,7 +419,7 @@
 //ELEVATOR CONTROLS//
 /obj/machinery/elevator_control_panel/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	if(obj_flags & EMAGGED)
-		balloon_alert(ninja, "already hacked!")
+		balloon_alert(ninja, "уже взломано!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	if(!do_after(ninja, 2 SECONDS, target = src, hidden = TRUE))
@@ -434,11 +434,11 @@
 /obj/machinery/computer/tram_controls/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module)
 	var/datum/round_event/tram_malfunction/malfunction_event = locate(/datum/round_event/tram_malfunction) in SSevents.running
 	if(malfunction_event)
-		balloon_alert(ninja, "tram is already malfunctioning!")
+		balloon_alert(ninja, "трамвай уже неисправен!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	if(specific_transport_id != TRAMSTATION_LINE_1)
-		balloon_alert(ninja, "cannot hack this tram!")
+		balloon_alert(ninja, "невозможно взломать этот трамвай!")
 		return COMPONENT_CANCEL_ATTACK_CHAIN
 
 	AI_notify_hack()
diff --git a/code/modules/antagonists/ninja/ninja_explosive.dm b/code/modules/antagonists/ninja/ninja_explosive.dm
index 6e61ad687614f..12392d0cfff24 100644
--- a/code/modules/antagonists/ninja/ninja_explosive.dm
+++ b/code/modules/antagonists/ninja/ninja_explosive.dm
@@ -27,9 +27,9 @@
 	if (!IS_SPACE_NINJA(user))
 		return
 	if (isnull(detonation_area))
-		. += span_notice("This one was provided with no destination set, and cannot be used.")
+		. += span_notice("Это устройство было предоставлено без заданного места и не может быть использовано.")
 	else
-		. += span_notice("This device will only function in [detonation_area].")
+		. += span_notice("Это устройство сработает только в [detonation_area].")
 
 /**
  * set_detonation_area
@@ -49,7 +49,7 @@
 
 /obj/item/grenade/c4/ninja/plant_c4(atom/bomb_target, mob/living/user)
 	if(!IS_SPACE_NINJA(user))
-		say("Access denied.")
+		say("Доступ запрещён.")
 		return FALSE
 	if(!check_loc(user))
 		return FALSE
@@ -62,7 +62,7 @@
 	if(!check_loc(detonator.resolve())) // if its moved, deactivate the c4
 		var/obj/item/grenade/c4/ninja/new_c4 = new /obj/item/grenade/c4/ninja(target.loc)
 		new_c4.detonation_area = detonation_area
-		new_c4.say("Invalid location!")
+		new_c4.say("недопустимая локация!")
 		target.cut_overlay(plastic_overlay, TRUE)
 		qdel(src)
 		return
@@ -89,10 +89,10 @@
  */
 /obj/item/grenade/c4/ninja/proc/check_loc(mob/user)
 	if(isnull(detonation_area))
-		balloon_alert(user, "no location set!")
+		balloon_alert(user, "локация не установлена!")
 		return FALSE
 	if((get_area(target) != detonation_area) && (get_area(src) != detonation_area))
 		if (!active)
-			balloon_alert(user, "wrong location!")
+			balloon_alert(user, "неверное место!")
 		return FALSE
 	return TRUE
diff --git a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
index 852c0d7d32fbd..94c16d86dbeb5 100644
--- a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
+++ b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
@@ -42,5 +42,4 @@ Happy hunting!
 	icon_state = "sunhudmed"
 	flags_cover = GLASSESCOVERSEYES
 	flash_protect = FLASH_PROTECTION_WELDER
-	clothing_traits = list(TRAIT_REAGENT_SCANNER)
-	var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED)
+	clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_SECURITY_HUD, TRAIT_MEDICAL_HUD, TRAIT_DIAGNOSTIC_HUD)
diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
index 7f7722cc53d02..f842b5d6b6e33 100644
--- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm
+++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
@@ -54,7 +54,7 @@
 /obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode)
 	if(isliving(loc))
 		var/mob/living/L = loc
-		to_chat(L, span_userdanger("Your [name] beeps as it reconfigures it's tracking algorithms."))
+		to_chat(L, span_userdanger("Your [name] beeps as it reconfigures its tracking algorithms."))
 		playsound(L, 'sound/machines/triple_beep.ogg', 50, TRUE)
 	mode = new_mode
 	scan_for_target()
diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm
index 8c2820d11be68..4f7b8804f8a8e 100644
--- a/code/modules/antagonists/nukeop/outfits.dm
+++ b/code/modules/antagonists/nukeop/outfits.dm
@@ -52,8 +52,7 @@
 	if(command_radio)
 		radio.command = TRUE
 		radio.use_command = TRUE
-
-	if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc
+	if(ispath(uplink_type, /obj/item/uplink) || tc) // /obj/item/uplink understands 0 tc
 		var/obj/item/uplink = new uplink_type(nukie, nukie.key, tc)
 		nukie.equip_to_slot_or_del(uplink, ITEM_SLOT_BACKPACK, indirect_action = TRUE)
 
@@ -103,8 +102,8 @@
 	name = "Syndicate Operative - Reinforcement"
 	tc = 0
 	backpack_contents = list(
-		/obj/item/gun/ballistic/automatic/plastikov = 1,
-		/obj/item/ammo_box/magazine/plastikov9mm = 2,
+		/obj/item/gun/ballistic/automatic/smartgun = 1,
+		/obj/item/ammo_box/magazine/smartgun = 2,
 	)
 	var/faction = "The Syndicate"
 
diff --git a/code/modules/antagonists/pirate/pirate_roles.dm b/code/modules/antagonists/pirate/pirate_roles.dm
index 78a3d3fd12acf..3ea82d4c2002e 100644
--- a/code/modules/antagonists/pirate/pirate_roles.dm
+++ b/code/modules/antagonists/pirate/pirate_roles.dm
@@ -146,7 +146,7 @@
 	desc = "A surprisingly clean cryogenic sleeper. You can see your reflection on the sides!"
 	density = FALSE
 	you_are_text = "You are an agent working for the space IRS"
-	flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of it's income regardless! Through peaceful means or otherwise..."
+	flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of its income regardless! Through peaceful means or otherwise..."
 	icon = 'icons/obj/machines/sleeper.dmi'
 	icon_state = "sleeper"
 	prompt_name = "An agent of the space IRS"
@@ -208,7 +208,7 @@
 /obj/effect/mob_spawn/ghost_role/human/pirate/medieval/special(mob/living/carbon/spawned_mob)
 	. = ..()
 	if(rank == "Footsoldier")
-		ADD_TRAIT(spawned_mob, TRAIT_NOGUNS, INNATE_TRAIT)
+		spawned_mob.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), INNATE_TRAIT)
 		spawned_mob.AddComponent(/datum/component/unbreakable)
 		var/datum/action/cooldown/mob_cooldown/dash/dodge = new(spawned_mob)
 		dodge.Grant(spawned_mob)
diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
index ff69e2542d831..fa0e29a0bf203 100644
--- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
@@ -161,11 +161,14 @@
 	desc = "A disk that contains advanced surgery procedures, must be loaded into an Operating Console."
 	surgeries = list(
 		/datum/surgery/advanced/lobotomy,
+		/datum/surgery/advanced/lobotomy/mechanic,
 		/datum/surgery/advanced/bioware/vein_threading,
+		/datum/surgery/advanced/bioware/vein_threading/mechanic,
 		/datum/surgery/advanced/bioware/nerve_splicing,
+		/datum/surgery/advanced/bioware/nerve_splicing/mechanic,
 		/datum/surgery_step/heal/combo/upgraded,
 		/datum/surgery_step/pacify,
-		/datum/surgery_step/revive,
+		/datum/surgery_step/pacify/mechanic,
 	)
 
 //Pad & Pad Terminal
@@ -186,7 +189,7 @@
 	. = ..()
 	if (istype(I))
 		I.set_buffer(src)
-		balloon_alert(user, "saved to multitool buffer")
+		balloon_alert(user, "сохранён в буффер мультитула")
 		return TRUE
 
 /obj/machinery/piratepad/screwdriver_act_secondary(mob/living/user, obj/item/screwdriver/screw)
@@ -202,7 +205,7 @@
 /obj/machinery/computer/piratepad_control
 	name = "cargo hold control terminal"
 	///Message to display on the TGUI window.
-	var/status_report = "Ready for delivery."
+	var/status_report = "Готов к доставке."
 	///Reference to the specific pad that the control computer is linked up to.
 	var/datum/weakref/pad_ref
 	///How long does it take to warmup the pad to teleport?
@@ -231,7 +234,7 @@
 /obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
 	. = ..()
 	if (istype(I) && istype(I.buffer,/obj/machinery/piratepad))
-		to_chat(user, span_notice("You link [src] with [I.buffer] in [I] buffer."))
+		to_chat(user, span_notice("Вы привязываете [src.name] к [I.buffer] с помощью буффера [I.name]."))
 		pad_ref = WEAKREF(I.buffer)
 		return TRUE
 
@@ -288,7 +291,7 @@
 	if(sending)
 		return
 
-	status_report = "Predicted value: "
+	status_report = "Ожидаемая стоимость: "
 	var/value = 0
 
 	var/obj/machinery/piratepad/pad = pad_ref?.resolve()
@@ -310,7 +313,7 @@
 	var/obj/machinery/piratepad/pad = pad_ref?.resolve()
 	var/datum/export_report/report = pirate_export_loop(pad, dry_run = FALSE)
 
-	status_report = "Sold: "
+	status_report = "Получено: "
 	var/value = 0
 	for(var/datum/export/exported_datum in report.total_amount)
 		var/export_text = exported_datum.total_printout(report,notes = FALSE) //Don't want nanotrasen messages, makes no sense here.
@@ -333,9 +336,9 @@
 	points += value
 
 	if(!value)
-		status_report += "Nothing"
+		status_report += "Ничего"
 
-	pad.visible_message(span_notice("[pad] activates!"))
+	pad.visible_message(span_notice("[pad.name] активируется!"))
 	flick(pad.sending_state,pad)
 	pad.icon_state = pad.idle_state
 	sending = FALSE
@@ -381,8 +384,8 @@
 	if(sending)
 		return
 	sending = TRUE
-	status_report = "Sending... "
-	pad.visible_message(span_notice("[pad] starts charging up."))
+	status_report = "Отправка... "
+	pad.visible_message(span_notice("[pad.name] начинает заряжаться."))
 	pad.icon_state = pad.warmup_state
 	sending_timer = addtimer(CALLBACK(src, PROC_REF(send)),warmup_time, TIMER_STOPPABLE)
 
@@ -391,7 +394,7 @@
 	if(!sending)
 		return
 	sending = FALSE
-	status_report = "Ready for delivery."
+	status_report = "Готов к доставке."
 	if(custom_report)
 		status_report = custom_report
 	var/obj/machinery/piratepad/pad = pad_ref?.resolve()
diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm
index 7f88c687c12d1..a6648241e0bb8 100644
--- a/code/modules/antagonists/space_ninja/space_ninja.dm
+++ b/code/modules/antagonists/space_ninja/space_ninja.dm
@@ -1,5 +1,5 @@
 /datum/antagonist/ninja
-	name = "\improper Space Ninja"
+	name = "\proper Космический Ниндзя"
 	antagpanel_category = ANTAG_GROUP_NINJAS
 	job_rank = ROLE_NINJA
 	antag_hud_name = "ninja"
@@ -7,11 +7,11 @@
 	show_name_in_check_antagonists = TRUE
 	show_to_ghosts = TRUE
 	antag_moodlet = /datum/mood_event/focused
-	suicide_cry = "FOR THE SPIDER CLAN!!"
+	suicide_cry = "ЗА КЛАН ПАУКА!!"
 	preview_outfit = /datum/outfit/ninja_preview
 	can_assign_self_objectives = TRUE
 	ui_name = "AntagInfoNinja"
-	default_custom_objective = "Destroy vital station infrastructure, without being seen."
+	default_custom_objective = "Уничтожьте жизненно важную инфраструктуру станции, оставаясь незамеченным."
 	///Whether or not this ninja will obtain objectives
 	var/give_objectives = TRUE
 
@@ -32,11 +32,11 @@
  * Proc that adds the ninja starting memories to the owner of the antagonist datum.
  */
 /datum/antagonist/ninja/proc/addMemories()
-	antag_memory += "I am an elite mercenary of the mighty Spider Clan. A <font color='red'><B>SPACE NINJA</B></font>!<br>"
-	antag_memory += "Surprise is my weapon. Shadows are my armor. Without them, I am nothing.<br>"
+	antag_memory += "Я - элитный наёмник из могущественного клана Паука. <font color='red'><B>КОСМИЧЕСКИЙ НИНДЗЯ</B></font>!<br>"
+	antag_memory += "Неожиданность - мое оружие. Тень - моя броня. Без них, Я - ничто.<br>"
 
 /datum/objective/cyborg_hijack
-	explanation_text = "Use your gloves to convert at least one cyborg to aid you in sabotaging the station."
+	explanation_text = "Используйте свои перчатки, чтобы конвертировать хотя бы одного киборга, для оказания помощи в ваших задачах."
 
 /datum/objective/door_jack
 	///How many doors that need to be opened using the gloves to pass the objective
@@ -46,13 +46,13 @@
 	var/area/detonation_location
 
 /datum/objective/security_scramble
-	explanation_text = "Use your gloves on a security console to set everyone to arrest at least once.  Note that the AI will be alerted once you begin!"
+	explanation_text = "Используйте перчатки на консоли безопасности хотя бы один раз, чтобы установить арест на всех. Помните, что ИИ будет предупрежден, как только вы начнете!"
 
 /datum/objective/terror_message
-	explanation_text = "Use your gloves on a communication console in order to bring another threat to the station.  Note that the AI will be alerted once you begin!"
+	explanation_text = "Используйте свои перчатки на консоли коммуникации, чтобы навлечь на станцию еще одну угрозу. Помните, что ИИ будет предупрежден, как только вы начнете!"
 
 /datum/objective/research_secrets
-	explanation_text = "Use your gloves on a research & development server to sabotage research efforts.  Note that the AI will be alerted once you begin!"
+	explanation_text = "Используйте свои перчатки на сервере РНД, чтобы саботировать исследовательские проекты. Помните, что ИИ будет предупрежден, как только вы начнете!"
 
 /**
  * Proc that adds all the ninja's objectives to the antag datum.
@@ -71,7 +71,7 @@
 	//Door jacks, flag will be set to complete on when the last door is hijacked
 	var/datum/objective/door_jack/doorobjective = new /datum/objective/door_jack()
 	doorobjective.doors_required = rand(15,40)
-	doorobjective.explanation_text = "Use your gloves to doorjack [doorobjective.doors_required] airlocks on the station."
+	doorobjective.explanation_text = "Используйте свои перчатки, чтобы взломать [doorobjective.doors_required] шлюзов на станции."
 	objectives += doorobjective
 
 	//Explosive plant, the bomb will register its completion on priming
@@ -83,7 +83,7 @@
 		bombobjective.detonation_location = selected_area
 		break
 	if(bombobjective.detonation_location)
-		bombobjective.explanation_text = "Detonate your starter bomb in [bombobjective.detonation_location].  Note that the bomb will not work anywhere else!"
+		bombobjective.explanation_text = "Взорвите выданную вам бомбу в [bombobjective.detonation_location].  Учтите, что бомба не будет работать в любом другом месте!"
 		objectives += bombobjective
 
 	//Security Scramble, set to complete upon using your gloves on a security console
@@ -102,9 +102,9 @@
 /datum/antagonist/ninja/greet()
 	. = ..()
 	SEND_SOUND(owner.current, sound('sound/effects/ninja_greeting.ogg'))
-	to_chat(owner.current, span_danger("I am an elite mercenary of the mighty Spider Clan!"))
-	to_chat(owner.current, span_warning("Surprise is my weapon. Shadows are my armor. Without them, I am nothing."))
-	to_chat(owner.current, span_notice("The station is located to your [dir2text(get_dir(owner.current, locate(world.maxx/2, world.maxy/2, owner.current.z)))]. A thrown ninja star will be a great way to get there."))
+	to_chat(owner.current, span_danger("Я элитный наёмник из могущественного клана Паука!"))
+	to_chat(owner.current, span_warning("Неожиданность - мое оружие. Тень - моя броня. Без них, Я - ничто."))
+	to_chat(owner.current, span_notice("Станция находится в [dir2text(get_dir(owner.current, locate(world.maxx/2, world.maxy/2, owner.current.z)))]. Брошенный сюрикен станет отличным способом попасть туда."))
 	owner.announce_objectives()
 
 /datum/antagonist/ninja/on_gain()
diff --git a/code/modules/antagonists/spy/spy.dm b/code/modules/antagonists/spy/spy.dm
index 3c48c3aeca12a..846a5a7c80160 100644
--- a/code/modules/antagonists/spy/spy.dm
+++ b/code/modules/antagonists/spy/spy.dm
@@ -8,6 +8,8 @@
 	hijack_speed = 1
 	ui_name = "AntagInfoSpy"
 	preview_outfit = /datum/outfit/spy
+	can_assign_self_objectives = TRUE
+	default_custom_objective = "Rob the station blind."
 	/// Whether an uplink has been created (successfully or at all)
 	var/uplink_created = FALSE
 	/// String displayed in the antag panel pointing the spy to where their uplink is.
diff --git a/code/modules/antagonists/spy/spy_bounty.dm b/code/modules/antagonists/spy/spy_bounty.dm
index 581493ec915fa..463b6b63e22c4 100644
--- a/code/modules/antagonists/spy/spy_bounty.dm
+++ b/code/modules/antagonists/spy/spy_bounty.dm
@@ -186,7 +186,7 @@
 
 	var/datum/market_item/stolen_good/new_item = new(thing, item_price)
 
-	return SSblackmarket.markets[/datum/market/blackmarket].add_item(new_item)
+	return SSmarket.markets[/datum/market/blackmarket].add_item(new_item)
 
 /// Steal an item
 /datum/spy_bounty/objective_item
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 07f33fe81ba68..a0be91b49ac15 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -47,7 +47,8 @@
 	/// The uplink handler that this traitor belongs to.
 	var/datum/uplink_handler/uplink_handler
 
-	var/uplink_sale_count = 3
+	var/uplink_sales_min = 4
+	var/uplink_sales_max = 6
 
 	///the final objective the traitor has to accomplish, be it escaping, hijacking, or just martyrdom.
 	var/datum/objective/ending_objective
@@ -98,14 +99,14 @@
 
 		var/list/uplink_items = list()
 		for(var/datum/uplink_item/item as anything in SStraitor.uplink_items)
-			if(item.item && !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost > 1)
+			if(item.item && !item.cant_discount && (item.purchasable_from & uplink_handler.uplink_flag) && item.cost >= TRAITOR_DISCOUNT_MIN_PRICE)
 				if(!length(item.restricted_roles) && !length(item.restricted_species))
 					uplink_items += item
 					continue
 				if((uplink_handler.assigned_role in item.restricted_roles) || (uplink_handler.assigned_species in item.restricted_species))
 					uplink_items += item
 					continue
-		uplink_handler.extra_purchasable += create_uplink_sales(uplink_sale_count, /datum/uplink_category/discounts, 1, uplink_items)
+		uplink_handler.extra_purchasable += create_uplink_sales(rand(uplink_sales_min, uplink_sales_max), /datum/uplink_category/discounts, 1, uplink_items)
 
 	if(give_objectives)
 		forge_traitor_objectives()
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/battle_royale.dm b/code/modules/antagonists/traitor/objectives/final_objective/battle_royale.dm
index 9b8f519da959d..e5208ff8331b9 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/battle_royale.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/battle_royale.dm
@@ -38,6 +38,6 @@
 	equipped = TRUE
 	podspawn(list(
 		"target" = get_turf(user),
-		"style" = STYLE_SYNDICATE,
+		"style" = /datum/pod_style/syndicate,
 		"spawn" = /obj/item/storage/box/syndie_kit/battle_royale,
 	))
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm
index 65f62913a6bbf..d9c8ca5fdcfb4 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm
@@ -44,6 +44,6 @@
 			emag_card.team = team
 			podspawn(list(
 				"target" = get_turf(user),
-				"style" = STYLE_SYNDICATE,
+				"style" = /datum/pod_style/syndicate,
 				"spawn" = emag_card,
 			))
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/infect_ai.dm b/code/modules/antagonists/traitor/objectives/final_objective/infect_ai.dm
index dffd690a62470..d79773c4a97cd 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/infect_ai.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/infect_ai.dm
@@ -51,6 +51,6 @@
 			sent_board = TRUE
 			podspawn(list(
 				"target" = get_turf(user),
-				"style" = STYLE_SYNDICATE,
+				"style" = /datum/pod_style/syndicate,
 				"spawn" = /obj/item/ai_module/malf,
 			))
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/objective_dark_matteor.dm b/code/modules/antagonists/traitor/objectives/final_objective/objective_dark_matteor.dm
index 5697b191c9967..1b50d66e0d37f 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/objective_dark_matteor.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/objective_dark_matteor.dm
@@ -1,7 +1,7 @@
 /datum/traitor_objective/ultimate/dark_matteor
 	name = "Вызовите сингулярность из темной материи, чтобы поглотить станцию."
 	description = "Пройдите в %AREA% и получите контрабандные спутники и emag. Установите спутники и используйте на них emag, \
-	и когда достаточно спутников будет перекалибровано с помощью emag, ОНО ПРИДЕТ. Внимание: Сингулярность из темной материи будет охотиться на всех существ, включая вас."
+	и когда достаточно спутников будет перекалибровано с помощью emag, ОНО ПРИДЕТ. Не забывайте, что сингулярность будет охотиться на всех существ, включая ВАС."
 
 	//this is a prototype so this progression is for all basic level kill objectives
 
@@ -48,7 +48,7 @@
 			sent_satellites = TRUE
 			podspawn(list(
 				"target" = get_turf(user),
-				"style" = STYLE_SYNDICATE,
+				"style" = /datum/pod_style/syndicate,
 				"spawn" = /obj/structure/closet/crate/engineering/smuggled_meteor_shields,
 			))
 
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm
index aa5dc3e4f93d2..2ad5a545a4086 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm
@@ -1,7 +1,7 @@
 /datum/traitor_objective/ultimate/romerol
 	name = "Распространите экспериментальный вирус биотеррора Romerol, призвав под в %AREA%"
 	description = "Пройдите в %AREA%, и получите вирус биотеррора. Распространите его среди экипажа, \
-	и наслаждайтесь поднятыми из мертвых безмозглыми машинами для убийства. Внимание: мертвецы будут атаковать и вас."
+	и наслаждайтесь поднятыми из мертвых безмозглыми машинами для убийства. Будьте осторожны - мертвецы будут атаковать и вас."
 
 	//this is a prototype so this progression is for all basic level kill objectives
 
@@ -41,6 +41,6 @@
 			sent_romerol = TRUE
 			podspawn(list(
 				"target" = get_turf(user),
-				"style" = STYLE_SYNDICATE,
+				"style" = /datum/pod_style/syndicate,
 				"spawn" = /obj/item/storage/box/syndie_kit/romerol,
 			))
diff --git a/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm b/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm
index 92dc5e261799c..4164e30713173 100644
--- a/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm
+++ b/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm
@@ -52,6 +52,6 @@
 			sent_crystal = TRUE
 			podspawn(list(
 				"target" = get_turf(user),
-				"style" = STYLE_SYNDICATE,
+				"style" = /datum/pod_style/syndicate,
 				"spawn" = /obj/item/destabilizing_crystal,
 			))
diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
index 78ba1f4cd5c4d..8658947fde061 100644
--- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
+++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm
@@ -7,7 +7,7 @@
 
 /datum/traitor_objective/locate_weakpoint
 	name = "Триангулируйте слабое место в структуре станции и взорвите заряд взрывчатки поблизости."
-	description = "Вы получите портативное устройство, которое нужно будет использовать в %AREA1% и %AREA2%, чтобы триангулировать слабое место в конструкции станции и устроить там взрыв. Внимание: Как только вы начнете сканировать одну из областей, ИИ станции будет предупрежден."
+	description = "Вы получите портативное устройство, которое нужно будет использовать в %AREA1% и %AREA2%, чтобы триангулировать слабое место в конструкции станции и устроить там взрыв. Напоминаем, что как только вы начнете сканировать одну из областей, ИИ станции будет предупрежден."
 
 	progression_minimum = 45 MINUTES
 	progression_reward = list(15 MINUTES, 20 MINUTES)
@@ -134,7 +134,7 @@
 
 /obj/item/weakpoint_locator
 	name = "structural weakpoint locator"
-	desc = "Устройство, которое может определить структурное слабое место станции. Его необходимо использовать в %AREA1% и %AREA2% для триангуляции слабого места. Внимание: ИИ станции будет уведомлен, как только процесс начнется!"
+	desc = "Устройство, которое может определить структурное слабое место станции. Его необходимо использовать в %AREA1% и %AREA2% для триангуляции слабого места. Напоминаем, что ИИ станции будет уведомлен, как только процесс начнется!"
 	icon = 'icons/obj/antags/syndicate_tools.dmi'
 	icon_state = "weakpoint_locator"
 	inhand_icon_state = "weakpoint_locator"
diff --git a/code/modules/antagonists/voidwalker/voidwalker.dm b/code/modules/antagonists/voidwalker/voidwalker.dm
new file mode 100644
index 0000000000000..6ba5ee4490dc0
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker.dm
@@ -0,0 +1,59 @@
+/// Space antagonist that harasses people near space and cursed them if they get the chance
+/datum/antagonist/voidwalker
+	name = "\improper Voidwalker"
+	antagpanel_category = ANTAG_GROUP_ABOMINATIONS
+	job_rank = ROLE_VOIDWALKER
+	show_in_antagpanel = TRUE
+	antagpanel_category = "Voidwalker"
+	show_name_in_check_antagonists = TRUE
+	show_to_ghosts = TRUE
+	ui_name = "AntagInfoVoidwalker"
+	suicide_cry = "FOR THE VOID!!"
+	preview_outfit = /datum/outfit/voidwalker
+
+/datum/antagonist/voidwalker/greet()
+	. = ..()
+	owner.announce_objectives()
+
+/datum/antagonist/voidwalker/on_gain()
+	. = ..()
+
+	var/mob/living/carbon/human/body = owner.current
+	if(ishuman(body))
+		body.set_species(/datum/species/voidwalker)
+
+	forge_objectives()
+
+/datum/antagonist/voidwalker/on_removal()
+	var/mob/living/carbon/human/body = owner.current
+	if(ishuman(body))
+		body.set_species(/datum/species/human)
+
+	return ..()
+
+/datum/antagonist/voidwalker/forge_objectives()
+	var/datum/objective/voidwalker_objective/objective = new
+	objective.owner = owner
+	objectives += objective
+
+/datum/outfit/voidwalker
+	name = "Voidwalker (Preview only)"
+
+/datum/outfit/voidwalker/post_equip(mob/living/carbon/human/human, visualsOnly)
+	human.set_species(/datum/species/voidwalker)
+
+/datum/objective/voidwalker_objective
+
+/datum/objective/voidwalker_objective/New()
+	var/list/explanation_texts = list(
+		"Show them the beauty of the void. Drag them into the cosmic abyss, then impart the truth of the void unto them. Seek to enlighten, not destroy.",
+		"They must see what you have seen. They must walk where you have walked. Bring them to the void and show them the truth. The dead cannot know what you know.",
+		"Recover what you have lost. Bring your children into the inky black and return them to your flock.",
+	)
+	if(prob(20))
+		explanation_text += "Man I fucking love glass."
+	explanation_text = pick(explanation_texts)
+	..()
+
+/datum/objective/voidwalker_objective/check_completion()
+	return owner.current.stat != DEAD
diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
new file mode 100644
index 0000000000000..4fe88f50d01c6
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
@@ -0,0 +1,67 @@
+/// Remain in someones view without breaking line of sight
+/datum/action/cooldown/spell/pointed/unsettle
+	name = "Unsettle"
+	desc = "Stare directly into someone who doesn't see you. Remain in their view for a bit to stun them for 2 seconds and announce your presence to them. "
+	button_icon_state = "terrify"
+	background_icon_state = "bg_void"
+	panel = null
+	spell_requirements = NONE
+	cooldown_time = 12 SECONDS
+	cast_range = 9
+	active_msg = "You prepare to stare down a target..."
+	deactive_msg = "You refocus your eyes..."
+	/// how long we need to stare at someone to unsettle them (woooooh)
+	var/stare_time = 8 SECONDS
+	/// how long we stun someone on succesful cast
+	var/stun_time = 2 SECONDS
+	/// stamina damage we doooo
+	var/stamina_damage = 80
+
+/datum/action/cooldown/spell/pointed/unsettle/is_valid_target(atom/cast_on)
+	. = ..()
+
+	if(!isliving(cast_on))
+		cast_on.balloon_alert(owner, "cannot be targeted!")
+		return FALSE
+
+	if(!check_if_in_view(cast_on))
+		owner.balloon_alert(owner, "cannot see you!")
+		return FALSE
+
+	return TRUE
+
+/datum/action/cooldown/spell/pointed/unsettle/cast(mob/living/carbon/human/cast_on)
+	. = ..()
+
+	if(do_after(owner, stare_time, cast_on, IGNORE_TARGET_LOC_CHANGE | IGNORE_USER_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_if_in_view), cast_on), hidden = TRUE))
+		spookify(cast_on)
+		return
+	owner.balloon_alert(owner, "line of sight broken!")
+	return SPELL_CANCEL_CAST
+
+/datum/action/cooldown/spell/pointed/unsettle/proc/check_if_in_view(mob/living/carbon/human/target)
+	SIGNAL_HANDLER
+
+	if(target.is_blind() || !(owner in view(target, world.view)))
+		return FALSE
+	return TRUE
+
+/datum/action/cooldown/spell/pointed/unsettle/proc/spookify(mob/living/carbon/human/target)
+	target.Paralyze(stun_time)
+	target.adjustStaminaLoss(stamina_damage)
+	target.apply_status_effect(/datum/status_effect/speech/slurring/generic)
+	target.emote("scream")
+
+	new /obj/effect/temp_visual/circle_wave/unsettle(get_turf(owner))
+	new /obj/effect/temp_visual/circle_wave/unsettle(get_turf(target))
+	SEND_SIGNAL(owner, COMSIG_ATOM_REVEAL)
+
+/obj/effect/temp_visual/circle_wave/unsettle
+	color = COLOR_PURPLE
+
+/datum/action/cooldown/spell/list_target/telepathy/voidwalker
+	name = "Transmit"
+	background_icon_state = "bg_void"
+	button_icon = 'icons/mob/actions/actions_voidwalker.dmi'
+	button_icon_state = "voidwalker_telepathy"
+	panel = null
diff --git a/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm b/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm
new file mode 100644
index 0000000000000..a8e5b8de30f39
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm
@@ -0,0 +1,147 @@
+///Turn the damage overlays glassy
+#define GLASSY_OVERLAY_MATRIX list(\
+		1, 2, 2, 0, \
+		0, 1, 0, 0, \
+		0, 0, 1, 0, \
+		0, 0, 0, 1, \
+		0, 0, 0, 0)
+
+/obj/item/bodypart/head/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	bodypart_traits = list(TRAIT_MUTE)
+	head_flags = NONE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+/obj/item/bodypart/chest/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+/obj/item/bodypart/arm/left/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+/obj/item/bodypart/arm/right/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+/obj/item/bodypart/leg/left/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+/obj/item/bodypart/leg/right/voidwalker
+	texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+	icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+	limb_id = SPECIES_VOIDWALKER
+	is_dimorphic = FALSE
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+
+	damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+	light_brute_msg = "splintered"
+	medium_brute_msg = "cracked"
+	heavy_brute_msg = "shattered"
+
+	light_burn_msg = "bent"
+	medium_burn_msg = "deformed"
+	heavy_burn_msg = "warped"
+
+	damage_examines = list(
+		BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+		BURN = GLASSY_BURN_EXAMINE_TEXT,
+	)
+
+#undef GLASSY_OVERLAY_MATRIX
diff --git a/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
new file mode 100644
index 0000000000000..b763d094cb75a
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
@@ -0,0 +1,112 @@
+/// A global assoc list for the drop of point
+GLOBAL_LIST_EMPTY(voidwalker_void)
+
+/// Lardmarks meant to designate where voidwalker kidnapees are sent
+/obj/effect/landmark/voidwalker_void
+	name = "default voidwalker void landmark"
+	icon_state = "x"
+
+/obj/effect/landmark/voidwalker_void/Initialize(mapload)
+	. = ..()
+	GLOB.voidwalker_void += src
+
+/obj/effect/landmark/voidwalker_void/Destroy()
+	GLOB.voidwalker_void -= src
+	return ..()
+
+/// Voidwalker void where the people go
+/area/centcom/voidwalker_void
+	name = "Voidwalker void"
+	icon_state = "voidwalker"
+	has_gravity = STANDARD_GRAVITY
+	ambience_index = AMBIENCE_SPOOKY
+	sound_environment = SOUND_ENVIRONMENT_CAVE
+	area_flags = UNIQUE_AREA | NOTELEPORT | HIDDEN_AREA | BLOCK_SUICIDE
+
+/// Mini car where people drive around in in their mangled corpse to heal a bit before they get dumped back on station
+/obj/effect/wisp_mobile
+	name = "wisp"
+
+	icon = 'icons/obj/weapons/voidwalker_items.dmi'
+	icon_state = "wisp"
+
+	light_system = OVERLAY_LIGHT
+	light_color = COLOR_WHITE
+	light_range = 4
+	light_power = 1
+	light_on = TRUE
+
+	/// Delay between movements
+	var/move_delay = 0.5 SECONDS
+	/// when can we move again?
+	var/can_move
+	/// what do we eatt?
+	var/food_type = /obj/effect/wisp_food
+	/// how much do we heal per food?
+	var/heal_per_food = 15
+	/// Traits given to the wisp driver
+	var/wisp_driver_traits = list(TRAIT_STASIS, TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_HANDS_BLOCKED)
+
+/obj/effect/wisp_mobile/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	. = ..()
+
+	if(!isliving(arrived))
+		return
+
+	var/mob/living/driver = arrived
+	driver.forceMove(src)
+	driver.add_traits(wisp_driver_traits, REF(src))
+	add_atom_colour(random_color(), FIXED_COLOUR_PRIORITY)
+
+	addtimer(CALLBACK(driver, TYPE_PROC_REF(/atom/movable, forceMove), get_safe_random_station_turf()), 60 SECONDS)
+
+/obj/effect/wisp_mobile/relaymove(mob/living/user, direction)
+	if(can_move >= world.time)
+		return
+	can_move = world.time + move_delay
+
+	if(isturf(loc))
+		can_move = world.time + move_delay
+		try_step_multiz(direction)
+
+/obj/effect/wisp_mobile/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+	. = ..()
+
+	var/obj/food = locate(food_type) in loc
+	if(!food)
+		return
+
+	qdel(food)
+
+	// make new food
+	var/area/our_area = get_area(src)
+	new food_type(pick(get_area_turfs(our_area)))
+
+	var/mob/living/driver = locate(/mob/living) in contents
+	if(driver)
+		driver.heal_ordered_damage(heal_per_food, list(BRUTE, BURN, OXY))
+		playsound(src, 'sound/misc/server-ready.ogg', 50, TRUE, -1)
+
+/obj/effect/wisp_mobile/Exited(atom/movable/gone, direction)
+	. = ..()
+
+	gone.remove_traits(wisp_driver_traits, REF(src))
+	to_chat(gone, span_boldwarning("You feel it would be very bad to get caught again."))
+	qdel(src)
+
+/// we only exist to be eaten by wisps for food 😔👊
+/obj/effect/wisp_food
+	name = "wisp"
+	icon = 'icons/obj/weapons/voidwalker_items.dmi'
+	icon_state = "wisp"
+
+	color = COLOR_YELLOW
+
+	light_system = OVERLAY_LIGHT
+	light_color = COLOR_WHITE
+	light_range = 4
+	light_power = 1
+	light_on = TRUE
+
+/obj/item/restraints/handcuffs/energy/void
+	breakouttime = INFINITY
diff --git a/code/modules/antagonists/voidwalker/voidwalker_loot.dm b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
new file mode 100644
index 0000000000000..73ed9c7cd2207
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
@@ -0,0 +1,43 @@
+/// Gives someone the stable voided trauma and then self destructs
+/obj/item/cosmic_skull
+	name = "cosmic skull"
+	desc = "You can see and feel the surrounding space pulsing through it..."
+
+	icon = 'icons/obj/weapons/voidwalker_items.dmi'
+	icon_state = "cosmic_skull_charged"
+
+	light_on = TRUE
+	light_color = "#CC00CC"
+	light_range = 3
+	/// Icon state for when drained
+	var/drained_icon_state = "cosmic_skull_drained"
+	/// How many uses does it have left?
+	var/uses = 1
+
+/obj/item/cosmic_skull/attack_self(mob/user, modifiers)
+	. = ..()
+
+	if(!uses || !ishuman(user))
+		return
+
+	var/mob/living/carbon/human/hewmon = user
+	if(is_species(hewmon, /datum/species/voidwalker))
+		to_chat(user, span_bolddanger("OH GOD NOO!!!! WHYYYYYYYYY!!!!! WHO WOULD DO THIS?!!"))
+		return
+
+	to_chat(user, span_purple("You begin staring into the [name]..."))
+
+	if(!do_after(user, 10 SECONDS, src))
+		return
+
+	var/mob/living/carbon/human/starer = user
+	starer.cure_trauma_type(/datum/brain_trauma/voided) //this wouldn't make much sense to have anymore
+
+	starer.gain_trauma(/datum/brain_trauma/voided/stable)
+	to_chat(user, span_purple("And a whole world opens up to you."))
+	playsound(get_turf(user), 'sound/effects/curse5.ogg', 60)
+
+	uses--
+	if(uses <= 0 )
+		icon_state = drained_icon_state
+		light_on = FALSE
diff --git a/code/modules/antagonists/voidwalker/voidwalker_organs.dm b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
new file mode 100644
index 0000000000000..e6e3d028ac8ef
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
@@ -0,0 +1,132 @@
+/// Voidwalker eyes with nightvision and thermals
+/obj/item/organ/internal/eyes/voidwalker
+	name = "blackened orbs"
+	desc = "These orbs will withstand the light of the sun, yet still see within the darkest voids."
+	eye_icon_state = null
+	pepperspray_protect = TRUE
+	flash_protect = FLASH_PROTECTION_WELDER
+	color_cutoffs = list(20, 10, 40)
+	sight_flags = SEE_MOBS
+
+/// Voidwalker brain stacked with a lot of the abilities
+/obj/item/organ/internal/brain/voidwalker
+	name = "cosmic brain"
+	desc = "A mind fully integrated into the cosmic thread."
+	icon = 'icons/obj/medical/organs/shadow_organs.dmi'
+	can_smoothen_out = FALSE
+
+	/// Alpha we have in space
+	var/space_alpha = 15
+	/// Alpha we have elsewhere
+	var/non_space_alpha = 255
+	/// We settle the un
+	var/datum/action/unsettle = /datum/action/cooldown/spell/pointed/unsettle
+	/// Regen effect we have in space
+	var/datum/status_effect/regen = /datum/status_effect/space_regeneration
+	/// Speed modifier given when in gravity
+	var/datum/movespeed_modifier/speed_modifier = /datum/movespeed_modifier/grounded_voidwalker
+	/// The void eater weapon
+	var/obj/item/glass_breaker = /obj/item/void_eater
+	/// Our brain transmit telepathy spell
+	var/datum/action/transmit = /datum/action/cooldown/spell/list_target/telepathy/voidwalker
+
+/obj/item/organ/internal/brain/voidwalker/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
+	. = ..()
+
+	RegisterSignal(organ_owner, COMSIG_ATOM_ENTERING, PROC_REF(on_atom_entering))
+
+	organ_owner.AddComponent(/datum/component/space_camo, space_alpha, non_space_alpha, 5 SECONDS)
+
+	organ_owner.AddElement(/datum/element/only_pull_living)
+	organ_owner.AddElement(/datum/element/glass_pacifist)
+	organ_owner.AddElement(/datum/element/no_crit_hitting)
+
+	organ_owner.apply_status_effect(regen)
+
+	unsettle = new unsettle(organ_owner)
+	unsettle.Grant(organ_owner)
+
+	transmit = new transmit(organ_owner)
+	transmit.Grant(organ_owner)
+
+	glass_breaker = new/obj/item/void_eater
+	organ_owner.put_in_hands(glass_breaker)
+
+/obj/item/organ/internal/brain/voidwalker/on_mob_remove(mob/living/carbon/organ_owner, special)
+	. = ..()
+
+	UnregisterSignal(organ_owner, COMSIG_ENTER_AREA)
+	alpha = 255
+
+	qdel(organ_owner.GetComponent(/datum/component/space_camo))
+
+	organ_owner.RemoveElement(/datum/element/only_pull_living)
+	organ_owner.RemoveElement(/datum/element/glass_pacifist)
+	organ_owner.RemoveElement(/datum/element/no_crit_hitting)
+
+	organ_owner.remove_status_effect(regen)
+
+	unsettle.Remove(organ_owner)
+	unsettle = initial(unsettle)
+
+	transmit.Remove(organ_owner)
+	transmit = initial(transmit)
+
+	if(glass_breaker)
+		qdel(glass_breaker)
+
+/obj/item/organ/internal/brain/voidwalker/proc/on_atom_entering(mob/living/carbon/organ_owner, atom/entering)
+	SIGNAL_HANDLER
+
+	if(!isturf(entering))
+		return
+
+	var/turf/new_turf = entering
+
+	//apply debufs for being in gravity
+	if(new_turf.has_gravity())
+		organ_owner.add_movespeed_modifier(speed_modifier)
+	//remove debufs for not being in gravity
+	else
+		organ_owner.remove_movespeed_modifier(speed_modifier)
+
+/obj/item/organ/internal/brain/voidwalker/on_death()
+	. = ..()
+
+	var/turf/spawn_loc = get_turf(owner)
+	new /obj/effect/spawner/random/glass_shards (spawn_loc)
+	new /obj/item/cosmic_skull (spawn_loc)
+	playsound(get_turf(owner), SFX_SHATTER, 100)
+
+	qdel(owner)
+
+/obj/item/implant/radio/voidwalker
+	radio_key = /obj/item/encryptionkey/heads/captain
+	actions_types = null
+
+/obj/effect/spawner/random/glass_shards
+	loot = list(/obj/item/shard = 2, /obj/item/shard/plasma = 1, /obj/item/shard/titanium = 1, /obj/item/shard/plastitanium = 1)
+	spawn_random_offset = TRUE
+
+	/// Min shards we generate
+	var/min_spawn = 4
+	/// Max shards we generate
+	var/max_spawn = 6
+
+/obj/effect/spawner/random/glass_shards/Initialize(mapload)
+	spawn_loot_count = rand(min_spawn, max_spawn)
+
+	return ..()
+
+/obj/effect/spawner/random/glass_shards/mini
+	min_spawn = 1
+	max_spawn = 2
+
+/obj/effect/spawner/random/glass_debris
+	/// Weighted list for the debris we spawn
+	loot = list(
+		/obj/effect/decal/cleanable/glass = 2,
+		/obj/effect/decal/cleanable/glass/plasma = 1,
+		/obj/effect/decal/cleanable/glass/titanium = 1,
+		/obj/effect/decal/cleanable/glass/plastitanium = 1,
+		)
diff --git a/code/modules/antagonists/voidwalker/voidwalker_particles.dm b/code/modules/antagonists/voidwalker/voidwalker_particles.dm
new file mode 100644
index 0000000000000..8ffbd4abd449e
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_particles.dm
@@ -0,0 +1,15 @@
+/particles/void_kidnap
+	icon = 'icons/effects/particles/voidwalker.dmi'
+	icon_state = list("kidnap_1" = 1, "kidnap_2" = 1, "kidnap_3" = 2)
+	width = 100
+	height = 300
+	count = 1000
+	spawning = 20
+	lifespan = 1.5 SECONDS
+	fade = 1 SECONDS
+	velocity = list(0, 0.4, 0)
+	position = generator(GEN_SPHERE, 12, 12, NORMAL_RAND)
+	drift = generator(GEN_SPHERE, 0, 1, NORMAL_RAND)
+	friction = 0.2
+	gravity = list(0.95, 0)
+	grow = 0.05
diff --git a/code/modules/antagonists/voidwalker/voidwalker_species.dm b/code/modules/antagonists/voidwalker/voidwalker_species.dm
new file mode 100644
index 0000000000000..069582fbb2c7e
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_species.dm
@@ -0,0 +1,73 @@
+/// Species for the voidwalker antagonist
+/datum/species/voidwalker
+	name = "\improper Voidling"
+	id = SPECIES_VOIDWALKER
+	sexes = FALSE
+	inherent_traits = list(
+		TRAIT_NOBREATH,
+		TRAIT_NO_UNDERWEAR,
+		TRAIT_RADIMMUNE,
+		TRAIT_VIRUSIMMUNE,
+		TRAIT_NOBLOOD,
+		TRAIT_NODISMEMBER,
+		TRAIT_NEVER_WOUNDED,
+		TRAIT_MOVE_FLYING,
+		TRAIT_RESISTCOLD,
+		TRAIT_RESISTHIGHPRESSURE,
+		TRAIT_RESISTLOWPRESSURE,
+		TRAIT_NOHUNGER,
+		TRAIT_FREE_HYPERSPACE_MOVEMENT,
+		TRAIT_ADVANCEDTOOLUSER,
+		TRAIT_NO_BLOOD_OVERLAY,
+		TRAIT_NO_THROWING,
+	)
+	changesource_flags = MIRROR_BADMIN
+
+	bodypart_overrides = list(
+		BODY_ZONE_HEAD = /obj/item/bodypart/head/voidwalker,
+		BODY_ZONE_CHEST = /obj/item/bodypart/chest/voidwalker,
+		BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/voidwalker,
+		BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/voidwalker,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/voidwalker,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/voidwalker,
+	)
+
+	no_equip_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_ICLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_MASK | ITEM_SLOT_HEAD | ITEM_SLOT_FEET | ITEM_SLOT_BACK | ITEM_SLOT_EARS | ITEM_SLOT_EYES
+
+	mutantbrain = /obj/item/organ/internal/brain/voidwalker
+	mutanteyes = /obj/item/organ/internal/eyes/voidwalker
+	mutantheart = null
+	mutantlungs = null
+	mutanttongue = null
+
+	siemens_coeff = 0
+
+/datum/species/voidwalker/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load)
+	. = ..()
+
+	human_who_gained_species.AddComponent(/datum/component/glass_passer)
+	human_who_gained_species.AddComponent(/datum/component/space_dive)
+	human_who_gained_species.AddComponent(/datum/component/space_kidnap)
+
+	var/obj/item/implant/radio = new /obj/item/implant/radio/voidwalker (human_who_gained_species)
+	radio.implant(human_who_gained_species, null, TRUE, TRUE)
+
+	human_who_gained_species.AddComponent(/datum/component/planet_allergy)
+
+	human_who_gained_species.fully_replace_character_name(null, pick(GLOB.voidwalker_names))
+
+/datum/species/voidwalker/on_species_loss(mob/living/carbon/human/human, datum/species/new_species, pref_load)
+	. = ..()
+
+	qdel(human.GetComponent(/datum/component/glass_passer))
+	qdel(human.GetComponent(/datum/component/space_dive))
+	qdel(human.GetComponent(/datum/component/space_kidnap))
+
+	var/obj/item/implant/radio = locate(/obj/item/implant/radio/voidwalker) in human
+	if(radio)
+		qdel(radio)
+
+	qdel(human.GetComponent(/datum/component/planet_allergy))
+
+/datum/species/voidwalker/check_roundstart_eligible()
+	return FALSE
diff --git a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
new file mode 100644
index 0000000000000..7934e757077af
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
@@ -0,0 +1,46 @@
+/// THE GRAVITY!!! IT WEIGHS!!!
+/datum/movespeed_modifier/grounded_voidwalker
+	multiplicative_slowdown = 1.1
+
+/// Regenerate in space
+/datum/status_effect/space_regeneration
+	id = "space_regeneration"
+	duration = INFINITE
+	alert_type = null
+	// How much do we heal per tick?
+	var/healing = 1.5
+
+/datum/status_effect/space_regeneration/tick(effect)
+	heal_owner()
+
+/// Regenerate health whenever this status effect is applied or reapplied
+/datum/status_effect/space_regeneration/proc/heal_owner()
+	if(isspaceturf(get_turf(owner)))
+		owner.heal_ordered_damage(healing, list(BRUTE, BURN, OXY, STAMINA, TOX, BRAIN))
+
+/datum/status_effect/planet_allergy
+	id = "planet_allergy"
+	duration = INFINITE
+	alert_type = /atom/movable/screen/alert/status_effect/veryhighgravity
+
+/datum/status_effect/planet_allergy/tick()
+	owner.adjustBruteLoss(1)
+
+/atom/movable/screen/alert/status_effect/veryhighgravity
+	name = "Crushing Gravity"
+	desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!"
+	icon_state = "paralysis"
+
+/datum/status_effect/void_eatered
+	duration = 10 SECONDS
+	remove_on_fullheal = TRUE
+
+/datum/status_effect/void_eatered/on_apply()
+	. = ..()
+
+	ADD_TRAIT(owner, TRAIT_NODEATH, REF(src))
+
+/datum/status_effect/void_eatered/on_remove()
+	. = ..()
+
+	REMOVE_TRAIT(owner, TRAIT_NODEATH, REF(src))
diff --git a/code/modules/antagonists/voidwalker/voidwalker_traumas.dm b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm
new file mode 100644
index 0000000000000..cf4f389a0d6f3
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm
@@ -0,0 +1,91 @@
+/// Curse brain trauma that makes someone space textured, mute, pacifist and forbids them from entering space
+/datum/brain_trauma/voided
+	name = "Voided"
+	desc = "They've seen the secrets of the cosmos, in exchange for a curse that keeps them chained."
+	scan_desc = "cosmic neural pattern"
+	gain_text = ""
+	lose_text = ""
+	resilience = TRAUMA_RESILIENCE_LOBOTOMY
+	random_gain = FALSE
+	/// Type for the bodypart texture we add
+	var/bodypart_overlay_type = /datum/bodypart_overlay/texture/spacey
+	///traits we give on gain
+	var/list/traits_to_apply = list(TRAIT_MUTE, TRAIT_PACIFISM)
+	/// Do we ban the person from entering space?
+	var/ban_from_space = TRUE
+
+/datum/brain_trauma/voided/on_gain()
+	. = ..()
+
+	owner.add_traits(traits_to_apply, REF(src))
+	if(ban_from_space)
+		owner.AddComponent(/datum/component/banned_from_space)
+	owner.AddComponent(/datum/component/planet_allergy)
+	RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(texture_limb)) //also catch new limbs being attached
+	RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(untexture_limb)) //and remove it from limbs if they go away
+
+	for(var/obj/item/bodypart as anything in owner.bodyparts)
+		texture_limb(owner, bodypart)
+
+	//your underwear is belong to us
+	if(ishuman(owner))
+		var/mob/living/carbon/human/human = owner //CARBON WILL NEVER BE REAL!!!!!
+		human.underwear = "Nude"
+		human.undershirt = "Nude"
+		human.socks = "Nude"
+
+	owner.update_body()
+
+/datum/brain_trauma/voided/on_lose()
+	. = ..()
+
+	owner.remove_traits(traits_to_apply, REF(src))
+	UnregisterSignal(owner, list(COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB))
+	if(ban_from_space)
+		qdel(owner.GetComponent(/datum/component/banned_from_space))
+	qdel(owner.GetComponent(/datum/component/planet_allergy))
+
+	for(var/obj/item/bodypart/bodypart as anything in owner.bodyparts)
+		untexture_limb(owner, bodypart)
+
+/// Apply the space texture
+/datum/brain_trauma/voided/proc/texture_limb(atom/source, obj/item/bodypart/limb)
+	SIGNAL_HANDLER
+
+	limb.add_bodypart_overlay(new bodypart_overlay_type)
+	if(istype(limb, /obj/item/bodypart/head))
+		var/obj/item/bodypart/head/head = limb
+		head.head_flags &= ~HEAD_EYESPRITES
+
+/datum/brain_trauma/voided/proc/untexture_limb(atom/source, obj/item/bodypart/limb)
+	SIGNAL_HANDLER
+
+	var/overlay = locate(bodypart_overlay_type) in limb.bodypart_overlays
+	if(overlay)
+		limb.remove_bodypart_overlay(overlay)
+
+	if(istype(limb, /obj/item/bodypart/head))
+		var/obj/item/bodypart/head/head = limb
+		head.head_flags = initial(head.head_flags)
+
+/datum/brain_trauma/voided/on_death()
+	. = ..()
+
+	if(is_on_a_planet(owner))
+		qdel(src)
+
+/// Positive version of the previous. Get space immunity and the ability to slowly move through glass (but you still get muted)
+/datum/brain_trauma/voided/stable
+	scan_desc = "stable cosmic neural pattern"
+	traits_to_apply = list(TRAIT_MUTE, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTCOLD)
+	ban_from_space = FALSE
+
+/datum/brain_trauma/voided/stable/on_gain()
+	. = ..()
+
+	owner.AddComponent(/datum/component/glass_passer, 2 SECONDS)
+
+/datum/brain_trauma/voided/stable/on_lose()
+	. = ..()
+
+	qdel(owner.GetComponent(/datum/component/glass_passer))
diff --git a/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm b/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm
new file mode 100644
index 0000000000000..9df3eabab3d21
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm
@@ -0,0 +1,99 @@
+/**
+ * An armblade that pops windows
+ */
+/obj/item/void_eater
+	name = "void eater" //as opposed to full eater
+	desc = "A deformed appendage, capable of shattering any glass and any flesh."
+	icon = 'icons/obj/weapons/voidwalker_items.dmi'
+	icon_state = "tentacle"
+	inhand_icon_state = "tentacle"
+	force = 25
+	armour_penetration = 35
+	lefthand_file = 'icons/mob/inhands/antag/voidwalker_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/antag/voidwalker_righthand.dmi'
+	blocks_emissive = EMISSIVE_BLOCK_NONE
+	item_flags = ABSTRACT | DROPDEL
+	resistance_flags = INDESTRUCTIBLE | ACID_PROOF | FIRE_PROOF | LAVA_PROOF | UNACIDABLE
+	w_class = WEIGHT_CLASS_HUGE
+	tool_behaviour = TOOL_MINING
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	wound_bonus = -30
+	bare_wound_bonus = 20
+
+	/// Damage we loss per hit
+	var/damage_loss_per_hit = 0.5
+	/// The minimal damage we can reach
+	var/damage_minimum = 15
+
+/obj/item/void_eater/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
+
+	AddComponent(/datum/component/temporary_glass_shatterer)
+
+/obj/item/void_eater/equipped(mob/user)
+	. = ..()
+
+	RegisterSignal(user, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP, PROC_REF(refresh))
+
+/obj/item/void_eater/dropped(mob/user, silent)
+	. = ..()
+	UnregisterSignal(user, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP)
+
+/obj/item/void_eater/examine(mob/user)
+	. = ..()
+	. += span_notice("The [name] weakens each hit, recharge it by kidnapping someone!")
+	. += span_notice("Sharpness: [round(force)]/[initial(force)]")
+
+/obj/item/void_eater/attack(mob/living/target_mob, mob/living/user, params)
+	if(!ishuman(target_mob))
+		return ..()
+
+	var/mob/living/carbon/human/hewmon = target_mob
+
+	if(hewmon.has_trauma_type(/datum/brain_trauma/voided))
+		var/turf/spawnloc = get_turf(hewmon)
+
+		if(hewmon.stat != DEAD)
+			hewmon.balloon_alert(user, "already voided!")
+			playsound(hewmon, SFX_SHATTER, 60)
+			new /obj/effect/spawner/random/glass_shards/mini (spawnloc)
+			hewmon.adjustBruteLoss(10) // BONUS DAMAGE
+		else
+			hewmon.balloon_alert(user, "shattering...")
+			if(do_after(user, 4 SECONDS, hewmon))
+				new /obj/effect/spawner/random/glass_shards (spawnloc)
+				var/obj/item/organ/brain = hewmon.get_organ_by_type(/obj/item/organ/internal/brain)
+				if(brain)
+					brain.Remove(hewmon)
+					brain.forceMove(spawnloc)
+					brain.balloon_alert(user, "shattered!")
+				playsound(hewmon, SFX_SHATTER, 100)
+				qdel(hewmon)
+			return COMPONENT_CANCEL_ATTACK_CHAIN
+
+	if(hewmon.stat == HARD_CRIT && !hewmon.has_trauma_type(/datum/brain_trauma/voided))
+		target_mob.balloon_alert(user, "is in crit!")
+		return COMPONENT_CANCEL_ATTACK_CHAIN
+
+	target_mob.apply_status_effect(/datum/status_effect/void_eatered)
+
+	if(force == damage_minimum + damage_loss_per_hit)
+		user.balloon_alert(user, "void eater blunted!")
+
+	force = max(force - damage_loss_per_hit, damage_minimum)
+
+	if(prob(5))
+		new /obj/effect/spawner/random/glass_debris (get_turf(user))
+	return ..()
+
+/// Called when the voidwalker kidnapped someone
+/obj/item/void_eater/proc/refresh(mob/living/carbon/human/voidwalker)
+	SIGNAL_HANDLER
+
+	force = initial(force)
+
+	color = "#000000"
+	animate(src, color = null, time = 1 SECONDS)//do a color flashy woosh
+
+	to_chat(voidwalker, span_boldnotice("Your [name] refreshes!"))
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 925f368fe3b54..3bea19a5bb309 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -511,7 +511,7 @@
 	playsound(newstruct, 'sound/effects/constructform.ogg', 50)
 	if(stoner)
 		newstruct.faction |= "[REF(stoner)]"
-		newstruct.master = stoner
+		newstruct.construct_master = stoner
 		var/datum/action/innate/seek_master/seek_master = new
 		seek_master.Grant(newstruct)
 
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
index 6731d75f1a55f..9ec4dd634ed43 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
@@ -70,6 +70,15 @@
 	for(var/spell in user.actions)
 		if(is_type_in_typecache(spell, no_coexistance_typecache))
 			return FALSE
+	var/datum/antagonist/wizard/wizard_datum = user.mind.has_antag_datum(/datum/antagonist/wizard)
+	if(!wizard_datum)
+		return TRUE
+	for(var/perks in wizard_datum.perks)
+		if(is_type_in_typecache(perks, no_coexistance_typecache))
+			return FALSE
+	if(is_type_in_list(src, wizard_datum.perks))
+		to_chat(user, span_warning("This perk already learned!"))
+		return FALSE
 	return TRUE
 
 /**
@@ -137,6 +146,9 @@
  * Return TRUE if it can refunded, FALSE otherwise
  */
 /datum/spellbook_entry/proc/can_refund(mob/living/carbon/human/user, obj/item/spellbook/book)
+	if(HAS_TRAIT(user, TRAIT_SPELLS_LOTTERY))
+		to_chat(user, span_notice("No refund."))
+		return FALSE
 	if(!refundable)
 		return FALSE
 	if(!book.refunds_allowed)
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
index d5948f3391b9b..d4ab894dea3d1 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
@@ -55,7 +55,7 @@
 		другим станет проще найти ваш предмет силы."
 	spell_type =  /datum/action/cooldown/spell/lichdom
 	category = SPELLBOOK_CATEGORY_DEFENSIVE
-	no_coexistance_typecache = list(/datum/action/cooldown/spell/splattercasting)
+	no_coexistance_typecache = list(/datum/action/cooldown/spell/splattercasting, /datum/spellbook_entry/perks/wormborn)
 
 /datum/spellbook_entry/chuunibyou
 	name = "Chuuni Invocations"
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
index 78adfc2bc0640..7d121462c4ad0 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
@@ -39,6 +39,13 @@
 	category = SPELLBOOK_CATEGORY_OFFENSIVE
 	cost = 1
 
+/datum/spellbook_entry/tie_shoes
+	name = "Tie Shoes"
+	desc = "This unassuming spell first unties, then knots the target's shoes. While weak at first glance, each upgrade quietens the spell, allowing it to untie laceless footwear and even summon shoes to knot!"
+	spell_type = /datum/action/cooldown/spell/pointed/untie_shoes
+	category = SPELLBOOK_CATEGORY_OFFENSIVE
+	cost = 1
+
 /datum/spellbook_entry/mutate
 	name = "Mutate"
 	desc = "Превращает вас в Халка и на короткое время дает лазерное зрение."
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
new file mode 100644
index 0000000000000..7edb2700d3566
--- /dev/null
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
@@ -0,0 +1,184 @@
+#define SPELLBOOK_CATEGORY_PERKS "Перки"
+
+/datum/spellbook_entry/perks
+	desc = "Main node of perks"
+	category = SPELLBOOK_CATEGORY_PERKS
+	refundable = FALSE // no refund
+	requires_wizard_garb = FALSE
+
+/datum/spellbook_entry/perks/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	var/datum/antagonist/wizard/wizard_datum = user.mind.has_antag_datum(/datum/antagonist/wizard)
+	if(wizard_datum)
+		wizard_datum.perks += src
+	to_chat(user, span_notice("You got a new perk: [src.name]."))
+	return TRUE
+
+/datum/spellbook_entry/perks/fourhands
+	name = "Four Hands"
+	desc = "Gives you even more hands to perform magic"
+
+/datum/spellbook_entry/perks/fourhands/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	user.change_number_of_hands(4)
+
+/datum/spellbook_entry/perks/wormborn
+	name = "Worm Born"
+	desc = "Your soul is infested with mana worms. When you die, you will be reborn as a large worm. \
+		When the worm dies, it has no such luck. Parasitic infection prevents you from binding your soul to objects."
+	no_coexistance_typecache = list(/datum/action/cooldown/spell/lichdom)
+
+/datum/spellbook_entry/perks/wormborn/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	user.AddComponent(/datum/component/wormborn)
+
+/datum/spellbook_entry/perks/dejavu
+	name = "Déjà vu"
+	desc = "Every 60 seconds returns you to the place where you were 60 seconds ago with the same amount of health as you had 60 seconds ago."
+
+/datum/spellbook_entry/perks/dejavu/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	RegisterSignal(user, COMSIG_ENTER_AREA, PROC_REF(give_dejavu))
+
+/datum/spellbook_entry/perks/dejavu/proc/give_dejavu(mob/living/carbon/human/wizard, area/new_area)
+	SIGNAL_HANDLER
+
+	if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	wizard.AddComponent(/datum/component/dejavu/timeline, -1, 60 SECONDS)
+	UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/datum/spellbook_entry/perks/spell_lottery
+	name = "Spells Lottery"
+	desc = "Spells Lottery gives you the chance to get something from the book absolutely free, but you can no longer refund any purchases."
+
+/datum/spellbook_entry/perks/spell_lottery/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	ADD_TRAIT(user, TRAIT_SPELLS_LOTTERY, REF(src))
+
+/datum/spellbook_entry/perks/gamble
+	name = "Gamble"
+	desc = "You get 2 random perks."
+
+/datum/spellbook_entry/perks/gamble/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	var/datum/antagonist/wizard/check_perks = user.mind.has_antag_datum(/datum/antagonist/wizard)
+	var/perks_allocated = 0
+	var/list/taking_perks = list()
+	for(var/datum/spellbook_entry/perks/generate_perk in book.entries)
+		if(istype(generate_perk, src))
+			continue
+		if(check_perks && is_type_in_list(generate_perk, check_perks.perks))
+			continue
+		taking_perks += generate_perk
+		perks_allocated++
+		if(perks_allocated >= 2)
+			break
+	if(taking_perks.len < 1)
+		to_chat(user, span_warning("Gamble cannot give 2 perks, so points are returned"))
+		return FALSE
+	taking_perks = shuffle(taking_perks)
+	for(var/datum/spellbook_entry/perks/perks_ready in taking_perks)
+		perks_ready.buy_spell(user, book, log_buy)
+
+/datum/spellbook_entry/perks/heart_eater
+	name = "Heart Eater"
+	desc = "Gives you ability to obtain a person's life force by eating their heart. \
+		By eating someone's heart you can increase your damage resistance or gain random mutation. \
+		Heart also give strong healing buff."
+
+/datum/spellbook_entry/perks/heart_eater/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	user.AddComponent(/datum/component/heart_eater)
+
+/datum/spellbook_entry/perks/slime_friends
+	name = "Slime Friends"
+	desc = "Slimes are your friends. \
+		Every 15 seconds you lose some nutriments and summon a random evil slime to fight on your side."
+
+/datum/spellbook_entry/perks/slime_friends/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	user.AddComponent(/datum/component/slime_friends)
+
+/datum/spellbook_entry/perks/transparence
+	name = "Transparence"
+	desc = "You become a little closer to the world of the dead. \
+		Projectiles pass through you, but you lose 25% of your health and you are hunted by a terrible curse which wants to return you to the afterlife."
+
+/datum/spellbook_entry/perks/transparence/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	user.maxHealth *= 0.75
+	user.alpha = 125
+	ADD_TRAIT(user, TRAIT_UNHITTABLE_BY_PROJECTILES, REF(src))
+	RegisterSignal(user, COMSIG_ENTER_AREA, PROC_REF(make_stalker))
+
+/datum/spellbook_entry/perks/transparence/proc/make_stalker(mob/living/carbon/human/wizard, area/new_area)
+	SIGNAL_HANDLER
+
+	if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	wizard.gain_trauma(/datum/brain_trauma/magic/stalker)
+	UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/datum/spellbook_entry/perks/magnetism
+	name = "Magnetism"
+	desc = "You get a small gravity anomaly that orbit around you. \
+		Nearby things will be attracted to you."
+
+/datum/spellbook_entry/perks/magnetism/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+	. = ..()
+	var/atom/movable/magnitizm = new /obj/effect/wizard_magnetism(get_turf(user))
+	magnitizm.orbit(user, 20)
+
+/obj/effect/wizard_magnetism
+	name = "magnetic anomaly"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "shield2"
+	/// We need to orbit around someone.
+	var/datum/weakref/owner
+
+/obj/effect/wizard_magnetism/New(loc, ...)
+	. = ..()
+	transform *= 0.4
+
+/obj/effect/wizard_magnetism/orbit(atom/new_owner, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+	. = ..()
+	if(!isliving(new_owner))
+		return
+	owner = WEAKREF(new_owner)
+	RegisterSignal(new_owner, COMSIG_ENTER_AREA, PROC_REF(check_area))
+	RegisterSignal(new_owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_death))
+
+/obj/effect/wizard_magnetism/proc/check_area(mob/living/wizard, area/new_area)
+	SIGNAL_HANDLER
+
+	if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+		return
+	START_PROCESSING(SSprocessing, src)
+	UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/obj/effect/wizard_magnetism/proc/on_owner_death()
+	SIGNAL_HANDLER
+
+	stop_orbit()
+
+/obj/effect/wizard_magnetism/process(seconds_per_tick)
+	if(isnull(owner))
+		stop_orbit()
+		return
+	var/mob/living/wizard = owner.resolve()
+	var/list/things_in_range = orange(5, wizard) - orange(1, wizard)
+	for(var/obj/take_object in things_in_range)
+		if(!take_object.anchored)
+			step_towards(take_object, wizard)
+	for(var/mob/living/living_mov in things_in_range)
+		if(wizard)
+			if(living_mov == wizard)
+				continue
+		if(!living_mov.mob_negates_gravity())
+			step_towards(living_mov, wizard)
+
+/obj/effect/wizard_magnetism/stop_orbit()
+	STOP_PROCESSING(SSprocessing, src)
+	qdel(src)
+
+#undef SPELLBOOK_CATEGORY_PERKS
diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
index 2d6e5bb0115e0..db7a46b2441b1 100644
--- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
@@ -229,6 +229,10 @@
 		return FALSE
 
 	to_buy.times++
+	if(HAS_TRAIT(user, TRAIT_SPELLS_LOTTERY))
+		if(prob(50 / to_buy.cost))
+			to_chat(user, span_notice("This spell was given to you for free!"))
+			return TRUE
 	uses -= to_buy.cost
 	return TRUE
 
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm b/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm
index f2f878dea3a1c..1874dc1718c87 100644
--- a/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/armageddon.dm
@@ -52,7 +52,7 @@
 			var/datum/dynamic_ruleset/roundstart/meteor/meteors = new()
 			meteors.meteordelay = 0
 			SSdynamic.execute_roundstart_rule(meteors) // Meteors will continue until morale is crushed.
-			priority_announce("Зафиксировано движение астероидов на встречном со станцией курсе.", "ВНИМАНИЕ: Астероиды", ANNOUNCER_METEORS)
+			priority_announce("Зафиксировано движение астероидов на встречном со станцией курсе.", "Астероиды", ANNOUNCER_METEORS)
 
 #undef DOOM_SINGULARITY
 #undef DOOM_TESLA
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
index d2f4a5a076358..7c228574a0694 100644
--- a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
@@ -9,7 +9,16 @@
 /datum/grand_finale/clown/trigger(mob/living/carbon/human/invoker)
 	for(var/mob/living/carbon/human/victim as anything in GLOB.human_list)
 		victim.Unconscious(3 SECONDS)
-		if (!victim.mind || IS_HUMAN_INVADER(victim) || victim == invoker)
+		if (victim == invoker)
+			if(locate(/datum/action/cooldown/spell/pointed/untie_shoes) in invoker.actions)
+				continue
+			var/datum/action/cooldown/spell/pointed/untie_shoes/newer_spell = new(invoker)
+			newer_spell.Grant(invoker)
+			for(var/i in 1 to newer_spell.spell_max_level)
+				newer_spell.level_spell()
+				newer_spell.invocation_type = INVOCATION_SHOUT
+			continue
+		if (!victim.mind || IS_HUMAN_INVADER(victim))
 			continue
 		if (HAS_TRAIT(victim, TRAIT_CLOWN_ENJOYER))
 			victim.add_mood_event("clown_world", /datum/mood_event/clown_world)
@@ -23,6 +32,8 @@
 		if (is_clown_job(victim.mind.assigned_role))
 			var/datum/action/cooldown/spell/conjure_item/clown_pockets/new_spell = new(victim)
 			new_spell.Grant(victim)
+			var/datum/action/cooldown/spell/pointed/untie_shoes/newer_spell = new(victim)
+			newer_spell.Grant(victim)
 			continue
 		dress_as_magic_clown(victim)
 		if (prob(15))
diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm
index 628f16fd45836..60b50b0e9e862 100644
--- a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm
@@ -19,7 +19,7 @@
 	pixel_y = 16
 	pixel_z = -48
 	anchored = TRUE
-	interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
+	interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_ATTACK_PAW
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	layer = SIGIL_LAYER
 	/// How many prior grand rituals have been completed?
@@ -83,10 +83,10 @@
 /obj/effect/grand_rune/proc/announce_rune()
 	var/area/created_area = get_area(src)
 	if (potency >= GRAND_RITUAL_IMMINENT_FINALE_POTENCY)
-		priority_announce("Крупные аномальные флуктуации локального пространства-времени, обнаруженные в: [created_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce("Крупные аномальные флуктуации локального пространства-времени, обнаруженные в: [created_area.name].", "Обнаружена аномалия")
 		return
 	if (potency >= GRAND_RITUAL_RUNES_WARNING_POTENCY)
-		priority_announce("Необычные аномальные флуктуации энергии, обнаруженные в: [created_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce("Необычные аномальные флуктуации энергии, обнаруженные в: [created_area.name].", "Обнаружена аномалия")
 		return
 
 /obj/effect/grand_rune/examine(mob/user)
@@ -299,7 +299,7 @@
 		if (2)
 			announce = "Неминуемый провал локальной реальности в: [created_area.name]. Всем членам экипажа приготовиться к эвакуации."
 	if (announce)
-		priority_announce(announce, "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce(announce, "Обнаружена аномалия")
 	dire_warnings_given++
 	return ..()
 
diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
index ffc2ea5d590af..a760115a61b9e 100644
--- a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
@@ -335,7 +335,7 @@
 /obj/effect/abstract/local_food_rain/proc/drop_food(turf/landing_zone)
 	podspawn(list(
 			"target" = landing_zone,
-			"style" = STYLE_SEETHROUGH,
+			"style" = /datum/pod_style/seethrough,
 			"spawn" = get_random_food(),
 			"delays" = list(POD_TRANSIT = 0, POD_FALLING = (3 SECONDS), POD_OPENING = 0, POD_LEAVING = 0),
 			"effectStealth" = TRUE,
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index a54d3f8192274..4e0eb0686f629 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -25,6 +25,8 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key)
 	show_to_ghosts = TRUE
 	/// This mob's Grand Ritual ability
 	var/datum/action/cooldown/grand_ritual/ritual
+	/// Perks that wizard learn
+	var/list/perks = list()
 
 /datum/antagonist/wizard_minion
 	name = "Помощник волшебника"
diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm
index 0bb3bcfe8ead7..8affc71e568f3 100644
--- a/code/modules/art/paintings.dm
+++ b/code/modules/art/paintings.dm
@@ -91,6 +91,14 @@
 	painting_metadata.height = height
 	ADD_KEEP_TOGETHER(src, INNATE_TRAIT)
 
+/obj/item/canvas/Destroy()
+	last_patron = null
+	if(istype(loc,/obj/structure/sign/painting))
+		var/obj/structure/sign/painting/frame = loc
+		frame.remove_art_element(painting_metadata.credit_value)
+	painting_metadata = null
+	return ..()
+
 /obj/item/canvas/proc/reset_grid()
 	grid = new/list(width,height)
 	for(var/x in 1 to width)
@@ -102,6 +110,8 @@
 	ui_interact(user)
 
 /obj/item/canvas/ui_state(mob/user)
+	if(isobserver(user))
+		return GLOB.observer_state
 	if(finalized)
 		return GLOB.physical_obscured_state
 	else
@@ -154,6 +164,9 @@
 	if(.)
 		return
 	var/mob/user = usr
+	///this is here to allow observers to zoom in and out but not do anything else.
+	if(action != "zoom_in" && action != "zoom_out" && isobserver(user))
+		return
 	switch(action)
 		if("paint")
 			if(finalized)
@@ -286,10 +299,16 @@
 					curator.adjust_money(curator_cut, "Painting: Patronage cut")
 					curator.bank_card_talk("Cut on patronage received, account now holds [curator.account_balance] cr.")
 
+	if(istype(loc, /obj/structure/sign/painting))
+		var/obj/structure/sign/painting/frame = loc
+		frame.remove_art_element(painting_metadata.credit_value)
+		frame.add_art_element(offer_amount)
+
 	painting_metadata.patron_ckey = user.ckey
 	painting_metadata.patron_name = user.real_name
 	painting_metadata.credit_value = offer_amount
 	last_patron = WEAKREF(user.mind)
+
 	to_chat(user, span_notice("Nanotrasen Trust Foundation thanks you for your contribution. You're now an official patron of this painting."))
 	var/list/possible_frames = SSpersistent_paintings.get_available_frames(offer_amount)
 	if(possible_frames.len <= 1) // Not much room for choices here.
@@ -566,6 +585,8 @@
 /obj/structure/sign/painting/Exited(atom/movable/movable, atom/newloc)
 	. = ..()
 	if(movable == current_canvas)
+		if(!QDELETED(current_canvas))
+			remove_art_element(current_canvas.painting_metadata.credit_value)
 		current_canvas = null
 		update_appearance()
 
@@ -585,6 +606,7 @@
 		if(!current_canvas.finalized)
 			current_canvas.finalize(user)
 		to_chat(user,span_notice("You frame [current_canvas]."))
+		add_art_element()
 		update_appearance()
 		return TRUE
 	return FALSE
@@ -654,10 +676,31 @@
 	new_canvas.finalized = TRUE
 	new_canvas.name = "painting - [painting.title]"
 	current_canvas = new_canvas
+	add_art_element()
 	current_canvas.update_appearance()
 	update_appearance()
 	return TRUE
 
+/obj/structure/sign/painting/proc/add_art_element()
+	var/artistic_value = get_art_value(current_canvas.painting_metadata.credit_value)
+	if(artistic_value)
+		AddElement(/datum/element/art, artistic_value)
+
+/obj/structure/sign/painting/proc/remove_art_element(patronage)
+	var/artistic_value = get_art_value(patronage)
+	if(artistic_value)
+		RemoveElement(/datum/element/art, artistic_value)
+
+/obj/structure/sign/painting/proc/get_art_value(patronage)
+	switch(patronage)
+		if(PATRONAGE_SUPERB_FRAME to INFINITY)
+			return GREAT_ART
+		if(PATRONAGE_EXCELLENT_FRAME to PATRONAGE_SUPERB_FRAME)
+			return GOOD_ART
+		if(PATRONAGE_NICE_FRAME to PATRONAGE_EXCELLENT_FRAME)
+			return OK_ART
+	return 0
+
 /obj/structure/sign/painting/proc/save_persistent()
 	if(!persistence_id || !current_canvas || current_canvas.no_save || current_canvas.painting_metadata.loaded_from_json)
 		return
diff --git a/code/modules/asset_cache/assets/supplypods.dm b/code/modules/asset_cache/assets/supplypods.dm
index fd4c961f103e6..3807c080f6200 100644
--- a/code/modules/asset_cache/assets/supplypods.dm
+++ b/code/modules/asset_cache/assets/supplypods.dm
@@ -2,26 +2,26 @@
 	name = "supplypods"
 
 /datum/asset/spritesheet/supplypods/create_spritesheets()
-	for (var/style in 1 to length(GLOB.podstyles))
-		if (style == STYLE_SEETHROUGH)
-			Insert("pod_asset[style]", icon('icons/obj/supplypods.dmi' , "seethrough-icon"))
+	for (var/datum/pod_style/style as anything in typesof(/datum/pod_style))
+		if (ispath(style, /datum/pod_style/seethrough))
+			Insert("pod_asset[style::id]", icon('icons/obj/supplypods.dmi' , "seethrough-icon"))
 			continue
-		var/base = GLOB.podstyles[style][POD_BASE]
+		var/base = style::icon_state
 		if (!base)
-			Insert("pod_asset[style]", icon('icons/obj/supplypods.dmi', "invisible-icon"))
+			Insert("pod_asset[style::id]", icon('icons/obj/supplypods.dmi', "invisible-icon"))
 			continue
 		var/icon/podIcon = icon('icons/obj/supplypods.dmi', base)
-		var/door = GLOB.podstyles[style][POD_DOOR]
+		var/door = style::has_door
 		if (door)
 			door = "[base]_door"
 			podIcon.Blend(icon('icons/obj/supplypods.dmi', door), ICON_OVERLAY)
-		var/shape = GLOB.podstyles[style][POD_SHAPE]
-		if (shape == POD_SHAPE_NORML)
-			var/decal = GLOB.podstyles[style][POD_DECAL]
+		var/shape = style::shape
+		if (shape == POD_SHAPE_NORMAL)
+			var/decal = style::decal_icon
 			if (decal)
 				podIcon.Blend(icon('icons/obj/supplypods.dmi', decal), ICON_OVERLAY)
-			var/glow = GLOB.podstyles[style][POD_GLOW]
+			var/glow = style::glow_color
 			if (glow)
 				glow = "pod_glow_[glow]"
 				podIcon.Blend(icon('icons/obj/supplypods.dmi', glow), ICON_OVERLAY)
-		Insert("pod_asset[style]", podIcon)
+		Insert("pod_asset[style::id]", podIcon)
diff --git a/code/modules/asset_cache/assets/vending.dm b/code/modules/asset_cache/assets/vending.dm
index 4d99eeefdc9d0..caec9bb4f8218 100644
--- a/code/modules/asset_cache/assets/vending.dm
+++ b/code/modules/asset_cache/assets/vending.dm
@@ -6,22 +6,28 @@
 	var/target_items = list()
 	for(var/obj/machinery/vending/vendor as anything in typesof(/obj/machinery/vending))
 		vendor = new vendor() // It seems `initial(list var)` has nothing. need to make a type.
-		for(var/each in list(vendor.products, vendor.premium, vendor.contraband))
-			target_items |= each
+		target_items |= vendor.products
+		target_items |= vendor.premium
+		target_items |= vendor.contraband
 		qdel(vendor)
 
 	// building icons for each item
-	for (var/k in target_items)
-		var/atom/item = k
+	for (var/atom/item as anything in target_items)
 		if (!ispath(item, /atom))
 			continue
 
 		var/icon_file
-		if (initial(item.greyscale_colors) && initial(item.greyscale_config))
+		var/icon_state = initial(item.icon_state)
+		var/icon_color = initial(item.color)
+		// GAGS icons must be pregenerated
+		if(initial(item.greyscale_config) && initial(item.greyscale_colors))
 			icon_file = SSgreyscale.GetColoredIconByType(initial(item.greyscale_config), initial(item.greyscale_colors))
-		else
+		// Colored atoms must be pregenerated
+		else if(icon_color && icon_state)
 			icon_file = initial(item.icon)
-		var/icon_state = initial(item.icon_state)
+		// Otherwise we can rely on DMIcon, so skip it to save init time
+		else
+			continue
 
 		if (PERFORM_ALL_TESTS(focus_only/invalid_vending_machine_icon_states))
 			var/icon_states_list = icon_states(icon_file)
@@ -36,11 +42,10 @@
 				stack_trace("[item] does not have a valid icon state, icon=[icon_file], icon_state=[json_encode(icon_state)]([text_ref(icon_state)]), icon_states=[icon_states_string]")
 				continue
 
-		var/icon/I = icon(icon_file, icon_state, SOUTH)
-		var/c = initial(item.color)
-		if (!isnull(c) && c != COLOR_WHITE)
-			I.Blend(c, ICON_MULTIPLY)
+		var/icon/produced = icon(icon_file, icon_state, SOUTH)
+		if (!isnull(icon_color) && icon_color != COLOR_WHITE)
+			produced.Blend(icon_color, ICON_MULTIPLY)
 
 		var/imgid = replacetext(replacetext("[item]", "/obj/item/", ""), "/", "-")
 
-		Insert(imgid, I)
+		Insert(imgid, produced)
diff --git a/code/modules/atmospherics/Atmospherics.md b/code/modules/atmospherics/Atmospherics.md
index 1203ed232e184..8d280c6dcdcb5 100644
--- a/code/modules/atmospherics/Atmospherics.md
+++ b/code/modules/atmospherics/Atmospherics.md
@@ -38,7 +38,7 @@ Now then, into the breach.
  The air controller is, at its core, quite simple, yet it is absolutely fundamental to the atmospheric system. The air controller is the clock which triggers all continuous actions within the atmos system, such as vents distributing air or gas moving between tiles. The actions taken by the air controller are quite simple, and will be enumerated here. Much of the substance of the air ticker is due to the game's master controller, whose intricacies I will not delve into for this document. I will however go into more detail about how SSAir in particular works in Chapter 6. In any case, this is a simplified list of the air controller's actions in a single tick:
 1. Rebuild Pipenets
     - Runs each time SSAir processes, sometimes out of order. It ensures that no pipeline sit unresolved or unbuilt
-    - Processes the `rebuild_queue` list into the `expansion_queue` list, and then builds a full pipeline piecemeal. We do a ton of fenagling here to reduce overrun 
+    - Processes the `rebuild_queue` list into the `expansion_queue` list, and then builds a full pipeline piecemeal. We do a ton of fenagling here to reduce overrun
 2. Pipenets
     - Updates the internal gasmixes of attached pipe machinery, and reacts the gases in a pipeline
 	- Calls `process()` on each `/datum/pipenet` in the `networks` list
@@ -180,7 +180,7 @@ You may notice something like this in `process_cell()`. It's not quite the same
 
 Back in the old FEA days, neighbor count was hardcoded to 4 (Likely because this is what cell sharing on an infinite grid would look like). This means that turf A -> turf B is the same as turf B -> turf A, because they're each portioning up the gas in the same way.
 
-But when we moved to LINDA, we started using the length of our atmos_adjacent_turfs list (or an analog). 
+But when we moved to LINDA, we started using the length of our atmos_adjacent_turfs list (or an analog).
 We need this so things like multiz can work, and so tiles in a corner share in a way that makes sense.
 
 Because of this, turf A -> turf B was no longer the same as turf B -> turf A, assuming one of those turfs had a different neighbor count, from I DON'T KNOW WALLS?
@@ -269,7 +269,7 @@ I've been talking kinda abstractly about turfs sleeping. That's because turfs on
 
 ### A brief romp to talk about excited groups and LAST_SHARE_CHECK
 
-Excited groups can tell the amount of diff being shared by hooking into a value `share()` sets on gasmixes, the absolute amount of gas shared by each tile. The issue is this isn't pressure, it's molar count. So heat being shared in a sealed room causes excited groups to break down, then reform from sources. This isn't a major issue due to how breakdown evens things out, but it's worth knowing.
+Excited groups can tell the amount of diff being shared by hooking into a value `share()` sets on gasmixes, the absolute amount of gas shared by each tile. The issue is this isn't pressure, its molar count. So heat being shared in a sealed room causes excited groups to break down, then reform from sources. This isn't a major issue due to how breakdown evens things out, but it's worth knowing.
 
 ### Back to the main thread
 
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index 32acadb3bee52..7bbfea3dcf253 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -45,7 +45,7 @@
 |||| only by meta_gas_list().            ||||
 \*||||||||||||||||||||||||||||||||||||||||*/
 
-//This is a plot created using the values for gas exports. Each gas has a value that works as it's kind of soft-cap, which limits you from making billions of credits per sale, based on the base_value variable on the gasses themselves. Most of these gasses as a result have a rather low value when sold, like nitrogen and oxygen at 1500 and 600 respectively at their maximum value. The
+//This is a plot created using the values for gas exports. Each gas has a value that works as its kind of soft-cap, which limits you from making billions of credits per sale, based on the base_value variable on the gasses themselves. Most of these gasses as a result have a rather low value when sold, like nitrogen and oxygen at 1500 and 600 respectively at their maximum value. The
 /datum/gas
 	var/id = ""
 	var/specific_heat = 0
@@ -108,7 +108,7 @@
 	dangerous = TRUE
 	rarity = 800
 	base_value = 1.5
-	desc = "A flammable gas with many other curious properties. It's research is one of NT's primary objective."
+	desc = "A flammable gas with many other curious properties. Its research is one of NT's primary objective."
 	primary_color = "#ffc0cb"
 
 /datum/gas/water_vapor
@@ -220,7 +220,7 @@
 	fusion_power = -5
 	rarity = 10
 	base_value = 5
-	desc = "A coolant gas. Mainly used for it's endothermic reaction with oxygen."
+	desc = "A coolant gas. Mainly used for its endothermic reaction with oxygen."
 	primary_color = "#afeeee"
 
 /datum/gas/hydrogen
@@ -267,7 +267,7 @@
 	moles_visible = MOLES_GAS_VISIBLE
 	rarity = 1
 	base_value = 7
-	desc = "A highly toxic gas, it's production is highly regulated on top of being difficult. It also breaks down when in contact with nitrogen."
+	desc = "A highly toxic gas, its production is highly regulated on top of being difficult. It also breaks down when in contact with nitrogen."
 	primary_color = "#006400"
 
 /datum/gas/halon
@@ -289,7 +289,7 @@
 	fusion_power = 7
 	rarity = 50
 	base_value = 3.5
-	desc = "A very inert gas produced by the fusion of hydrogen and it's derivatives."
+	desc = "A very inert gas produced by the fusion of hydrogen and its derivatives."
 	primary_color = "#f0f8ff"
 
 /datum/gas/antinoblium
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index 282c523445bbc..f1d4b93ca50b1 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -137,7 +137,6 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
 /obj/machinery/airalarm/Destroy()
 	if(my_area)
 		my_area = null
-	QDEL_NULL(wires)
 	QDEL_NULL(alarm_manager)
 	GLOB.air_alarms -= src
 	return ..()
diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
index cfe74f13c346c..197e0f520a61f 100644
--- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
@@ -5,7 +5,7 @@
 	var/hazard_min = 0
 	var/hazard_max = 0
 
-/** Initialize a TLV and set it's values if given arguments, mostly for map varedits.
+/** Initialize a TLV and set its values if given arguments, mostly for map varedits.
  * We provide this functionality but please consider not doing this and making proper subtypes.
  * Only by doing the latter will [datum/tlv/proc/reset_value] work.
  */
@@ -47,7 +47,7 @@
 	if(threshold_type & TLV_VAR_HAZARD_MAX)
 		hazard_max = value
 
-/** Reset this particular TLV to it's original value.
+/** Reset this particular TLV to its original value.
  *
  * Arguments:
  * * threshold_type: What kind of variable do we want to set. Accepts bitfield subsets of [TLV_VAR_ALL].
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 29ea43905b8b7..8674e6331e4ac 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -327,7 +327,10 @@
 		return FALSE
 
 	//if the target is not in the same piping layer & it does not have the all layer connection flag[which allows it to be connected regardless of layer] then we are out
-	if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER))
+	if(target.pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS)
+		if(ISODD(given_layer))
+			return FALSE
+	else if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER))
 		return FALSE
 
 	//if the target does not have the same color and it does not have all color connection flag[which allows it to be connected regardless of color] & one of the pipes is not gray[allowing for connection regardless] then we are out
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index cd4e00b3f33a6..ded9110bdfd74 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -66,6 +66,8 @@
 
 	if(!showpipe)
 		return ..()
+	if(pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS)
+		return ..()
 
 	var/connected = 0 //Direction bitset
 
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
index 95b548998a194..26cb395113519 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
@@ -38,3 +38,22 @@
 	if(uses <= 0)
 		qdel(src)
 	return ITEM_INTERACT_SUCCESS
+
+/obj/item/nitrium_crystal
+	desc = "A weird brown crystal, it smokes when broken"
+	name = "nitrium crystal"
+	icon = 'icons/obj/pipes_n_cables/atmos.dmi'
+	icon_state = "nitrium_crystal"
+	var/cloud_size = 1
+
+/obj/item/nitrium_crystal/attack_self(mob/user)
+	. = ..()
+	var/datum/effect_system/fluid_spread/smoke/chem/smoke = new
+	var/turf/location = get_turf(src)
+	create_reagents(5)
+	reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3)
+	reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2)
+	smoke.attach(location)
+	smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE)
+	smoke.start()
+	qdel(src)
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 25217de538ce1..da6c75d699d08 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -6,7 +6,7 @@
 	desc = "Very useful for filtering gasses."
 
 	can_unwrench = TRUE
-	construction_type = /obj/item/pipe/trinary/flippable
+	construction_type = /obj/item/pipe/trinary/flippable/filter
 	pipe_state = "filter"
 
 	///Rate of transfer of the gases to the outputs
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm
new file mode 100644
index 0000000000000..804f868e9c189
--- /dev/null
+++ b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm
@@ -0,0 +1,455 @@
+/**
+ * The pump looks up for the airlocks automatically based on airlock_pump_distance_limit and airlock_group_distance_limit values.
+ * When placed, the dir value (direction where the pipes are coming from) is considered as a direction towards the station (internal). The opposite direction is external.
+ * The airlock then tries to find airlocks or walls towards these directions until airlock_pump_distance_limit number of tiles reached.
+ * When it finds a valid object, then it tries to find airlocks, in directions perpendicular to the found tiles.
+ * And then adds them to the corresponding group (external/internal) until airlock_group_distance_limit number of tiles reached
+ *
+ * Example scheme of a valid configuration:
+ * A-----W
+ * A-----A
+ * W--P--A
+ * W-----W
+ * A-----W
+ *
+ * Where:
+ * A - airlocks
+ * W - walls
+ * P - pump
+ */
+/// A vent, scrubber and a sensor in a single device meant specifically for cycling airlocks. Ideal for airlocks of up to 3x3 tiles in size to avoid wind and timing out.
+/obj/machinery/atmospherics/components/unary/airlock_pump
+	name = "external airlock pump"
+	desc = "A pump for cycling an external airlock controlled by the connected doors."
+	icon = 'icons/obj/machines/atmospherics/unary_devices.dmi'
+	icon_state = "airlock_pump"
+	pipe_state = "airlock_pump"
+	use_power = ACTIVE_POWER_USE
+	active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION
+	can_unwrench = TRUE
+	welded = FALSE
+	vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED
+	max_integrity = 100
+	paintable = FALSE
+	pipe_flags = PIPING_ONE_PER_TURF | PIPING_DISTRO_AND_WASTE_LAYERS | PIPING_DEFAULT_LAYER_ONLY | PIPING_ALL_COLORS
+	layer = GAS_PUMP_LAYER
+	hide = TRUE
+	device_type = BINARY // Even though it is unary, it has two nodes on one side - used in node count checks
+
+	///Indicates that the direction of the pump, if ATMOS_DIRECTION_SIPHONING is siphoning, if ATMOS_DIRECTION_RELEASING is releasing
+	var/pump_direction = ATMOS_DIRECTION_SIPHONING
+	///Target pressure for pressurization cycle
+	var/internal_pressure_target = ONE_ATMOSPHERE
+	///Target pressure for depressurization cycle
+	var/external_pressure_target = 0
+	///Target pressure for the current cycle
+	var/cycle_pressure_target
+	///Allowed error in pressure checks
+	var/allowed_pressure_error = ONE_ATMOSPHERE / 100
+	///Minimal distro pressure to start cycling
+	var/min_distro_pressure = ONE_ATMOSPHERE / 10
+	///Rate of the pump to remove gases from the air
+	var/volume_rate = 1000
+	///The start time of the current cycle to calculate cycle duration
+	var/cycle_start_time
+	///Max duration of cycle, after which the pump will unlock the airlocks with a warning
+	var/cycle_timeout = 10 SECONDS
+	///List of the turfs adjacent to the pump for faster cycling and avoiding wind
+	var/list/turf/adjacent_turfs = list()
+	///Max distance between the airlock and the pump. Used to set up cycling.
+	var/airlock_pump_distance_limit = 2
+	///Max distance between the central airlock and the side airlocks in a group
+	var/airlock_group_distance_limit = 2
+	///Type of airlocks required for automatic cycling setup. To avoid hacking bridge doors. Ignored for mapspawn pump.
+	var/valid_airlock_typepath = /obj/machinery/door/airlock/external
+	///Station-facing airlocks used in cycling
+	var/list/obj/machinery/door/airlock/internal_airlocks
+	///Space-facing airlocks used in cycling
+	var/list/obj/machinery/door/airlock/external_airlocks
+	///Whether both airlocks are specified and cycling is available
+	var/cycling_set_up = FALSE
+	///Whether the pump opens the airlocks up instead of simpy unbolting them on cycle
+	var/open_airlock_on_cycle = TRUE
+	///Airlocks currently animating
+	var/airlocks_animating = FALSE
+	///Whether the airlocks comment the cycling details to the chat
+	var/is_cycling_audible = TRUE
+
+	COOLDOWN_DECLARE(check_turfs_cooldown)
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/update_icon_nopipes()
+	if(!on || !is_operational || !powered())
+		icon_state = "vent_off"
+	else
+		icon_state = pump_direction ? "vent_out" : "vent_in"
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/update_overlays()
+	. = ..()
+	if(!showpipe)
+		return
+
+	var/mutable_appearance/distro_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_BLUE, piping_layer = 4)
+	if(nodes[1])
+		distro_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_BLUE, piping_layer = 4)
+	. += distro_pipe_appearance
+
+	var/mutable_appearance/waste_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_RED, piping_layer = 2)
+	if(nodes[2])
+		waste_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_RED, piping_layer = 2)
+	. += waste_pipe_appearance
+
+	var/mutable_appearance/distro_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 4)
+	. += distro_cap_appearance
+
+	var/mutable_appearance/waste_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 2)
+	. += waste_cap_appearance
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/atmos_init(list/node_connects)
+	for(var/obj/machinery/atmospherics/target in get_step(src, dir))
+		if(connection_check(target, 4) && !nodes[1])
+			nodes[1] = target // Distro
+		if(connection_check(target, 2) && !nodes[2])
+			nodes[2] = target // Waste
+	update_appearance()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/Initialize(mapload)
+	. = ..()
+	if(mapload)
+		can_unwrench = FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/post_machine_initialize()
+	. = ..()
+	set_links()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/New()
+	. = ..()
+	var/datum/gas_mixture/distro_air = airs[1]
+	var/datum/gas_mixture/waste_air = airs[2]
+	distro_air.volume = 1000
+	waste_air.volume = 1000
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/on_deconstruction(disassembled)
+	. = ..()
+	if(cycling_set_up)
+		break_all_links()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/can_unwrench(mob/user)
+	. = ..()
+	if(!.)
+		to_chat(user, span_warning("You cannot unwrench [src], it is secured firmly in place!"))
+		return FALSE
+	if(. && on)
+		to_chat(user, span_warning("You cannot unwrench [src], wait for the cycle completion!"))
+		return FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/process_atmos()
+	if(!on)
+		return
+
+	if(!powered())
+		stop_cycle("No power. Cycle aborted.", unbolt_only = TRUE)
+		return //Couldn't complete the cycle due to power outage
+
+	var/turf/location = get_turf(loc)
+	if(isclosedturf(location))
+		return
+
+	if(COOLDOWN_FINISHED(src, check_turfs_cooldown))
+		check_turfs()
+		COOLDOWN_START(src, check_turfs_cooldown, 2 SECONDS)
+
+	if(world.time - cycle_start_time > cycle_timeout)
+		stop_cycle("Cycling timed out, bolts unlocked.", unbolt_only = TRUE)
+		return //Couldn't complete the cycle before timeout
+
+	var/datum/gas_mixture/distro_air = airs[1]
+	var/datum/gas_mixture/tile_air = loc.return_air()
+	var/tile_air_pressure = tile_air.return_pressure()
+
+	if(pump_direction == ATMOS_DIRECTION_RELEASING) //distro node -> tile
+		var/pressure_delta = cycle_pressure_target - tile_air_pressure
+		if(pressure_delta <= allowed_pressure_error && stop_cycle("Pressurization complete."))
+			return //Internal target pressure reached
+
+		var/available_moles = distro_air.total_moles()
+		var/total_tiles = adjacent_turfs.len + 1
+		var/split_moles = QUANTIZE(available_moles / total_tiles)
+
+		fill_tile(loc, split_moles, pressure_delta)
+		for(var/turf/tile as anything in adjacent_turfs)
+			fill_tile(tile, split_moles, pressure_delta)
+	else //tile -> waste node
+		var/pressure_delta = tile_air_pressure - cycle_pressure_target
+		if(pressure_delta <= allowed_pressure_error && stop_cycle("Decompression complete."))
+			return //External target pressure reached
+
+		siphon_tile(loc)
+		for(var/turf/tile as anything in adjacent_turfs)
+			siphon_tile(tile)
+
+
+/// Fill a tile with air from the distro node
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/fill_tile(turf/tile, moles, pressure_delta)
+	var/datum/pipeline/distro_pipe = parents[1]
+	var/datum/gas_mixture/distro_air = airs[1]
+	var/datum/gas_mixture/tile_air = tile.return_air()
+	var/transfer_moles = (volume_rate / tile_air.volume) * (pressure_delta * tile_air.volume) / (distro_air.temperature * R_IDEAL_GAS_EQUATION)
+	moles = min(moles, transfer_moles)
+
+	var/datum/gas_mixture/removed_air = distro_air.remove(moles)
+
+	if(!removed_air)
+		return //No air in distro
+
+	tile.assume_air(removed_air)
+	distro_pipe.update = TRUE
+
+
+/// Siphon air from the tile to the waste node within the volume rate limit
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/siphon_tile(turf/tile)
+	var/datum/pipeline/waste_pipe = parents[2]
+	var/datum/gas_mixture/waste_air = airs[2]
+	var/datum/gas_mixture/tile_air = tile.return_air()
+
+	var/transfer_moles = tile_air.total_moles() * (volume_rate / tile_air.volume)
+	var/datum/gas_mixture/removed_air = tile.remove_air(transfer_moles)
+
+	if(!removed_air)
+		return //No air on the tile
+
+	waste_air.merge(removed_air)
+	waste_pipe.update = TRUE
+
+
+/// Proc for triggering cycle by clicking on a bolted airlock that has a pump assigned
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/airlock_act(obj/machinery/door/airlock/airlock)
+	if(on)
+		airlock.run_animation(DOOR_DENY_ANIMATION) // Already cycling
+		return
+	if(!cycling_set_up)
+		airlock.say("Airlock pair not found.")
+		return
+	if(airlock in external_airlocks)
+		start_cycle(ATMOS_DIRECTION_SIPHONING, airlock)
+	else if(airlock in internal_airlocks)
+		start_cycle(ATMOS_DIRECTION_RELEASING, airlock)
+
+
+///Start decompression or pressurization cycle depending on the passed direction
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/start_cycle(cycle_direction, obj/machinery/door/airlock/source_airlock = null)
+	if(on || !cycling_set_up || airlocks_animating || !powered())
+		return FALSE
+
+	pump_direction = cycle_direction
+
+	for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+		INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close))
+
+	airlocks_animating = TRUE
+	stoplag(1 SECONDS) // Wait for closing animation
+	airlocks_animating = FALSE
+
+	on = TRUE
+	cycle_start_time = world.time
+
+	var/turf/local_turf = get_turf(src)
+	var/tile_air_pressure = max(0, local_turf.return_air().return_pressure())
+
+	if(pump_direction == ATMOS_DIRECTION_RELEASING)
+		cycle_pressure_target = internal_pressure_target
+		var/pressure_delta = cycle_pressure_target - tile_air_pressure
+		if(pressure_delta <= allowed_pressure_error)
+			stop_cycle("Pressure nominal, cycle skipped.")
+			return TRUE
+
+		var/datum/gas_mixture/distro_air = airs[1]
+		if(distro_air.return_pressure() < min_distro_pressure)
+			stop_cycle("Low pipe pressure, cycle skipped. Proceed with caution.", unbolt_only = TRUE)
+			return TRUE
+
+		if(!source_airlock)
+			source_airlock = internal_airlocks[1]
+		if(is_cycling_audible)
+			source_airlock.say("Pressurizing airlock.")
+	else
+		cycle_pressure_target = external_pressure_target
+		var/pressure_delta = tile_air_pressure - cycle_pressure_target
+		if(pressure_delta <= allowed_pressure_error)
+			stop_cycle("Pressure nominal, cycle skipped.")
+			return TRUE
+
+		for(var/obj/machinery/door/airlock/airlock as anything in external_airlocks)
+			if(airlock.shuttledocked)
+				stop_cycle("Shuttle docked, cycle skipped.")
+				return TRUE
+
+		if(!source_airlock)
+			source_airlock = external_airlocks[1]
+		if(is_cycling_audible)
+			source_airlock.say("Decompressing airlock.")
+
+	update_appearance()
+	return TRUE
+
+
+///Complete/Abort cycle with the passed message
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/stop_cycle(message = null, unbolt_only = FALSE)
+	if(!on)
+		return FALSE
+	on = FALSE
+
+	var/list/obj/machinery/door/airlock/unlocked_airlocks = pump_direction == ATMOS_DIRECTION_RELEASING ? internal_airlocks : external_airlocks
+	for(var/obj/machinery/door/airlock/airlock as anything in unlocked_airlocks)
+		airlock.unbolt()
+		if(open_airlock_on_cycle && !unbolt_only)
+			INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) //Can unbolt, but without audio
+
+	airlocks_animating = TRUE
+	stoplag(1 SECONDS) // Wait for opening animation
+	airlocks_animating = FALSE
+
+	if(message && is_cycling_audible)
+		unlocked_airlocks[1].say(message)
+
+	update_appearance()
+	return TRUE
+
+
+///Update adjacent_turfs with atmospherically adjacent tiles
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/check_turfs()
+	adjacent_turfs.Cut()
+	var/turf/local_turf = get_turf(src)
+	adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE)
+
+
+///Find airlocks and link up with them
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/set_links()
+	var/perpendicular_dirs = NSCOMPONENT(dir) ? WEST|EAST : NORTH|SOUTH
+	var/turf/internal_airlocks_origin = find_density(get_turf(src), dir)
+	var/turf/external_airlocks_origin = find_density(get_turf(src), REVERSE_DIR(dir))
+	internal_airlocks = get_adjacent_airlocks(internal_airlocks_origin, perpendicular_dirs)
+	external_airlocks = get_adjacent_airlocks(external_airlocks_origin, perpendicular_dirs)
+
+	if(!internal_airlocks.len || !internal_airlocks.len)
+		if(!can_unwrench) //maploaded pump
+			CRASH("[type] couldn't find airlocks to cycle with!")
+		internal_airlocks = list()
+		external_airlocks = list()
+		say("Cycling setup failed. No opposite airlocks found.")
+		return
+
+	for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+		airlock.set_cycle_pump(src)
+		RegisterSignal(airlock, COMSIG_QDELETING, PROC_REF(unlink_airlock))
+		if (airlock in external_airlocks)
+			INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close))
+		else if(open_airlock_on_cycle)
+			INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open))
+
+	cycle_timeout *= round((internal_airlocks.len + external_airlocks.len) / 2)
+	cycling_set_up = TRUE
+	if(can_unwrench)
+		say("Cycling setup complete.")
+
+
+///Get the turf of the first found airlock or an airtight structure (walls) within the allowed range
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/find_density(turf/origin, direction, max_distance = airlock_pump_distance_limit)
+	var/turf/next_turf = origin
+	var/limit = max(1, max_distance)
+	while(limit)
+		limit--
+		next_turf = get_step(next_turf, direction)
+		var/obj/machinery/door/airlock/found_airlock = locate() in next_turf
+		if(is_valid_airlock(found_airlock))
+			return found_airlock.loc
+		if(!next_turf.can_atmos_pass)
+			return next_turf
+
+
+///Find airlocks adjacent to the central one, lined up along the provided directions
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/get_adjacent_airlocks(origin_turf, directions)
+	var/list/airlocks = list()
+
+	var/obj/machinery/door/airlock/origin_airlock = locate() in origin_turf
+	if(is_valid_airlock(origin_airlock))
+		airlocks.Add(origin_airlock)
+
+	for(var/direction in GLOB.cardinals)
+		if(!(direction & directions))
+			continue
+		var/turf/next_turf = origin_turf
+		var/limit = max(0, airlock_group_distance_limit)
+		while(limit)
+			limit--
+			next_turf = get_step(next_turf, direction)
+			var/obj/machinery/door/airlock/found_airlock = locate() in next_turf
+			if (is_valid_airlock(found_airlock))
+				airlocks.Add(found_airlock)
+			else
+				limit = 0
+
+	return airlocks
+
+
+///Whether the passed airlock can be linked with
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/is_valid_airlock(obj/machinery/door/airlock/airlock)
+	if(!airlock)
+		return FALSE
+	if(airlock.cycle_pump)
+		return FALSE // Already linked
+	if(can_unwrench && !istype(airlock, valid_airlock_typepath))
+		return FALSE // Invalid airlock type and the pump is not mapspawn
+	return TRUE
+
+
+///Find airlocks and link up with them
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/unlink_airlock(airlock)
+	UnregisterSignal(airlock, COMSIG_QDELETING)
+
+	if(airlock in internal_airlocks)
+		internal_airlocks.Remove(airlock)
+	if(airlock in external_airlocks)
+		external_airlocks.Remove(airlock)
+
+	if(!internal_airlocks.len || !external_airlocks.len)
+		break_all_links()
+
+
+///Break the cycling setup
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/break_all_links()
+	for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+		UnregisterSignal(airlock, COMSIG_QDELETING)
+
+	external_airlocks = list()
+	internal_airlocks = list()
+	cycle_timeout = initial(cycle_timeout)
+	cycling_set_up = FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/relaymove(mob/living/user, direction)
+	if(initialize_directions & direction)
+		return ..()
+	if((NORTH|EAST) & direction)
+		user.ventcrawl_layer = clamp(user.ventcrawl_layer + 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1)
+	if((SOUTH|WEST) & direction)
+		user.ventcrawl_layer = clamp(user.ventcrawl_layer - 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1)
+	to_chat(user, "You align yourself with the [user.ventcrawl_layer == 2 ? 1 : 2]\th output.")
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only
+	open_airlock_on_cycle = FALSE
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/silent
+	is_cycling_audible = FALSE
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/lavaland
+	external_pressure_target = LAVALAND_EQUIPMENT_EFFECT_PRESSURE
+
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 02f0d20354496..8a165830cec07 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -5,7 +5,7 @@
 
 	name = "air vent"
 	desc = "Has a valve and pump attached to it."
-
+	construction_type = /obj/item/pipe/directional/vent
 	use_power = IDLE_POWER_USE
 	idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.15
 	can_unwrench = TRUE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 20a0b86b41c29..22ee2f6b414a7 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -3,6 +3,7 @@
 
 	name = "air scrubber"
 	desc = "Has a valve and pump attached to it."
+	construction_type = /obj/item/pipe/directional/scrubber
 	use_power = IDLE_POWER_USE
 	idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.1
 	active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.15
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 35b8fa61bbc22..9c953922c72a7 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -131,7 +131,7 @@
 
 	/**
 	 *  For a machine to properly "connect" to a pipeline and share gases,
-	 *  the pipeline needs to acknowledge a gas mixture as it's member.
+	 *  the pipeline needs to acknowledge a gas mixture as its member.
 	 *  This is currently handled by the other_airs list in the pipeline datum.
 	 *
 	 *	Other_airs itself is populated by gas mixtures through the parents list that each machineries have.
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index df919cbeccb1c..fde47b1baf0ee 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -65,6 +65,10 @@
 		for(var/i in PIPING_LAYER_MIN to PIPING_LAYER_MAX)
 			. += get_attached_image(get_dir(src, machine_check), i, COLOR_VERY_LIGHT_GRAY)
 		return
+	if(istype(machine_check, /obj/machinery/atmospherics/components/unary/airlock_pump))
+		. += get_attached_image(get_dir(src, machine_check), 4, COLOR_BLUE)
+		//. += get_attached_image(get_dir(src, machine_check), 2, COLOR_RED) // Only the distro node is added currently to the pipenet, it doesn't merge the pipenet with the waste node
+		return
 	. += get_attached_image(get_dir(src, machine_check), machine_check.piping_layer, machine_check.pipe_color)
 
 /obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_image(p_dir, p_layer, p_color)
diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm
index 3615147e4d1bf..dce09be9092ed 100644
--- a/code/modules/atmospherics/machinery/pipes/mapping.dm
+++ b/code/modules/atmospherics/machinery/pipes/mapping.dm
@@ -83,7 +83,7 @@ HELPER(yellow, COLOR_YELLOW)
 HELPER(general, COLOR_VERY_LIGHT_GRAY)
 HELPER(cyan, COLOR_CYAN)
 HELPER(green, COLOR_VIBRANT_LIME)
-HELPER(orange, COLOR_TAN_ORANGE)
+HELPER(orange, COLOR_ENGINEERING_ORANGE)
 HELPER(purple, COLOR_PURPLE)
 HELPER(dark, COLOR_DARK)
 HELPER(brown, COLOR_BROWN)
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 9729c0871451a..210eb9b0d9e28 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -51,6 +51,10 @@
 	AddElement(/datum/element/elevation, pixel_shift = 8)
 	register_context()
 
+/obj/machinery/portable_atmospherics/on_construction(mob/user)
+	. = ..()
+	set_anchored(FALSE)
+
 /obj/machinery/portable_atmospherics/on_deconstruction(disassembled)
 	if(nob_crystal_inserted)
 		new /obj/item/hypernoblium_crystal(src)
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index 6f6a25b47c8cd..843e55b963fe4 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -1,6 +1,6 @@
 /obj/effect/oneway
 	name = "one way effect"
-	desc = "Only lets things in from it's dir."
+	desc = "Only lets things in from its dir."
 	icon = 'icons/effects/mapping_helpers.dmi'
 	icon_state = "field_dir"
 	invisibility = INVISIBILITY_MAXIMUM
@@ -13,7 +13,7 @@
 
 /obj/effect/wind
 	name = "wind effect"
-	desc = "Creates pressure effect in it's direction. Use sparingly."
+	desc = "Creates pressure effect in its direction. Use sparingly."
 	icon = 'icons/effects/mapping_helpers.dmi'
 	icon_state = "field_dir"
 	invisibility = INVISIBILITY_MAXIMUM
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 0fdc5093511f2..b72a6b59dde36 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -32,15 +32,51 @@ GLOBAL_LIST_INIT(potentialConfigRandomZlevels, generate_map_list_from_directory(
 			current = D
 	if(!current)
 		current = new
+		current.name = name
 		current.id = id
 		if(delay)
-			current.wait = CONFIG_GET(number/gateway_delay)
+			var/list/waits_by_id = CONFIG_GET(keyed_list/gateway_delays_by_id)
+			var/wait_to_use = !isnull(waits_by_id[id]) ? waits_by_id[id] : CONFIG_GET(number/gateway_delay)
+			current.wait = wait_to_use
 		GLOB.gateway_destinations += current
 	current.target_turfs += get_turf(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/awaystart/nodelay
 	delay = FALSE
 
+/obj/effect/landmark/awaystart/beach
+	name = "beach away spawn"
+	id = AWAYSTART_BEACH
+
+/obj/effect/landmark/awaystart/museum
+	name = "buseum away spawn"
+	id = AWAYSTART_MUSEUM
+
+/obj/effect/landmark/awaystart/research
+	name = "research outpost away spawn"
+	id = AWAYSTART_RESEARCH
+
+/obj/effect/landmark/awaystart/caves
+	name = "caves away spawn"
+	id = AWAYSTART_CAVES
+
+/obj/effect/landmark/awaystart/moonoutpost
+	name = "Moon Outpost 19 away spawn"
+	id = AWAYSTART_MOONOUTPOST
+
+/obj/effect/landmark/awaystart/snowcabin
+	name = "snow cabin away spawn"
+	id = AWAYSTART_SNOWCABIN
+
+/obj/effect/landmark/awaystart/snowdin
+	name = "Snowdin away spawn"
+	id = AWAYSTART_SNOWDIN
+
+/obj/effect/landmark/awaystart/underground
+	name = "Underground Outpost 45 away spawn"
+	id = AWAYSTART_UNDERGROUND
+
 /proc/generateMapList(filename)
 	. = list()
 	filename = "[global.config.directory]/[SANITIZE_FILENAME(filename)]"
diff --git a/code/modules/bitrunning/areas.dm b/code/modules/bitrunning/areas.dm
index 720bf0f1e5d2c..4fcf0a0496e47 100644
--- a/code/modules/bitrunning/areas.dm
+++ b/code/modules/bitrunning/areas.dm
@@ -43,8 +43,14 @@
 	icon_state = "bit_ice"
 	area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
 
-/area/ruin/space/has_grav/powered/virtual_domain
-	name = "Virtual Domain Space Ruins"
+/area/ruin/space/virtual_domain
+	name = "Virtual Domain Unexplored Location"
+	icon = 'icons/area/areas_station.dmi'
+	icon_state = "bit_ruin"
+	area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
+
+/area/space/virtual_domain
+	name = "Virtual Domain Space"
 	icon = 'icons/area/areas_station.dmi'
 	icon_state = "bit_space"
 	area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
diff --git a/code/modules/bitrunning/netpod/utils.dm b/code/modules/bitrunning/netpod/utils.dm
index 73040b86b4c6b..3aee3cc95ce3d 100644
--- a/code/modules/bitrunning/netpod/utils.dm
+++ b/code/modules/bitrunning/netpod/utils.dm
@@ -76,6 +76,11 @@
 		balloon_alert(neo, "ничего не загружено!!")
 		return
 
+	balloon_alert(neo, "establishing connection...")
+	if(!do_after(neo, 2 SECONDS, src))
+		open_machine()
+		return
+
 	var/mob/living/carbon/current_avatar = avatar_ref?.resolve()
 	if(isnull(current_avatar) || current_avatar.stat != CONSCIOUS) // We need a viable avatar
 		current_avatar = server.start_new_connection(neo, netsuit)
@@ -130,9 +135,6 @@
 
 /// Checks for cases to eject/fail connecting an avatar
 /obj/machinery/netpod/proc/validate_entry(mob/living/neo, mob/living/avatar)
-	if(!do_after(neo, 2 SECONDS, src))
-		return FALSE
-
 	// Very invalid
 	if(QDELETED(neo) || QDELETED(avatar) || QDELETED(src) || !is_operational)
 		return FALSE
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index 5fabb45ba244e..ff82007a6a9be 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -213,7 +213,7 @@
 /datum/bounty/item/assistant/fish
 	name = "Рыба"
 	description = "Нам нужна рыба для заполнения наших аквариумов. Мёртвые или купленные из отдела поставок рыбы будут оплачены лишь наполовину."
-	reward = CARGO_CRATE_VALUE * 9
+	reward = CARGO_CRATE_VALUE * 9.5
 	required_count = 4
 	wanted_types = list(/obj/item/fish = TRUE, /obj/item/storage/fish_case = TRUE)
 	///the penalty for shipping dead/bought fish, which can subtract up to half the reward in total.
@@ -249,7 +249,7 @@
 
 ///A subtype of the fish bounty that requires fish with a specific fluid type
 /datum/bounty/item/assistant/fish/fluid
-	reward = CARGO_CRATE_VALUE * 11
+	reward = CARGO_CRATE_VALUE * 12
 	///The required fluid type of the fish for it to be shipped
 	var/fluid_type
 
@@ -261,42 +261,3 @@
 
 /datum/bounty/item/assistant/fish/fluid/can_ship_fish(obj/item/fish/fishie)
 	return compatible_fluid_type(fishie.required_fluid_type, fluid_type)
-
-///A subtype of the fish bounty that requires specific fish types. The higher their rarity, the better the pay.
-/datum/bounty/item/assistant/fish/specific
-	description = "В нашей престижной рыбной коллекции на данный момент не хватает нескольких специфичных видов. Мёртвые или купленные в отделе поставок рыбы будут оплачены лишь наполовину."
-	reward = CARGO_CRATE_VALUE * 16
-	required_count = 3
-	wanted_types = list(/obj/item/storage/fish_case = TRUE)
-
-/datum/bounty/item/assistant/fish/specific/New()
-	var/static/list/choosable_fishes
-	if(isnull(choosable_fishes))
-		choosable_fishes = list()
-		for(var/obj/item/fish/prototype as anything in subtypesof(/obj/item/fish))
-			if(initial(prototype.experisci_scannable) && initial(prototype.show_in_catalog))
-				choosable_fishes += prototype
-
-	var/list/fishes_copylist = choosable_fishes.Copy()
-	///Used to calculate the extra reward
-	var/total_rarity = 0
-	var/list/name_list = list()
-	var/num_paths = rand(2,3)
-	for(var/i in 1 to num_paths)
-		var/obj/item/fish/chosen_path = pick_n_take(fishes_copylist)
-		wanted_types[chosen_path] = TRUE
-		name_list += initial(chosen_path.name)
-		total_rarity += initial(chosen_path.random_case_rarity) / num_paths
-	name = english_list(name_list)
-
-	switch(total_rarity)
-		if(FISH_RARITY_NOPE to FISH_RARITY_GOOD_LUCK_FINDING_THIS)
-			reward += CARGO_CRATE_VALUE * 14
-		if(FISH_RARITY_GOOD_LUCK_FINDING_THIS to FISH_RARITY_VERY_RARE)
-			reward += CARGO_CRATE_VALUE * 6.5
-		if(FISH_RARITY_VERY_RARE to FISH_RARITY_RARE)
-			reward += CARGO_CRATE_VALUE * 3
-		if(FISH_RARITY_RARE to FISH_RARITY_BASIC-1)
-			reward += CARGO_CRATE_VALUE * 1
-
-	..()
diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm
index 72fbebd42b506..396bc2bea0af2 100644
--- a/code/modules/cargo/bounties/chef.dm
+++ b/code/modules/cargo/bounties/chef.dm
@@ -82,7 +82,7 @@
 
 /datum/bounty/item/chef/superbite
 	name = "Super Bite бургер"
-	description = "Коммандор Табс думает, что он сможет установить мировой рекорд по поеданию. Всё что ему нужно, так это Super Bite Burger, отправленный ему."
+	description = "Командор Табс думает, что он сможет установить мировой рекорд по поеданию. Всё что ему нужно, так это Super Bite Burger, отправленный ему."
 	reward = CARGO_CRATE_VALUE * 24
 	wanted_types = list(/obj/item/food/burger/superbite = TRUE)
 
diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm
index 2eb874e93a59e..b1668af6cdbdf 100644
--- a/code/modules/cargo/bounties/medical.dm
+++ b/code/modules/cargo/bounties/medical.dm
@@ -1,6 +1,6 @@
 /datum/bounty/item/medical/heart
 	name = "Сердце"
-	description = "Коммандор Джонсон в критическом состоянии после ещё одного пережитого сердечного приступа. Врачи говорят, что им нужно новое сердце как можно быстрее. Отправьте одно, быстро! Мы возьмём и кибернетическое, но только улучшенное."
+	description = "Командор Джонсон в критическом состоянии после ещё одного пережитого сердечного приступа. Врачи говорят, что им нужно новое сердце как можно быстрее. Отправьте одно, быстро! Мы возьмём и кибернетическое, но только улучшенное."
 	reward = CARGO_CRATE_VALUE * 5
 	wanted_types = list(
 		/obj/item/organ/internal/heart = TRUE,
@@ -89,7 +89,7 @@
 
 /datum/bounty/item/medical/tail_whip //Like the cat tail bounties, with more processing.
 	name = "Nine Tails whip"
-	description = "Коммандор Джексон ищет отличное дополнение для её коллекции экзотического оружия. Она вас наградит и за кошачий, и за ящерский девятихвост."
+	description = "Командор Джексон ищет отличное дополнение для её коллекции экзотического оружия. Она вас наградит и за кошачий, и за ящерский девятихвост."
 	reward = CARGO_CRATE_VALUE * 8
 	wanted_types = list(/obj/item/melee/chainofcommand/tailwhip = TRUE)
 
diff --git a/code/modules/cargo/bounties/mining.dm b/code/modules/cargo/bounties/mining.dm
index cc6ca2d905d97..5a824440939d7 100644
--- a/code/modules/cargo/bounties/mining.dm
+++ b/code/modules/cargo/bounties/mining.dm
@@ -7,13 +7,13 @@
 
 /datum/bounty/item/mining/goliath_boat
 	name = "Goliath Hide Boat"
-	description = "Коммандор Менков хочет поучавствовать в ежегодной Лавалендской регате. Он просит ваши корабли для самой быстрой лодки, известной человеку."
+	description = "Командор Менков хочет поучавствовать в ежегодной Лавалендской регате. Он просит ваши корабли для самой быстрой лодки, известной человеку."
 	reward = CARGO_CRATE_VALUE * 20
 	wanted_types = list(/obj/vehicle/ridden/lavaboat = TRUE)
 
 /datum/bounty/item/mining/bone_oar
 	name = "Bone Oars"
-	description = "Коммандор Менков хочет поучавствовать в ежегодной Лавалендской регате. Для этого ему нужна пара вёсел."
+	description = "Командор Менков хочет поучавствовать в ежегодной Лавалендской регате. Для этого ему нужна пара вёсел."
 	reward = CARGO_CRATE_VALUE * 8
 	required_count = 2
 	wanted_types = list(/obj/item/oar = TRUE)
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index cf4a5dfc8759f..dd779c796ce8f 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -67,10 +67,19 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	var/atom/movable/screen/background/cam_background
 	var/tabIndex = 1
 	var/renderLighting = FALSE
+	var/static/list/pod_style_info
+	var/static/list/pod_style_lookup
 
 /datum/centcom_podlauncher/New(user) //user can either be a client or a mob
 	if (user) //Prevents runtimes on datums being made without clients
 		setup(user)
+	if (!isnull(pod_style_info))
+		return
+	pod_style_info = list()
+	pod_style_lookup = list()
+	for (var/datum/pod_style/style as anything in typesof(/datum/pod_style))
+		pod_style_info += list(list("id" = style::id, "title" = style::ui_name))
+		pod_style_lookup[style::id] = style
 
 /datum/centcom_podlauncher/proc/setup(user) //H can either be a client or a mob
 	if (istype(user,/client))
@@ -134,6 +143,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	var/list/data = list()
 	data["mapRef"] = map_name
 	data["defaultSoundVolume"] = initial(temp_pod.soundVolume) //default volume for pods
+	data["podStyles"] = pod_style_info
 	return data
 
 /datum/centcom_podlauncher/ui_data(mob/user) //Sends info about the pod to the UI.
@@ -152,7 +162,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	data["delays"] = temp_pod.delays
 	data["rev_delays"] = temp_pod.reverse_delays
 	data["custom_rev_delay"] = temp_pod.custom_rev_delay
-	data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	data["styleChoice"] = temp_pod.style::id //Style is a variable that keeps track of what the pod is supposed to look like.
 	data["effectShrapnel"] = temp_pod.effectShrapnel //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
 	data["shrapnelType"] = "[temp_pod.shrapnel_type]" //Path2String
 	data["shrapnelMagnitude"] = temp_pod.shrapnel_magnitude
@@ -331,12 +341,12 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 		if("effectName") //Give the supplypod a custom name. Supplypods automatically get their name based on their style (see supplypod/setStyle() proc), so doing this overrides that.
 			if (temp_pod.adminNamed) //If we're already adminNamed, set the name of the pod back to default
 				temp_pod.adminNamed = FALSE
-				temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on it's current style (see supplypod/setStyle() proc)
+				temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on its current style (see supplypod/setStyle() proc)
 				return
-			var/nameInput= tgui_input_text(usr, "Enter a custom name", "Custom name", GLOB.podstyles[temp_pod.style][POD_NAME], MAX_NAME_LEN) //Gather input for name and desc
+			var/nameInput= tgui_input_text(usr, "Enter a custom name", "Custom name", temp_pod.style::name, MAX_NAME_LEN) //Gather input for name and desc
 			if (isnull(nameInput))
 				return
-			var/descInput = tgui_input_text(usr, "Enter a custom desc", "Custom description", GLOB.podstyles[temp_pod.style][POD_DESC])  //The GLOB.podstyles is used to get the name, desc, or icon state based on the pod's style
+			var/descInput = tgui_input_text(usr, "Enter a custom desc", "Custom description", temp_pod.style::desc)
 			if (isnull(descInput))
 				return
 			temp_pod.name = nameInput
@@ -504,7 +514,6 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 			temp_pod.soundVolume = soundInput
 			. = TRUE
 		////////////////////////////STYLE CHANGES//////////////////
-		//Style is a value that is used to keep track of what the pod is supposed to look like. It can be used with the GLOB.podstyles list (in cargo.dm defines)
 		//as a way to get the proper icon state, name, and description of the pod.
 		if("tabSwitch")
 			tabIndex = params["tabIndex"]
@@ -519,7 +528,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 			. = TRUE
 		if("setStyle")
 			var/chosenStyle = params["style"]
-			temp_pod.setStyle(chosenStyle+1)
+			temp_pod.setStyle(pod_style_lookup[chosenStyle])
 			. = TRUE
 		if("refresh") //Refresh the Pod bay. User should press this if they spawn something new in the centcom bay. Automatically called whenever the user launches a pod
 			refreshBay()
@@ -654,11 +663,6 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	preLaunch() //Fill acceptable turfs from orderedArea, then fill launchList from acceptableTurfs (see proc for more info)
 	refreshView()
 
-/area/centcom/central_command_areas/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area
-	. = ..()
-	var/obj/imgbound = locate() in locate(200,SUPPLYPOD_X_OFFSET*-4.5, 1)
-	call(GLOB.podlauncher, "RegisterSignal")(imgbound, "ct[GLOB.podstyles[14][9]]", "[GLOB.podstyles[14][10]]dlauncher")
-
 /datum/centcom_podlauncher/proc/createOrderedArea(area/area_to_order) //This assumes the area passed in is a continuous square
 	if (isnull(area_to_order)) //If theres no supplypod bay mapped into centcom, throw an error
 		to_chat(holder.mob, "No /area/centcom/central_command_areas/supplypod/loading/one (or /two or /three or /four) in the world! You can make one yourself (then refresh) for now, but yell at a mapper to fix this, today!")
@@ -765,7 +769,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 				else
 					var/atom/movable/movable_to_launch = thing_to_launch
 					movable_to_launch.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
-	new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
+	new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to its location
 	if (launchClone)
 		launchCounter++ //We only need to increment launchCounter if we are cloning objects.
 		//If we aren't cloning objects, taking and removing the first item each time from the acceptableTurfs list will inherently iterate through the list in order
@@ -820,7 +824,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	temp_pod.delays = dataToLoad["delays"]
 	temp_pod.reverse_delays = dataToLoad["rev_delays"]
 	temp_pod.custom_rev_delay = dataToLoad["custom_rev_delay"]
-	temp_pod.setStyle(dataToLoad["styleChoice"])  //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	temp_pod.setStyle(dataToLoad["styleChoice"])  //Style is a variable that keeps track of what the pod is supposed to look like.
 	temp_pod.effectShrapnel = dataToLoad["effectShrapnel"] //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
 	temp_pod.shrapnel_type = text2path(dataToLoad["shrapnelType"])
 	temp_pod.shrapnel_magnitude = dataToLoad["shrapnelMagnitude"]
@@ -852,14 +856,6 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
 	refreshView()
 
 GLOBAL_DATUM_INIT(podlauncher, /datum/centcom_podlauncher, new)
-//Proc for admins to enable others to use podlauncher after roundend
-/datum/centcom_podlauncher/proc/give_podlauncher(mob/living/user, override)
-	if (SSticker.current_state < GAME_STATE_FINISHED)
-		return
-	if (!istype(user))
-		user = override
-	if (user)
-		setup(user)//setup the datum
 
 //Set the dropoff location and indicator to either a specific turf or somewhere in an area
 /datum/centcom_podlauncher/proc/setDropoff(target)
diff --git a/code/modules/cargo/exports/fish.dm b/code/modules/cargo/exports/fish.dm
new file mode 100644
index 0000000000000..9c34fd3afcaeb
--- /dev/null
+++ b/code/modules/cargo/exports/fish.dm
@@ -0,0 +1,9 @@
+/datum/export/fish
+	cost = 30
+	unit_name = "fish"
+	export_types = list(/obj/item/fish)
+
+/datum/export/fish/get_cost(obj/item/fish/fish, apply_elastic)
+	var/elastic_cost = ..()
+	var/elastic_percent = elastic_cost / init_cost
+	return fish.get_export_price(elastic_cost, elastic_percent)
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index e09c3e2bc958d..4751b45aae89b 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -311,7 +311,7 @@
 
 /datum/supply_pack/goody/climbing_hook
 	name = "Climbing Hook Single-Pack"
-	desc = "A less cheap imported climbing hook. Absolutely no use outside of planetary stations."
+	desc = "A less cheap imported climbing hook. Absolutely no use outside of multi-floor stations."
 	cost = PAYCHECK_CREW * 5
 	contains = list(/obj/item/climbing_hook)
 
diff --git a/code/modules/cargo/markets/_market.dm b/code/modules/cargo/markets/_market.dm
index 7bef341842f1a..4696d3007a7ae 100644
--- a/code/modules/cargo/markets/_market.dm
+++ b/code/modules/cargo/markets/_market.dm
@@ -6,14 +6,14 @@
 	var/list/shipping
 
 	// Automatic vars, do not touch these.
-	/// Items available from this market, populated by SSblackmarket on initialization. Automatically assigned, so don't manually adjust.
+	/// Items available from this market, populated by SSmarket on initialization. Automatically assigned, so don't manually adjust.
 	var/list/available_items = list()
 	/// Item categories available from this market, only items which are in these categories can be gotten from this market. Automatically assigned, so don't manually adjust.
 	var/list/categories = list()
 	/// Are the items from this market legal or illegal? If illegal, apply a contrband trait to the bought object.
 	var/legal_status = TRUE
 
-/// Adds item to the available items and add it's category if it is not in categories yet.
+/// Adds item to the available items and add its category if it is not in categories yet.
 /datum/market/proc/add_item(datum/market_item/item)
 	if(ispath(item, /datum/market_item))
 		item = new item()
@@ -73,6 +73,20 @@
 
 	return FALSE
 
+/**
+ * A proc that restocks only the EXISTING items of this market.
+ * If you want to selectively restock markets, call SSmarket.restock(market_or_list_of_markets) instead.
+ */
+/datum/market/proc/restock(list/existing_items)
+	for(var/category in available_items)
+		var/category_list = available_items[category]
+		for(var/identifier in category_list)
+			var/datum/market_item/item = category_list[identifier]
+			existing_items |= item.type
+			if(!item.restockable || item.stock >= item.stock_max || !prob(item.availability_prob))
+				continue
+			item.stock += rand(1, item.stock_max - item.stock)
+
 /datum/market/blackmarket
 	name = "Black Market"
 	shipping = list(
diff --git a/code/modules/cargo/markets/market_item.dm b/code/modules/cargo/markets/market_item.dm
index 5e3ce4efb6c07..d7a4dd4c0eef3 100644
--- a/code/modules/cargo/markets/market_item.dm
+++ b/code/modules/cargo/markets/market_item.dm
@@ -5,7 +5,7 @@
 	var/desc
 	/// The category this item belongs to, should be already declared in the market that this item is accessible in.
 	var/category
-	/// "/datum/market"s that this item should be in, used by SSblackmarket on init.
+	/// "/datum/market"s that this item should be in, used by SSmarket on init.
 	var/list/markets = list(/datum/market/blackmarket)
 
 	/// Price for the item, if not set creates a price according to the *_min and *_max vars.
@@ -27,7 +27,7 @@
 	var/stock_min = 1
 	/// Maximum amount that there should be of this item in the market if generated randomly.
 	var/stock_max = 0
-	/// Probability for this item to be available. Used by SSblackmarket on init.
+	/// Probability for this item to be available. Used by SSmarket on init.
 	var/availability_prob
 
 	///The identifier for the market item, generated on runtime and used to access them in the market categories.
@@ -36,6 +36,9 @@
 	///If set, these will override the shipment methods set by the market
 	var/list/shipping_override
 
+	/// Can this item be restocked
+	var/restockable = TRUE
+
 /datum/market_item/New()
 	if(isnull(price))
 		price = rand(price_min, price_max)
@@ -82,7 +85,7 @@
 	CRASH("Invalid item type for market item [item || "null"]")
 
 /**
- * Buys the item and makes SSblackmarket handle it.
+ * Buys the item and makes SSmarket handle it.
  *
  * @param uplink The uplink that is buying the item.
  * @param buyer The mob that is buying the item.
@@ -102,8 +105,8 @@
 	// Alright, the item has been purchased.
 	var/datum/market_purchase/purchase = new(src, uplink, shipping_method, legal_status)
 
-	// SSblackmarket takes care of the shipping.
-	if(SSblackmarket.queue_item(purchase))
+	// SSmarket takes care of the shipping.
+	if(SSmarket.queue_item(purchase))
 		stock--
 		buyer.log_message("has succesfully purchased [name] using [shipping_method] for shipping.", LOG_ECON)
 		return TRUE
@@ -139,7 +142,7 @@
 /datum/market_purchase/Destroy()
 	entry = null
 	uplink = null
-	SSblackmarket.queued_purchases -= src
+	SSmarket.queued_purchases -= src
 	return ..()
 
 /datum/market_purchase/proc/on_instance_del(datum/source)
diff --git a/code/modules/cargo/markets/market_items/clothing.dm b/code/modules/cargo/markets/market_items/clothing.dm
index 82bda848eb8e9..ee0ae6e0a3997 100644
--- a/code/modules/cargo/markets/market_items/clothing.dm
+++ b/code/modules/cargo/markets/market_items/clothing.dm
@@ -4,7 +4,7 @@
 
 /datum/market_item/clothing/ninja_mask
 	name = "Space Ninja Mask"
-	desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on it's own."
+	desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on its own."
 	item = /obj/item/clothing/mask/gas/ninja
 
 	price_min = CARGO_CRATE_VALUE
@@ -32,13 +32,23 @@
 	stock_max = 4
 	availability_prob = 50
 
+/datum/market_item/tool/medsechud
+	name = "MedSec HUD"
+	desc = "A mostly defunct combination of security and health scanner HUDs. They don't produce these around anymore."
+	item = /obj/item/clothing/glasses/hud/medsechud
+
+	price_min = CARGO_CRATE_VALUE * 2
+	price_max = CARGO_CRATE_VALUE * 3.5
+	stock_max = 3
+	availability_prob = 50
+
 /datum/market_item/clothing/full_spacesuit_set
 	name = "\improper Nanotrasen Branded Spacesuit Box"
 	desc = "A few boxes of \"Old Style\" space suits fell off the back of a space truck."
 	item = /obj/item/storage/box
 
-	price_min = CARGO_CRATE_VALUE * 7.5
-	price_max = CARGO_CRATE_VALUE * 20
+	price_min = CARGO_CRATE_VALUE * 1.875
+	price_max = CARGO_CRATE_VALUE * 4
 	stock_max = 3
 	availability_prob = 30
 
@@ -66,7 +76,7 @@
 	item = /obj/item/clothing/shoes/bhop/rocket
 
 	price_min = CARGO_CRATE_VALUE * 5
-	price_max = CARGO_CRATE_VALUE * 15
+	price_max = CARGO_CRATE_VALUE * 10
 	stock_max = 1
 	availability_prob = 40
 
diff --git a/code/modules/cargo/markets/market_items/consumables.dm b/code/modules/cargo/markets/market_items/consumables.dm
index f002ff994249d..b7eed89a1951f 100644
--- a/code/modules/cargo/markets/market_items/consumables.dm
+++ b/code/modules/cargo/markets/market_items/consumables.dm
@@ -19,10 +19,20 @@
 
 	stock_min = 2
 	stock_max = 5
-	price_min = CARGO_CRATE_VALUE * 1.625
-	price_max = CARGO_CRATE_VALUE * 2
+	price_min = CARGO_CRATE_VALUE * 1.375
+	price_max = CARGO_CRATE_VALUE * 1.825
 	availability_prob = 80
 
+/datum/market_item/consumable/donk_pocket_box/spawn_item(loc)
+	var/static/list/choices
+	if(isnull(choices))
+		choices = list()
+		for(var/boxtype as anything in typesof(/obj/item/storage/box/donkpockets))
+			choices[boxtype] = 3
+		choices[/obj/item/storage/box/donkpockets/donkpocketgondola] = 1
+	item = pick_weight(choices)
+	return ..()
+
 /datum/market_item/consumable/suspicious_pills
 	name = "Bottle of Suspicious Pills"
 	desc = "A random cocktail of luxury drugs that are sure to put a smile on your face!"
@@ -30,17 +40,18 @@
 
 	stock_min = 2
 	stock_max = 3
-	price_min = CARGO_CRATE_VALUE * 2
-	price_max = CARGO_CRATE_VALUE * 3.5
+	price_min = CARGO_CRATE_VALUE * 0.625
+	price_max = CARGO_CRATE_VALUE * 1.25
 	availability_prob = 50
 
 /datum/market_item/consumable/suspicious_pills/spawn_item(loc)
-	var/pillbottle = pick(list(/obj/item/storage/pill_bottle/zoom,
-				/obj/item/storage/pill_bottle/happy,
-				/obj/item/storage/pill_bottle/lsd,
-				/obj/item/storage/pill_bottle/aranesp,
-				/obj/item/storage/pill_bottle/stimulant))
-	item = pillbottle
+	item = pick(list(/obj/item/storage/pill_bottle/zoom,
+		/obj/item/storage/pill_bottle/happy,
+		/obj/item/storage/pill_bottle/lsd,
+		/obj/item/storage/pill_bottle/aranesp,
+		/obj/item/storage/pill_bottle/stimulant,
+		/obj/item/storage/pill_bottle/maintenance_pill,
+	))
 	return ..()
 
 /datum/market_item/consumable/floor_pill
diff --git a/code/modules/cargo/markets/market_items/hostages.dm b/code/modules/cargo/markets/market_items/hostages.dm
index ed5b1f10a7fcf..702cea907bdeb 100644
--- a/code/modules/cargo/markets/market_items/hostages.dm
+++ b/code/modules/cargo/markets/market_items/hostages.dm
@@ -5,6 +5,7 @@
 	stock = 1
 	availability_prob = 100
 	shipping_override = list(SHIPPING_METHOD_LTSRBT = 0, SHIPPING_METHOD_SUPPLYPOD = 350)
+	restockable = FALSE
 	/// temporary reference to the 4 in 7 chances of signaler and electropack.
 	var/obj/item/assembly/signaler/signaler
 
diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm
index 435396c15f251..b0ea89485801c 100644
--- a/code/modules/cargo/markets/market_items/misc.dm
+++ b/code/modules/cargo/markets/market_items/misc.dm
@@ -2,7 +2,7 @@
 	category = "Miscellaneous"
 	abstract_path = /datum/market_item/misc
 
-/datum/market_item/misc/Clear_PDA
+/datum/market_item/misc/clear_pda
 	name = "Clear PDA"
 	desc = "Show off your style with this limited edition clear PDA!."
 	item = /obj/item/modular_computer/pda/clear
@@ -12,7 +12,7 @@
 	stock_max = 2
 	availability_prob = 50
 
-/datum/market_item/misc/jade_Lantern
+/datum/market_item/misc/jade_lantern
 	name = "Jade Lantern"
 	desc = "Found in a box labeled 'Danger: Radioactive'. Probably safe."
 	item = /obj/item/flashlight/lantern/jade
@@ -90,7 +90,7 @@
 
 /datum/market_item/misc/smugglers_satchel
 	name = "Smuggler's Satchel"
-	desc = "This easily hidden satchel can become a versatile tool to anybody with the desire to keep certain items out of sight and out of mind."
+	desc = "This easily hidden satchel can become a versatile tool to anybody with the desire to keep certain items out of sight and out of mind. Its contents cannot be detected by contraband scanners."
 	item = /obj/item/storage/backpack/satchel/flat/empty
 
 	price_min = CARGO_CRATE_VALUE * 3.75
diff --git a/code/modules/cargo/markets/market_items/stolen_goods.dm b/code/modules/cargo/markets/market_items/stolen_goods.dm
index 02a72f05d26d1..cb1932673e0e3 100644
--- a/code/modules/cargo/markets/market_items/stolen_goods.dm
+++ b/code/modules/cargo/markets/market_items/stolen_goods.dm
@@ -4,6 +4,7 @@
 	abstract_path = /datum/market_item/stolen_good
 	stock = 1
 	availability_prob = 100
+	restockable = FALSE
 
 /datum/market_item/stolen_good/New(atom/movable/thing, thing_price)
 	..()
diff --git a/code/modules/cargo/markets/market_items/tools.dm b/code/modules/cargo/markets/market_items/tools.dm
index 9576810b3a3c9..0c9969756d30f 100644
--- a/code/modules/cargo/markets/market_items/tools.dm
+++ b/code/modules/cargo/markets/market_items/tools.dm
@@ -11,7 +11,7 @@
 	stock_min = 2
 	stock_max = 4
 	price_min = CARGO_CRATE_VALUE * 2.5
-	price_max = CARGO_CRATE_VALUE * 3.75
+	price_max = CARGO_CRATE_VALUE * 3.25
 	availability_prob = 100
 
 /datum/market_item/tool/caravan_wrench
@@ -60,8 +60,8 @@
 	item = /obj/item/binoculars
 	stock = 1
 
-	price_min = CARGO_CRATE_VALUE * 2
-	price_max = CARGO_CRATE_VALUE * 4.8
+	price_min = CARGO_CRATE_VALUE * 1.75
+	price_max = CARGO_CRATE_VALUE * 4
 	availability_prob = 30
 
 /datum/market_item/tool/riot_shield
@@ -76,23 +76,13 @@
 
 /datum/market_item/tool/thermite_bottle
 	name = "Thermite Bottle"
-	desc = "30u of Thermite to assist in creating a quick access point or get away!"
+	desc = "50u of Thermite to assist in creating a quick access point or get away!"
 	item = /obj/item/reagent_containers/cup/bottle/thermite
 
-	price_min = CARGO_CRATE_VALUE * 2.5
-	price_max = CARGO_CRATE_VALUE * 7.5
-	stock_max = 3
-	availability_prob = 30
-
-/datum/market_item/tool/science_goggles
-	name = "Science Goggles"
-	desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format."
-	item = /obj/item/clothing/glasses/science
-
 	price_min = CARGO_CRATE_VALUE * 0.75
 	price_max = CARGO_CRATE_VALUE
 	stock_max = 3
-	availability_prob = 50
+	availability_prob = 30
 
 /**
  * # Fake N-spect scanner black market entry
diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm
index 3323e16916234..4f20cf865bc9b 100644
--- a/code/modules/cargo/markets/market_items/weapons.dm
+++ b/code/modules/cargo/markets/market_items/weapons.dm
@@ -13,16 +13,15 @@
 	availability_prob = 40
 
 /datum/market_item/weapon/shotgun_dart
-	name = "Shotgun Dart"
+	name = "Box of XL Shotgun Darts"
 	desc = "These handy darts can be filled up with any chemical and be shot with a shotgun! \
 	Prank your friends by shooting them with laughter! \
 	Not recommended for comercial use."
-	item = /obj/item/ammo_casing/shotgun/dart
+	item = /obj/item/storage/box/large_dart
 
-	price_min = CARGO_CRATE_VALUE * 0.05
-	price_max = CARGO_CRATE_VALUE * 0.25
-	stock_min = 10
-	stock_max = 60
+	price_min = CARGO_CRATE_VALUE * 1.375
+	price_max = CARGO_CRATE_VALUE * 2.875
+	stock_max = 4
 	availability_prob = 40
 
 /datum/market_item/weapon/bone_spear
diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm
index 7c5b509a9421d..799395f30d125 100644
--- a/code/modules/cargo/markets/market_telepad.dm
+++ b/code/modules/cargo/markets/market_telepad.dm
@@ -1,3 +1,5 @@
+#define DEFAULT_RESTOCK_COST 675
+
 /obj/item/circuitboard/machine/ltsrbt
 	name = "LTSRBT (Machine Board)"
 	icon_state = "bluespacearray"
@@ -13,7 +15,8 @@
 	name = "Long-To-Short-Range-Bluespace-Transceiver"
 	desc = "The LTSRBT is a compact teleportation machine for receiving and sending items outside the station and inside the station.\nUsing teleportation frequencies stolen from NT it is near undetectable.\nEssential for any illegal market operations on NT stations.\n"
 	icon = 'icons/obj/machines/telecomms.dmi'
-	icon_state = "exonet_node"
+	icon_state = "exonet_node_idle"
+	base_icon_state = "exonet_node"
 	circuit = /obj/item/circuitboard/machine/ltsrbt
 	density = TRUE
 
@@ -35,18 +38,42 @@
 	var/datum/market_purchase/transmitting
 	/// Queue for purchases that the machine should receive and send.
 	var/list/datum/market_purchase/queue = list()
+	/**
+	 * Attacking the machinery with enough credits will restock the markets, allowing for more/better items.
+	 * The cost doubles each time this is done.
+	 */
+	var/static/restock_cost = DEFAULT_RESTOCK_COST
 
 /obj/machinery/ltsrbt/Initialize(mapload)
 	. = ..()
-	SSblackmarket.telepads += src
+	register_context()
+	SSmarket.telepads += src
 
 /obj/machinery/ltsrbt/Destroy()
-	SSblackmarket.telepads -= src
+	SSmarket.telepads -= src
 	// Bye bye orders.
-	if(length(SSblackmarket.telepads))
+	if(length(SSmarket.telepads))
 		for(var/datum/market_purchase/P in queue)
-			SSblackmarket.queue_item(P)
+			SSmarket.queue_item(P)
+	. = ..()
+
+/obj/machinery/ltsrbt/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	if(held_item && held_item.get_item_credit_value())
+		context[SCREENTIP_CONTEXT_LMB] = "Restock"
+		return CONTEXTUAL_SCREENTIP_SET
+	return NONE
+
+/obj/machinery/ltsrbt/examine(mob/user)
 	. = ..()
+	if(machine_stat & NOPOWER)
+		. += span_info("A display reads: \"Current market restock price: [EXAMINE_HINT("[restock_cost] cr")]\".")
+
+/obj/machinery/ltsrbt/update_icon_state()
+	. = ..()
+	if(machine_stat & NOPOWER)
+		icon_state = "[base_icon_state]_off"
+	else
+		icon_state = "[base_icon_state][(receiving || length(queue)) ? "" : "_idle"]"
 
 /obj/machinery/ltsrbt/RefreshParts()
 	. = ..()
@@ -67,6 +94,7 @@
 /obj/machinery/ltsrbt/proc/add_to_queue(datum/market_purchase/purchase)
 	if(!recharge_cooldown && !receiving && !transmitting)
 		receiving = purchase
+		update_appearance(UPDATE_ICON_STATE)
 	else
 		queue += purchase
 
@@ -80,6 +108,8 @@
 	if(transmitting == purchase)
 		transmitting = null
 
+	update_appearance(UPDATE_ICON_STATE)
+
 /obj/machinery/ltsrbt/process(seconds_per_tick)
 	if(machine_stat & NOPOWER)
 		return
@@ -113,3 +143,32 @@
 
 	if(length(queue))
 		receiving = pick_n_take(queue)
+
+/obj/machinery/ltsrbt/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+	var/creds_value = tool.get_item_credit_value()
+	if(!creds_value)
+		return NONE
+
+	. = ITEM_INTERACT_SUCCESS
+
+	if(machine_stat & NOPOWER)
+		return
+
+	if(creds_value < restock_cost)
+		say("Insufficient credits!")
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+		return
+
+	if(istype(tool, /obj/item/holochip))
+		var/obj/item/holochip/chip = tool
+		chip.spend(restock_cost)
+	else
+		qdel(tool)
+		if(creds_value != restock_cost)
+			var/obj/item/holochip/change = new(creds_value - restock_cost)
+			user.put_in_hands(change)
+
+	SSmarket.restock()
+	restock_cost *= 2
+
+#undef DEFAULT_RESTOCK_COST
diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm
index d13f59937b66c..a324a2f0409be 100644
--- a/code/modules/cargo/markets/market_uplink.dm
+++ b/code/modules/cargo/markets/market_uplink.dm
@@ -20,7 +20,7 @@
 
 /obj/item/market_uplink/Initialize(mapload)
 	. = ..()
-	// We don't want to go through this at mapload because the SSblackmarket isn't initialized yet.
+	// We don't want to go through this at mapload because the SSmarket isn't initialized yet.
 	if(mapload)
 		return
 
@@ -30,7 +30,7 @@
 /obj/item/market_uplink/proc/update_viewing_category()
 	if(accessible_markets.len)
 		viewing_market = accessible_markets[1]
-		var/list/categories = SSblackmarket.markets[viewing_market].categories
+		var/list/categories = SSmarket.markets[viewing_market].categories
 		if(categories?.len)
 			viewing_category = categories[1]
 
@@ -45,7 +45,7 @@
 
 /obj/item/market_uplink/ui_data(mob/user)
 	var/list/data = list()
-	var/datum/market/market = viewing_market ? SSblackmarket.markets[viewing_market] : null
+	var/datum/market/market = viewing_market ? SSmarket.markets[viewing_market] : null
 	var/obj/item/card/id/id_card
 	if(isliving(user))
 		var/mob/living/livin = user
@@ -86,11 +86,11 @@
 
 /obj/item/market_uplink/ui_static_data(mob/user)
 	var/list/data = list()
-	data["delivery_method_description"] = SSblackmarket.shipping_method_descriptions
-	data["ltsrbt_built"] = SSblackmarket.telepads.len
+	data["delivery_method_description"] = SSmarket.shipping_method_descriptions
+	data["ltsrbt_built"] = SSmarket.telepads.len
 	data["markets"] = list()
 	for(var/M in accessible_markets)
-		var/datum/market/BM = SSblackmarket.markets[M]
+		var/datum/market/BM = SSmarket.markets[M]
 		data["markets"] += list(list(
 			"id" = M,
 			"name" = BM.name
@@ -107,7 +107,7 @@
 				return
 			if(isnull(viewing_market))
 				return
-			if(!(params["category"] in SSblackmarket.markets[viewing_market].categories))
+			if(!(params["category"] in SSmarket.markets[viewing_market].categories))
 				return
 			viewing_category = params["category"]
 			. = TRUE
@@ -120,7 +120,7 @@
 
 			viewing_market = market
 
-			var/list/categories = SSblackmarket.markets[viewing_market].categories
+			var/list/categories = SSmarket.markets[viewing_market].categories
 			if(categories?.len)
 				viewing_category = categories[1]
 			else
@@ -142,7 +142,7 @@
 			if(isnull(selected_item))
 				buying = FALSE
 				return
-			var/datum/market/market = SSblackmarket.markets[viewing_market]
+			var/datum/market/market = SSmarket.markets[viewing_market]
 			market.purchase(selected_item, viewing_category, params["method"], src, usr)
 
 			buying = FALSE
diff --git a/code/modules/cargo/materials_market.dm b/code/modules/cargo/materials_market.dm
index 947197d16f298..797ebf5411d6f 100644
--- a/code/modules/cargo/materials_market.dm
+++ b/code/modules/cargo/materials_market.dm
@@ -232,7 +232,7 @@
 			var/material_str = params["material"]
 			var/quantity = text2num(params["quantity"])
 
-			//find material from it's name
+			//find material from its name
 			var/datum/material/material_bought
 			var/obj/item/stack/sheet/sheet_to_buy
 			for(var/datum/material/mat as anything in SSstock_market.materials_prices)
@@ -346,7 +346,7 @@
 	var/datum/material/export_mat
 	/// Quantity of export material
 	var/quantity = 0
-	/// Is this stock block currently updating it's value with the market (aka fluid)?
+	/// Is this stock block currently updating its value with the market (aka fluid)?
 	var/fluid = FALSE
 
 /obj/item/stock_block/Initialize(mapload)
@@ -358,9 +358,9 @@
 	. = ..()
 	. += span_notice("\The [src] is worth [export_value] cr, from selling [quantity] sheets of [initial(export_mat?.name)].")
 	if(fluid)
-		. += span_warning("\The [src] is currently liquid! It's value is based on the market price.")
+		. += span_warning("\The [src] is currently liquid! Its value is based on the market price.")
 	else
-		. += span_notice("\The [src]'s value is still [span_boldnotice("locked in")]. [span_boldnotice("Sell it")] before it's value becomes liquid!")
+		. += span_notice("\The [src]'s value is still [span_boldnotice("locked in")]. [span_boldnotice("Sell it")] before its value becomes liquid!")
 
 /obj/item/stock_block/proc/value_warning()
 	visible_message(span_warning("\The [src] is starting to become liquid!"))
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index f270b1da11f39..98fc4d650212c 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -318,3 +318,20 @@
 	)
 	crate_name = "floortile camouflauge crate"
 	crate_type = /obj/structure/closet/crate/secure/weapon
+
+/**
+ * The Long To Short Range Bluespace Teleporter, used to deliver (black) market purchases more effiiently
+ * It can also be used to restock it, if you hit it with enough credits.
+ */
+/datum/supply_pack/imports/blackmarket_telepad
+	name = "Black Market LTSRBT"
+	desc = "Need a faster and better way of transporting your illegal goods from and to the \
+		station? Fear not, the Long-To-Short-Range-Bluespace-Transceiver (LTSRBT for short) \
+		is here to help. Contains a LTSRBT circuit, two bluespace crystals, and one ansible."
+	cost = CARGO_CRATE_VALUE * 10
+	contraband = TRUE
+	contains = list(
+		/obj/item/circuitboard/machine/ltsrbt,
+		/obj/item/stack/ore/bluespace_crystal/artificial = 2,
+		/obj/item/stock_parts/subspace/ansible,
+	)
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index c30a698c06f87..0c626223916af 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -187,6 +187,6 @@
 	name = "Strong-Arm Implant Set"
 	desc = "A crate containing two implants, which can be surgically implanted to empower the strength of human arms. Warranty void if exposed to electromagnetic pulses."
 	cost = CARGO_CRATE_VALUE * 6
-	contains = list(/obj/item/organ/internal/cyberimp/arm/muscle = 2)
+	contains = list(/obj/item/organ/internal/cyberimp/arm/strongarm = 2)
 	crate_name = "Strong-Arm implant crate"
 	discountable = SUPPLY_PACK_RARE_DISCOUNTABLE
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index 228d0d3e2fa46..bf6afe107d6c7 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -195,7 +195,7 @@
 /datum/supply_pack/service/greyidbox
 	name = "Grey ID Card Multipack Crate"
 	desc = "A convenient crate containing a box of seven cheap ID cards in a handy wallet-sized form factor. \
-		Cards come in every colour you can imagne, as long as it's grey."
+		Cards come in every colour you can imagine, as long as it's grey."
 	cost = CARGO_CRATE_VALUE * 3
 	contains = list(/obj/item/storage/box/ids)
 	crate_name = "basic id card crate"
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 417e5519ba00f..86ee482a9109d 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -36,9 +36,9 @@
 	var/effectQuiet = FALSE //The female sniper. If true, the pod makes no noise (including related explosions, opening sounds, etc)
 	var/effectMissile = FALSE //If true, the pod deletes the second it lands. If you give it an explosion, it will act like a missile exploding as it hits the ground
 	var/effectCircle = FALSE //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
-	var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
+	var/datum/pod_style/style = /datum/pod_style //Style is a variable that keeps track of what the pod is supposed to look like. Only stores a path, type is set for ease of var access
 	var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
-	var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off it's newly-acquired cargo to
+	var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off its newly-acquired cargo to
 	var/fallingSoundLength = 11
 	var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
 	var/landingSound //Admin sound to play when the pod lands
@@ -61,7 +61,7 @@
 	var/list/turfs_in_cargo = list()
 
 /obj/structure/closet/supplypod/bluespacepod
-	style = STYLE_BLUESPACE
+	style = /datum/pod_style/advanced
 	bluespace = TRUE
 	explosionSize = list(0,0,1,2)
 
@@ -83,7 +83,7 @@
 	name = "Syndicate Extraction Pod"
 	desc = "A specalised, blood-red styled pod for extracting high-value targets out of active mission areas. <b>Targets must be manually stuffed inside the pod for proper delivery.</b>"
 	specialised = TRUE
-	style = STYLE_SYNDICATE
+	style = /datum/pod_style/syndicate
 	bluespace = TRUE
 	explosionSize = list(0,0,1,2)
 	delays = list(POD_TRANSIT = 25, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
@@ -93,7 +93,7 @@
 	reverse_option_list = list("Mobs"=TRUE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE, "Mecha"=FALSE)
 
 /obj/structure/closet/supplypod/centcompod
-	style = STYLE_CENTCOM
+	style = /datum/pod_style/centcom
 	bluespace = TRUE
 	explosionSize = list(0,0,0,0)
 	delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30)
@@ -121,13 +121,13 @@
 	desc = "An intimidating supply pod, covered in the blood-red markings"
 	bluespace = TRUE
 	explosionSize = list(0,0,0,0)
-	style = STYLE_SYNDICATE
+	style = /datum/pod_style/syndicate
 	specialised = TRUE
 
 /obj/structure/closet/supplypod/deadmatch_missile
 	name = "cruise missile"
 	desc = "A big ass missile, likely launched from some far-off deep space missile silo."
-	style = STYLE_RED_MISSILE
+	style = /datum/pod_style/missile/syndicate
 	explosionSize = list(0,1,2,2)
 	effectShrapnel = TRUE
 	specialised = TRUE
@@ -153,33 +153,32 @@
 		style = customStyle
 	setStyle(style) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly
 
-/obj/structure/closet/supplypod/proc/setStyle(chosenStyle) //Used to give the sprite an icon state, name, and description.
-	style = chosenStyle
-	var/base = GLOB.podstyles[chosenStyle][POD_BASE] //GLOB.podstyles is a 2D array we treat as a dictionary. The style represents the verticle index, with the icon state, name, and desc being stored in the horizontal indexes of the 2D array.
-	icon_state = base
-	decal = GLOB.podstyles[chosenStyle][POD_DECAL]
-	rubble_type = GLOB.podstyles[chosenStyle][POD_RUBBLE_TYPE]
+/obj/structure/closet/supplypod/proc/setStyle(datum/pod_style/chosen_style) //Used to give the sprite an icon state, name, and description.
+	style = chosen_style
+	icon_state = chosen_style::icon_state
+	decal = chosen_style::decal_icon
+	rubble_type = chosen_style::rubble_type
 	if (!adminNamed && !specialised) //We dont want to name it ourselves if it has been specifically named by an admin using the centcom_podlauncher datum
-		name = GLOB.podstyles[chosenStyle][POD_NAME]
-		desc = GLOB.podstyles[chosenStyle][POD_DESC]
-	if (GLOB.podstyles[chosenStyle][POD_DOOR])
-		door = "[base]_door"
+		name = chosen_style::name
+		desc = chosen_style::desc
+	if (chosen_style::has_door)
+		door = "[icon_state]_door"
 	else
 		door = FALSE
 	update_appearance()
 
 /obj/structure/closet/supplypod/proc/SetReverseIcon()
 	fin_mask = "bottomfin"
-	if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
-		icon_state = GLOB.podstyles[style][POD_BASE] + "_reverse"
+	if (style::shape == POD_SHAPE_NORMAL)
+		icon_state = style::icon_state + "_reverse"
 	pixel_x = initial(pixel_x)
 	transform = matrix()
 	update_appearance()
 
 /obj/structure/closet/supplypod/proc/backToNonReverseIcon()
 	fin_mask = initial(fin_mask)
-	if (GLOB.podstyles[style][POD_SHAPE] == POD_SHAPE_NORML)
-		icon_state = GLOB.podstyles[style][POD_BASE]
+	if (style::shape == POD_SHAPE_NORMAL)
+		icon_state = style::icon_state
 	pixel_x = initial(pixel_x)
 	transform = matrix()
 	update_appearance()
@@ -189,13 +188,13 @@
 
 /obj/structure/closet/supplypod/update_overlays()
 	. = ..()
-	if(style == STYLE_INVISIBLE)
+	if(ispath(style, /datum/pod_style/invisible))
 		return
 
 	if(rubble)
 		. += rubble.getForeground(src)
 
-	if(style == STYLE_SEETHROUGH)
+	if(ispath(style, /datum/pod_style/seethrough))
 		for(var/atom/A in contents)
 			var/mutable_appearance/itemIcon = new(A)
 			itemIcon.transform = matrix().Translate(-1 * SUPPLYPOD_X_OFFSET, 0)
@@ -227,7 +226,7 @@
 		if(decal)
 			. += decal
 		return
-	else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
+	else if (style::shape != POD_SHAPE_NORMAL) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
 		. += door
 	else
 		var/icon/masked_door = new(icon, door) //The door we want to apply
@@ -280,7 +279,7 @@
 	reversing = FALSE //Now that we're done reversing, we set this to false (otherwise we would get stuck in an infinite loop of calling the close proc at the bottom of open_pod() )
 	bluespace = TRUE //Make it so that the pod doesn't stay in centcom forever
 	pod_flags &= ~FIRST_SOUNDS //Make it so we play sounds now
-	if (!effectQuiet && style != STYLE_SEETHROUGH)
+	if (!effectQuiet && !ispath(style, /datum/pod_style/seethrough))
 		audible_message(span_notice("The pod hisses, closing and launching itself away from the station."), span_notice("The ground vibrates, and you hear the sound of engines firing."))
 	stay_after_drop = FALSE
 	holder.pixel_z = initial(holder.pixel_z)
@@ -351,14 +350,14 @@
 		opened = TRUE //We set opened to TRUE to avoid spending time trying to open (due to being deleted) during the Destroy() proc
 		qdel(src)
 		return
-	if (style == STYLE_GONDOLA) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
+	if (ispath(style, /datum/pod_style/gondola)) //Checks if we are supposed to be a gondola pod. If so, create a gondolapod mob, and move this pod to nullspace. I'd like to give a shout out, to my man oranges
 		var/mob/living/basic/pet/gondola/gondolapod/benis = new(turf_underneath, src)
 		benis.contents |= contents //Move the contents of this supplypod into the gondolapod mob.
 		for (var/mob/living/mob_in_pod in benis.contents)
 			mob_in_pod.reset_perspective(null)
 		moveToNullspace()
 		addtimer(CALLBACK(src, PROC_REF(open_pod), benis), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplyprod while referencing the contents of the "holder", in this case the gondolapod mob
-	else if (style == STYLE_SEETHROUGH)
+	else if (ispath(style, /datum/pod_style/seethrough))
 		open_pod(src)
 	else
 		addtimer(CALLBACK(src, PROC_REF(open_pod), src), delays[POD_OPENING]) //After the opening delay passes, we use the open proc from this supplypod, while referencing this supplypod's contents
@@ -381,11 +380,11 @@
 	for (var/cargo in holder.contents)
 		var/atom/movable/movable_cargo = cargo
 		movable_cargo.forceMove(turf_underneath)
-	if (!effectQuiet && !openingSound && style != STYLE_SEETHROUGH && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
+	if (!effectQuiet && !openingSound && !ispath(style, /datum/pod_style/seethrough) && !(pod_flags & FIRST_SOUNDS)) //If we aren't being quiet, play the default pod open sound
 		playsound(get_turf(holder), open_sound, 15, TRUE, -3)
 	if (broken) //If the pod is opening because it's been destroyed, we end here
 		return
-	if (style == STYLE_SEETHROUGH)
+	if (ispath(style, /datum/pod_style/seethrough))
 		startExitSequence(src)
 	else
 		if (reversing)
@@ -400,7 +399,7 @@
 		close(holder)
 	else if (bluespace) //If we're a bluespace pod, then delete ourselves (along with our holder, if a separate holder exists)
 		deleteRubble()
-		if (!effectQuiet && style != STYLE_INVISIBLE && style != STYLE_SEETHROUGH)
+		if (!effectQuiet && !ispath(style, /datum/pod_style/invisible) && !ispath(style, /datum/pod_style/seethrough))
 			do_sparks(5, TRUE, holder) //Create some sparks right before closing
 		qdel(src) //Delete ourselves and the holder
 		if (holder != src)
@@ -537,10 +536,10 @@
 	update_appearance()
 
 /obj/structure/closet/supplypod/proc/addGlow()
-	if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML)
+	if (style::shape != POD_SHAPE_NORMAL)
 		return
 	glow_effect = new(src)
-	glow_effect.icon_state = "pod_glow_" + GLOB.podstyles[style][POD_GLOW]
+	glow_effect.icon_state = "pod_glow_" + style::glow_color
 	vis_contents += glow_effect
 	glow_effect.layer = GASFIRE_LAYER
 	SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src)
@@ -629,7 +628,7 @@
 	if (type == RUBBLE_THIN)
 		icon_state += "_thin"
 		foreground += "_thin"
-	if (pod.style == STYLE_BOX)
+	if (ispath(pod.style, /datum/pod_style/box))
 		verticle_offset = -2
 	else
 		verticle_offset = initial(verticle_offset)
@@ -651,7 +650,7 @@
 	transform = matrix() * 1.5
 	animate(src, transform = matrix()*0.01, time = pod.delays[POD_TRANSIT]+pod.delays[POD_FALLING])
 
-/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to it's location
+/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to its location
 	name = "Landing Zone Indicator"
 	desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
 	icon = 'icons/obj/supplypods_32x32.dmi'
@@ -717,12 +716,12 @@
 	pod.transform = matrix().Turn(rotation)
 	pod.layer = FLY_LAYER
 	SET_PLANE_EXPLICIT(pod, ABOVE_GAME_PLANE, src)
-	if (pod.style != STYLE_INVISIBLE)
+	if (!ispath(pod.style, /datum/pod_style/invisible) && !ispath(pod.style, /datum/pod_style/teleport))
 		animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING) //Make the pod fall! At an angle!
 	addtimer(CALLBACK(src, PROC_REF(endLaunch)), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
 
 /obj/effect/pod_landingzone/proc/setupSmoke(rotation)
-	if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+	if (ispath(pod.style, /datum/pod_style/invisible) || ispath(pod.style, /datum/pod_style/seethrough))
 		return
 	var/turf/our_turf = get_turf(drop_location())
 	for ( var/i in 1 to length(smoke_effects))
@@ -741,7 +740,7 @@
 		QDEL_IN(smoke_part, pod.delays[POD_FALLING] + 35)
 
 /obj/effect/pod_landingzone/proc/drawSmoke()
-	if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
+	if (ispath(pod.style, /datum/pod_style/invisible) || ispath(pod.style, /datum/pod_style/seethrough))
 		return
 	for (var/obj/effect/supplypod_smoke/smoke_part in smoke_effects)
 		animate(smoke_part, alpha = 0, time = 20, flags = ANIMATION_PARALLEL)
diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm
index fdcbc9ba2bb9b..484f4a7a03201 100644
--- a/code/modules/cargo/universal_scanner.dm
+++ b/code/modules/cargo/universal_scanner.dm
@@ -165,7 +165,7 @@
 			context[SCREENTIP_CONTEXT_LMB] = "Scan for export value"
 	return CONTEXTUAL_SCREENTIP_SET
 /**
- * Scans an object, target, and provides it's export value based on selling to the cargo shuttle, to mob/user.
+ * Scans an object, target, and provides its export value based on selling to the cargo shuttle, to mob/user.
  */
 /obj/item/universal_scanner/proc/export_scan(obj/target, mob/user)
 	var/datum/export_report/report = export_item_and_contents(target, dry_run = TRUE)
@@ -240,7 +240,7 @@
 				to_chat(user, span_warning("Bank account not detected. Handling tip not registered."))
 
 /**
- * Scans an object, target, and sets it's custom_price variable to new_custom_price, presenting it to the user.
+ * Scans an object, target, and sets its custom_price variable to new_custom_price, presenting it to the user.
  */
 /obj/item/universal_scanner/proc/price_tag(obj/target, mob/user)
 	if(isitem(target))
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 66fde8c2f1a72..ac3d6af179622 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -481,7 +481,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		display_unread_notes(src, time_stamp)
 	qdel(query_last_connected)
 
-	var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need it's current value now down below.
+	var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need its current value now down below.
 	if (isnum(cached_player_age) && cached_player_age == -1) //first connection
 		player_age = 0
 	var/nnpa = CONFIG_GET(number/notify_new_player_age)
@@ -1206,6 +1206,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 		winset(usr, "mainwindow", "can-resize=true")
 		winset(usr, "mainwindow", "is-maximized=false")
 		winset(usr, "mainwindow", "on-size=attempt_auto_fit_viewport")
+	attempt_auto_fit_viewport()
 
 /client/verb/toggle_status_bar()
 	set name = "Toggle Status Bar"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 7cd3965718e60..c078a23e89c24 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/list/key_bindings_by_key = list()
 
 	var/toggles = TOGGLES_DEFAULT
-	var/db_flags
+	var/db_flags = NONE
 	var/chat_toggles = TOGGLES_DEFAULT_CHAT
 	var/ghost_form = "ghost"
 
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index b2cf6c5c1ef0a..b6a4b092fa0f7 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -34,7 +34,7 @@
 	)
 
 /datum/preference/choiced/backpack/create_default_value()
-	return GBACKPACK
+	return DBACKPACK
 
 /datum/preference/choiced/backpack/icon_for(value)
 	switch (value)
@@ -80,6 +80,9 @@
 		PREF_SKIRT,
 	)
 
+/datum/preference/choiced/jumpsuit/create_default_value()
+	return PREF_SUIT
+
 /datum/preference/choiced/jumpsuit/icon_for(value)
 	switch (value)
 		if (PREF_SUIT)
@@ -90,15 +93,6 @@
 /datum/preference/choiced/jumpsuit/apply_to_human(mob/living/carbon/human/target, value)
 	target.jumpsuit_style = value
 
-/datum/preference/choiced/jumpsuit/create_informed_default_value(datum/preferences/preferences)
-	switch(preferences.read_preference(/datum/preference/choiced/gender))
-		if(MALE)
-			return PREF_SUIT
-		if(FEMALE)
-			return PREF_SKIRT
-
-	return ..()
-
 /// Socks preference
 /datum/preference/choiced/socks
 	savefile_key = "socks"
diff --git a/code/modules/client/preferences/names.dm b/code/modules/client/preferences/names.dm
index 9b671f416b787..dd3070f3edc3f 100644
--- a/code/modules/client/preferences/names.dm
+++ b/code/modules/client/preferences/names.dm
@@ -183,7 +183,7 @@
 
 /// The name to use while bitrunning
 /datum/preference/name/hacker_alias
-	explanation = "Hacker alias"
+	explanation = "Никнейм битранера"
 	group = "bitrunning"
 	savefile_key = "hacker_alias"
 	relevant_job = /datum/job/bitrunner
diff --git a/code/modules/client/preferences/sounds.dm b/code/modules/client/preferences/sounds.dm
index f1778405665ad..4a0298132c268 100644
--- a/code/modules/client/preferences/sounds.dm
+++ b/code/modules/client/preferences/sounds.dm
@@ -116,3 +116,9 @@
 	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
 	savefile_key = "sound_elevator"
 	savefile_identifier = PREFERENCE_PLAYER
+
+/// Controls hearing radio noise
+/datum/preference/toggle/radio_noise
+	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+	savefile_key = "sound_radio_noise"
+	savefile_identifier = PREFERENCE_PLAYER
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index e2632dd394e0c..4ed35997680c0 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -611,7 +611,7 @@
 	glass_colour_type = FALSE
 	vision_flags = SEE_TURFS
 	clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_MADNESS_IMMUNE)
-	var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED)
+	var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC, DATA_HUD_SECURITY_ADVANCED, DATA_HUD_BOT_PATH)
 	var/xray = FALSE
 
 /obj/item/clothing/glasses/debug/equipped(mob/user, slot)
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 4f5668f7bcce7..dc35ab1dbf4c0 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -2,25 +2,6 @@
 	name = "HUD"
 	desc = "A heads-up display that provides important info in (almost) real time."
 	flags_1 = null //doesn't protect eyes because it's a monocle, duh
-	var/hud_type = null
-
-	// NOTE: Just because you have a HUD display doesn't mean you should be able to interact with stuff on examine, that's where the associated trait (TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, etc) is necessary.
-
-/obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot)
-	..()
-	if(!(slot & ITEM_SLOT_EYES))
-		return
-	if(hud_type)
-		var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
-		our_hud.show_to(user)
-
-/obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user)
-	..()
-	if(!istype(user) || user.glasses != src)
-		return
-	if(hud_type)
-		var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
-		our_hud.hide_from(user)
 
 /obj/item/clothing/glasses/hud/emp_act(severity)
 	. = ..()
@@ -55,10 +36,15 @@
 	name = "health scanner HUD"
 	desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status."
 	icon_state = "healthhud"
-	hud_type = DATA_HUD_MEDICAL_ADVANCED
 	clothing_traits = list(TRAIT_MEDICAL_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
 
+/obj/item/clothing/glasses/hud/medsechud
+	name = "health scanner security HUD"
+	desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status, ID status and security records."
+	icon_state = "medsechud"
+	clothing_traits = list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD)
+
 /obj/item/clothing/glasses/hud/health/night
 	name = "night vision health scanner HUD"
 	desc = "An advanced medical heads-up display that allows doctors to find patients in complete darkness."
@@ -110,7 +96,6 @@
 	name = "diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
 	icon_state = "diagnostichud"
-	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
 	clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/lightorange
 
@@ -153,7 +138,6 @@
 	name = "security HUD"
 	desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records."
 	icon_state = "securityhud"
-	hud_type = DATA_HUD_SECURITY_ADVANCED
 	clothing_traits = list(TRAIT_SECURITY_HUD)
 	glass_colour_type = /datum/client_colour/glass_colour/red
 
@@ -243,20 +227,18 @@
 	if (wearer.glasses != src)
 		return
 
-	if (hud_type)
-		var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
-		our_hud.hide_from(user)
+	for(var/trait in clothing_traits)
+		REMOVE_CLOTHING_TRAIT(user, trait)
 
-	if (hud_type == DATA_HUD_MEDICAL_ADVANCED)
-		hud_type = null
-	else if (hud_type == DATA_HUD_SECURITY_ADVANCED)
-		hud_type = DATA_HUD_MEDICAL_ADVANCED
+	if (TRAIT_MEDICAL_HUD in clothing_traits)
+		clothing_traits = null
+	else if (TRAIT_SECURITY_HUD in clothing_traits)
+		clothing_traits = list(TRAIT_MEDICAL_HUD)
 	else
-		hud_type = DATA_HUD_SECURITY_ADVANCED
+		clothing_traits = list(TRAIT_SECURITY_HUD)
 
-	if (hud_type)
-		var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
-		our_hud.show_to(user)
+	for(var/trait in clothing_traits)
+		ADD_CLOTHING_TRAIT(user, trait)
 
 /datum/action/item_action/switch_hud
 	name = "Switch HUD"
@@ -265,19 +247,22 @@
 	name = "thermal HUD scanner"
 	desc = "Thermal imaging HUD in the shape of glasses."
 	icon_state = "thermal"
-	hud_type = DATA_HUD_SECURITY_ADVANCED
 	vision_flags = SEE_MOBS
 	color_cutoffs = list(25, 8, 5)
 	glass_colour_type = /datum/client_colour/glass_colour/red
+	clothing_traits = list(TRAIT_SECURITY_HUD)
 
 /obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
 	..()
+	var/hud_type
+	if (!isnull(clothing_traits) && clothing_traits.len)
+		hud_type = clothing_traits[1]
 	switch (hud_type)
-		if (DATA_HUD_MEDICAL_ADVANCED)
+		if (TRAIT_MEDICAL_HUD)
 			icon_state = "meson"
 			color_cutoffs = list(5, 15, 5)
 			change_glass_color(/datum/client_colour/glass_colour/green)
-		if (DATA_HUD_SECURITY_ADVANCED)
+		if (TRAIT_SECURITY_HUD)
 			icon_state = "thermal"
 			color_cutoffs = list(25, 8, 5)
 			change_glass_color(/datum/client_colour/glass_colour/red)
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index bb0e12809955e..82b1eb8f37954 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -9,7 +9,6 @@
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
 	cut_type = /obj/item/clothing/gloves/fingerless
-	clothing_traits = list(TRAIT_FAST_CUFFING)
 
 /obj/item/clothing/gloves/color/black/Initialize(mapload)
 	. = ..()
@@ -20,6 +19,15 @@
 		slapcraft_recipes = slapcraft_recipe_list,\
 	)
 
+/obj/item/clothing/gloves/color/black/security
+	name = "security gloves"
+	desc = "These security gloves come with microchips that help the user quickly restrain suspects."
+	icon_state = "sec"
+	clothing_traits = list(TRAIT_FAST_CUFFING)
+
+/obj/item/clothing/gloves/color/black/security/blu
+	icon_state = "sec_blu"
+
 /obj/item/clothing/gloves/fingerless
 	name = "fingerless gloves"
 	desc = "Plain black gloves without fingertips for the hard-working."
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
index 4adb374d92bd7..bbe7f5dba18b4 100644
--- a/code/modules/clothing/gloves/tacklers.dm
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -59,9 +59,8 @@
 /obj/item/clothing/gloves/tackler/combat
 	name = "gorilla gloves"
 	desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
-	icon_state = "black"
-	inhand_icon_state = "greyscale_gloves"
-	greyscale_colors = "#2f2e31"
+	icon_state = "gorilla"
+	inhand_icon_state = null
 
 	tackle_stam_cost = 30
 	base_knockdown = 1.25 SECONDS
@@ -77,6 +76,7 @@
 /obj/item/clothing/gloves/tackler/combat/insulated
 	name = "guerrilla gloves"
 	desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
+	icon_state = "guerrilla"
 	siemens_coefficient = 0
 	armor_type = /datum/armor/combat_insulated
 
@@ -101,7 +101,7 @@
 	desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose."
 	icon_state = "fingerless"
 	inhand_icon_state = null
-
+	clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH)
 	tackle_stam_cost = 30
 	base_knockdown = 1.75 SECONDS
 	min_distance = 2
diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm
index 2768656d5e6f9..13a6e549b0e91 100644
--- a/code/modules/clothing/head/costume.dm
+++ b/code/modules/clothing/head/costume.dm
@@ -199,3 +199,9 @@
 	It's only a replica, and probably wouldn't protect you from anything."
 	icon_state = "allies_helmet"
 	inhand_icon_state = null
+
+/obj/item/clothing/head/costume/hairpin
+	name = "fancy hairpin"
+	desc = "A delicate hairpin normally paired with traditional clothing"
+	icon_state = "hairpin_fancy"
+	inhand_icon_state = "hairpin_fancy"
diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm
index 0fc2de1375a48..a8247a55603e2 100644
--- a/code/modules/clothing/head/hat.dm
+++ b/code/modules/clothing/head/hat.dm
@@ -53,11 +53,12 @@
 
 /obj/item/clothing/head/bio_hood/plague
 	name = "plague doctor's hat"
-	desc = "These were once used by plague doctors. Will protect you from exposure to the Pestilence."
+	desc = "These were once used by plague doctors. This hat will only slightly protect you from exposure to the Pestilence."
 	icon_state = "plaguedoctor"
-	clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT | STACKABLE_HELMET_EXEMPT
 	armor_type = /datum/armor/bio_hood_plague
 	flags_inv = NONE
+	clothing_flags = SNUG_FIT
+	flags_cover = NONE
 
 /datum/armor/bio_hood_plague
 	bio = 100
@@ -209,6 +210,14 @@
 	name = "rice hat"
 	desc = "Welcome to the rice fields, motherfucker."
 	icon_state = "rice_hat"
+	base_icon_state = "rice_hat"
+	var/reversed = FALSE
+
+/obj/item/clothing/head/costume/rice_hat/click_alt(mob/user)
+	reversed = !reversed
+	worn_icon_state = "[base_icon_state][reversed ? "_kim" : ""]"
+	to_chat(user, span_notice("You [reversed ? "lower" : "raise"] the hat."))
+	update_appearance()
 
 /obj/item/clothing/head/costume/lizard
 	name = "lizardskin cloche hat"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 4d41d9daa5c76..76c230ca504d2 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -137,7 +137,7 @@
 
 /obj/item/clothing/head/helmet/marine/pmc
 	icon_state = "marine"
-	desc = "A tactical black helmet, designed to protect one's head from various injuries sustained in operations. Its stellar survivability making up is for it's lack of space worthiness"
+	desc = "A tactical black helmet, designed to protect one's head from various injuries sustained in operations. Its stellar survivability making up is for its lack of space worthiness"
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
 	clothing_flags = null
@@ -568,3 +568,106 @@
 	fire = 50
 	acid = 50
 	wound = 30
+
+/obj/item/clothing/head/helmet/durability/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
+	take_damage(1, BRUTE, 0, 0)
+
+/obj/item/clothing/head/helmet/durability/watermelon
+	name = "Watermelon Helmet"
+	desc = "A helmet cut out from a watermelon. Might take a few hits, but don't expect it whitstand much."
+	icon_state = "watermelon"
+	inhand_icon_state = "watermelon"
+	flags_inv = HIDEEARS
+	dog_fashion = /datum/dog_fashion/head/watermelon
+	armor_type = /datum/armor/helmet_watermelon
+	max_integrity = 15
+
+/obj/item/clothing/head/helmet/durability/watermelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/helmet_watermelon_fr
+
+/datum/armor/helmet_watermelon
+	melee = 15
+	bullet = 10
+	energy = 10
+	bomb = 10
+	fire = 0
+	acid = 25
+	wound = 5
+
+/datum/armor/helmet_watermelon_fr
+	melee = 15
+	bullet = 10
+	energy = 10
+	bomb = 10
+	fire = 15
+	acid = 30
+	wound = 5
+
+/obj/item/clothing/head/helmet/durability/holymelon
+	name = "Holymelon Helmet"
+	desc = "A helmet from a hollowed out holymelon. Might take a few hits, but don't expect it whitstand much."
+	icon_state = "holymelon"
+	inhand_icon_state = "holymelon"
+	flags_inv = HIDEEARS
+	dog_fashion = /datum/dog_fashion/head/holymelon
+	armor_type = /datum/armor/helmet_watermelon
+	max_integrity = 15
+	var/decayed = FALSE
+
+/obj/item/clothing/head/helmet/durability/holymelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/helmet_watermelon_fr
+
+/obj/item/clothing/head/helmet/durability/holymelon/Initialize(mapload)
+	. = ..()
+	if(decayed)
+		decay()
+		return
+
+	AddComponent(
+		/datum/component/anti_magic, \
+		antimagic_flags = MAGIC_RESISTANCE_HOLY, \
+		inventory_flags = ITEM_SLOT_OCLOTHING, \
+		charges = 1, \
+		drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \
+		expiration = CALLBACK(src, PROC_REF(decay)) \
+	)
+
+/obj/item/clothing/head/helmet/durability/holymelon/proc/drain_antimagic(mob/user)
+	to_chat(user, span_warning("[src] looses a bit of its shimmer and glossiness..."))
+
+/obj/item/clothing/head/helmet/durability/holymelon/proc/decay()
+	take_damage(8, BRUTE, 0, 0)
+
+/obj/item/clothing/head/helmet/durability/barrelmelon
+	name = "Barrelmelon Helmet"
+	desc = "A helmet from hollowed out barrelmelon. As sturdy as if made from actual wood, though its rigid structure makes it break up quicker."
+	icon_state = "barrelmelon"
+	inhand_icon_state = "barrelmelon"
+	flags_inv = HIDEEARS
+	dog_fashion = /datum/dog_fashion/head/barrelmelon
+	armor_type = /datum/armor/helmet_barrelmelon
+	max_integrity = 10
+
+/obj/item/clothing/head/helmet/durability/barrelmelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/helmet_barrelmelon_fr
+
+/datum/armor/helmet_barrelmelon
+	melee = 25
+	bullet = 20
+	energy = 15
+	bomb = 10
+	fire = 0
+	acid = 35
+	wound = 10
+
+/datum/armor/helmet_barrelmelon_fr
+	melee = 25
+	bullet = 20
+	energy = 15
+	bomb = 10
+	fire = 20
+	acid = 40
+	wound = 10
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 3003e9a76ee15..cb0f9033960c3 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -169,6 +169,7 @@
 	clothing_flags = SNUG_FIT
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE
 	dog_fashion = null
+	clothing_traits = list(TRAIT_SCARY_FISHERMAN) //Fish, carps, lobstrosities and frogs fear me.
 
 /obj/item/clothing/head/soft/fishing_hat/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/clothing/head/tophat.dm b/code/modules/clothing/head/tophat.dm
index 2affc4c63da18..612f02ce692e9 100644
--- a/code/modules/clothing/head/tophat.dm
+++ b/code/modules/clothing/head/tophat.dm
@@ -38,7 +38,7 @@
 
 /obj/item/clothing/head/hats/tophat/balloon
 	name = "balloon top-hat"
-	desc = "It's an colourful looking top-hat to match yout colourful personality."
+	desc = "It's a colourful looking top-hat to match your colourful personality."
 	icon_state = "balloon_tophat"
 	inhand_icon_state = "balloon_that"
 	throwforce = 0
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 36fe591a63edb..cab7a6557e3c4 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -250,12 +250,12 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
 //Plague Dr suit can be found in clothing/suits/bio.dm
 /obj/item/clothing/mask/gas/plaguedoctor
 	name = "plague doctor mask"
-	desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
+	desc = "A modernised version of the classic design, this mask will not only protect you from exposure to the Pestilence but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
 	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT|HIDEHAIR
 	inhand_icon_state = "gas_mask"
 	has_fov = FALSE
-	flags_cover = MASKCOVERSEYES
+	clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
 
 /obj/item/clothing/mask/gas/syndicate
 	name = "syndicate mask"
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 4470a398168c5..61298e970cbf9 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -115,9 +115,10 @@
  * *
  * * state: SHOES_UNTIED, SHOES_TIED, or SHOES_KNOTTED, depending on what you want them to become
  * * user: used to check to see if we're the ones unknotting our own laces
+ * * force_lacing: boolean. if TRUE, ignores can_be_tied
  */
-/obj/item/clothing/shoes/proc/adjust_laces(state, mob/user)
-	if(!can_be_tied)
+/obj/item/clothing/shoes/proc/adjust_laces(state, mob/user, force_lacing = FALSE)
+	if(!can_be_tied && !force_lacing)
 		return
 
 	var/mob/living/carbon/human/our_guy
diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm
index 9c948e2fac88e..92c90a90348ce 100644
--- a/code/modules/clothing/shoes/sandals.dm
+++ b/code/modules/clothing/shoes/sandals.dm
@@ -11,6 +11,12 @@
 	can_be_tied = FALSE
 	species_exception = list(/datum/species/golem)
 
+/obj/item/clothing/shoes/sandal/alt
+	desc = "A pair of shiny black wooden sandals."
+	name = "black sandals"
+	icon_state = "blacksandals"
+	inhand_icon_state = "blacksandals"
+
 /datum/armor/shoes_sandal
 	bio = 10
 
diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm
index 953d5bd9a1cb8..0ae1e6e9caad9 100644
--- a/code/modules/clothing/shoes/sneakers.dm
+++ b/code/modules/clothing/shoes/sneakers.dm
@@ -12,6 +12,11 @@
 	flags_1 = IS_PLAYER_COLORABLE_1
 	interaction_flags_mouse_drop = NEED_HANDS
 
+/obj/item/clothing/shoes/sneakers/random/Initialize(mapload)
+	. = ..()
+	greyscale_colors = "#" + random_color() + "#" + random_color()
+	update_greyscale()
+
 /obj/item/clothing/shoes/sneakers/black
 	name = "black shoes"
 	desc = "A pair of black shoes."
diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm
index 8bc37aaba22b7..32233f23400cc 100644
--- a/code/modules/clothing/suits/ablativecoat.dm
+++ b/code/modules/clothing/suits/ablativecoat.dm
@@ -50,15 +50,11 @@
 /obj/item/clothing/suit/hooded/ablative/on_hood_up(obj/item/clothing/head/hooded/hood)
 	. = ..()
 	var/mob/living/carbon/user = loc
-	var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
 	ADD_TRAIT(user, TRAIT_SECURITY_HUD, HELMET_TRAIT)
-	hud.show_to(user)
 	balloon_alert(user, "hud enabled")
 
 /obj/item/clothing/suit/hooded/ablative/on_hood_down(obj/item/clothing/head/hooded/hood)
 	var/mob/living/carbon/user = loc
-	var/datum/atom_hud/sec_hud = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
 	REMOVE_TRAIT(user, TRAIT_SECURITY_HUD, HELMET_TRAIT)
-	sec_hud.hide_from(user)
 	balloon_alert(user, "hud disabled")
 	return ..()
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 2502850bd700d..3c7fa506b208d 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -107,7 +107,7 @@
 	body_parts_covered = CHEST|GROIN
 
 /obj/item/clothing/suit/armor/vest/marine/pmc
-	desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing. Its stellar survivability making up is for it's lack of space worthiness"
+	desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing. Its stellar survivability making up is for its lack of space worthiness"
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
 	clothing_flags = THICKMATERIAL
@@ -652,7 +652,7 @@
 
 /obj/item/clothing/suit/armor/militia
 	name = "station defender's coat"
-	desc = "A well worn uniform used by militia across the frontier, it's thick padding useful for cushioning blows."
+	desc = "A well worn uniform used by militia across the frontier, its thick padding useful for cushioning blows."
 	icon_state = "militia"
 	inhand_icon_state = "b_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
@@ -714,3 +714,113 @@
 	fire = 50
 	acid = 50
 	wound = 30
+
+/obj/item/clothing/suit/armor/durability/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
+	take_damage(1, BRUTE, 0, 0)
+
+/obj/item/clothing/suit/armor/durability/watermelon
+	name = "watermelon"
+	desc = "An armour, made from watermelons. Propably won't take too many hits, but at least it looks serious... As serious as worn watermelon can be."
+	icon_state = "watermelon"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	armor_type = /datum/armor/watermelon
+	strip_delay = 60
+	equip_delay_other = 40
+	clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)
+	max_integrity = 15
+
+/obj/item/clothing/suit/armor/durability/watermelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/watermelon_fr
+
+/datum/armor/watermelon
+	melee = 15
+	bullet = 10
+	energy = 10
+	bomb = 10
+	fire = 0
+	acid = 25
+	wound = 5
+
+/datum/armor/watermelon_fr
+	melee = 15
+	bullet = 10
+	energy = 10
+	bomb = 10
+	fire = 15
+	acid = 30
+	wound = 5
+
+/obj/item/clothing/suit/armor/durability/holymelon
+	name = "holymelon"
+	desc = "An armour, made from holymelons. Inspires you to go on some sort of a crusade... Perhaps spreading spinach to children?"
+	icon_state = "holymelon"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	armor_type = /datum/armor/watermelon
+	strip_delay = 60
+	equip_delay_other = 40
+	clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)
+	max_integrity = 15
+	var/decayed = FALSE
+
+/obj/item/clothing/suit/armor/durability/holymelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/watermelon_fr
+
+/obj/item/clothing/suit/armor/durability/holymelon/Initialize(mapload)
+	. = ..()
+	if(decayed)
+		decay()
+		return
+
+	AddComponent(
+		/datum/component/anti_magic, \
+		antimagic_flags = MAGIC_RESISTANCE_HOLY, \
+		inventory_flags = ITEM_SLOT_OCLOTHING, \
+		charges = 1, \
+		drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \
+		expiration = CALLBACK(src, PROC_REF(decay)) \
+	)
+
+/obj/item/clothing/suit/armor/durability/holymelon/proc/drain_antimagic(mob/user)
+	to_chat(user, span_warning("[src] looses a bit of its shimmer and glossiness..."))
+
+/obj/item/clothing/suit/armor/durability/holymelon/proc/decay()
+	take_damage(8, BRUTE, 0, 0)
+
+
+/obj/item/clothing/suit/armor/durability/barrelmelon
+	name = "barrelmelon"
+	desc = "An armour, made from barrelmelons. Reeks of ale, inspiring to courageous deeds. Or, perhaps, a bar brawl."
+	icon_state = "barrelmelon"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	armor_type = /datum/armor/barrelmelon
+	strip_delay = 60
+	equip_delay_other = 40
+	clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)
+	max_integrity = 10
+
+/obj/item/clothing/suit/armor/durability/barrelmelon/fire_resist
+	resistance_flags = FIRE_PROOF
+	armor_type = /datum/armor/barrelmelon_fr
+
+/datum/armor/barrelmelon
+	melee = 25
+	bullet = 20
+	energy = 15
+	bomb = 10
+	fire = 0
+	acid = 35
+	wound = 10
+
+/datum/armor/barrelmelon_fr
+	melee = 25
+	bullet = 20
+	energy = 15
+	bomb = 10
+	fire = 20
+	acid = 40
+	wound = 10
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2b8fef5bb5b46..d211b3cc91edf 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -234,7 +234,7 @@
 
 /obj/item/clothing/suit/jacket/quartermaster
 	name = "quartermaster's overcoat"
-	desc = "A luxury, brown double-breasted overcoat made from kangaroo skin. It's gold cuffs are linked and styled on the credits symbol. It makes you feel more important than you probably are."
+	desc = "A luxury, brown double-breasted overcoat made from kangaroo skin. Its gold cuffs are linked and styled on the credits symbol. It makes you feel more important than you probably are."
 	icon_state = "qm_coat"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index eb1ccb3c51092..53026e974bf63 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -49,6 +49,17 @@
 	resistance_flags = FLAMMABLE
 	dog_fashion = /datum/dog_fashion/head/blue_wizard
 
+/obj/item/clothing/head/wizard/chanterelle
+	name = "chanterelle hat"
+	desc = "An oversized chanterelle with hollow out space to fit a head in. Kinda looks like wizard's hat."
+	icon_state = "chanterelle"
+	inhand_icon_state = "chanterellehat"
+	armor_type = /datum/armor/none
+	resistance_flags = FLAMMABLE
+
+/obj/item/clothing/head/wizard/chanterelle/fr
+	resistance_flags = FIRE_PROOF
+
 /obj/item/clothing/head/wizard/marisa
 	name = "witch hat"
 	desc = "Strange-looking hat-wear. Makes you want to cast fireballs."
@@ -205,6 +216,63 @@
 	actions_types = list(/datum/action/item_action/stickmen)
 
 
+/obj/item/clothing/suit/wizrobe/durathread
+	name = "durathread robe"
+	desc = "A rather dull durathread robe; not quite as protective as a proper piece of armour, but much stylish."
+	icon_state = "durathread-fake"
+	inhand_icon_state = null
+	armor_type = /datum/armor/robe_durathread
+	allowed = list(
+		/obj/item/cultivator,
+		/obj/item/geneshears,
+		/obj/item/graft,
+		/obj/item/hatchet,
+		/obj/item/plant_analyzer,
+		/obj/item/reagent_containers/cup/beaker,
+		/obj/item/reagent_containers/cup/bottle,
+		/obj/item/reagent_containers/cup/tube,
+		/obj/item/reagent_containers/spray/pestspray,
+		/obj/item/reagent_containers/spray/plantbgone,
+		/obj/item/secateurs,
+		/obj/item/seeds,
+		/obj/item/storage/bag/plants,
+	)
+
+/datum/armor/robe_durathread
+	melee = 15
+	bullet = 5
+	laser = 25
+	energy = 30
+	bomb = 10
+	fire = 30
+	acid = 40
+
+/obj/item/clothing/suit/wizrobe/durathread/fire
+	name = "pyromancer robe"
+	desc = "A rather dull durathread robe; not quite as protective as an woven armour, but much stylish."
+	icon_state = "durathread-fire"
+
+/obj/item/clothing/suit/wizrobe/durathread/ice
+	name = "pyromancer robe"
+	desc = "A rather dull durathread robe; not quite as protective as an woven armour, but much stylish."
+	icon_state = "durathread-ice"
+
+/obj/item/clothing/suit/wizrobe/durathread/electric
+	name = "electromancer robe"
+	desc = "Doesn't actually conduit or isolate from electricity. Though it does have some durability on account of being made from durathread."
+	icon_state = "durathread-electric"
+
+/obj/item/clothing/suit/wizrobe/durathread/earth
+	name = "geomancer robe"
+	desc = "A rather dull durathread robe; not quite as protective as an woven armour, but much stylish."
+	icon_state = "durathread-earth"
+
+/obj/item/clothing/suit/wizrobe/durathread/necro
+	name = "necromancer robe"
+	desc = "A rather dull durathread robe; not quite as protective as an woven armour, but much stylish."
+	icon_state = "durathread-necro"
+
+
 /obj/item/clothing/suit/wizrobe/paper/ui_action_click(mob/user, action)
 	stickmen()
 
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
index 080d1afe70ad5..ddf325a2201ab 100644
--- a/code/modules/clothing/under/costume.dm
+++ b/code/modules/clothing/under/costume.dm
@@ -129,6 +129,45 @@
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 
+/obj/item/clothing/under/costume/yukata
+	name = "black yukata"
+	desc = "A comfortable black cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+	icon_state = "yukata1"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/costume/yukata/green
+	name = "green yukata"
+	desc = "A comfortable green cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+	icon_state = "yukata2"
+
+/obj/item/clothing/under/costume/yukata/white
+	name = "white yukata"
+	desc = "A comfortable white cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+	icon_state = "yukata3"
+
+/obj/item/clothing/under/costume/kimono
+	name = "black kimono"
+	desc = "A luxurious black silk kimono with traditional flair, ideal for elegant festive occasions."
+	icon_state = "kimono1"
+	inhand_icon_state = "yukata1"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/costume/kimono/red
+	name = "red kimono"
+	desc = "A luxurious red silk kimono with traditional flair, ideal for elegant festive occasions."
+	icon_state = "kimono2"
+	inhand_icon_state = "kimono2"
+
+/obj/item/clothing/under/costume/kimono/purple
+	name = "purple kimono"
+	desc = "A luxurious purple silk kimono with traditional flair, ideal for elegant festive occasions."
+	icon_state = "kimono3"
+	inhand_icon_state = "kimono3"
+
 /obj/item/clothing/under/costume/villain
 	name = "villain suit"
 	desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
diff --git a/code/modules/deathmatch/deathmatch_controller.dm b/code/modules/deathmatch/deathmatch_controller.dm
index 45b5f087c5bb5..0b098871624dc 100644
--- a/code/modules/deathmatch/deathmatch_controller.dm
+++ b/code/modules/deathmatch/deathmatch_controller.dm
@@ -76,6 +76,9 @@
 		return
 	switch (action)
 		if ("host")
+			if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME))
+				tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.")
+				return
 			if (lobbies[usr.ckey])
 				return
 			if(!SSticker.HasRoundStarted())
@@ -84,6 +87,9 @@
 			ui.close()
 			create_new_lobby(usr)
 		if ("join")
+			if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME))
+				tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.")
+				return
 			if (!lobbies[params["id"]])
 				return
 			var/datum/deathmatch_lobby/playing_lobby = find_lobby_by_user(usr.ckey)
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index a6841d3975444..1cf617ce4513e 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -101,6 +101,12 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	// The proceeding mess will almost definitely break if error messages are ever changed
 	var/list/splitlines = splittext(E.desc, "\n")
 	var/list/desclines = list()
+	var/list/state_stack = GLOB.lua_state_stack
+	var/is_lua_call = length(state_stack)
+	var/list/lua_stacks = list()
+	if(is_lua_call)
+		for(var/level in 1 to state_stack.len)
+			lua_stacks += list(splittext(DREAMLUAU_GET_TRACEBACK(level), "\n"))
 	if(LAZYLEN(splitlines) > ERROR_USEFUL_LEN) // If there aren't at least three lines, there's no info
 		for(var/line in splitlines)
 			if(LAZYLEN(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:"))
@@ -110,13 +116,14 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 					desclines.Add(usrinfo)
 					usrinfo = null
 				continue // Our usr info is better, replace it
-
 			if(copytext(line, 1, 3) != "  ")//3 == length("  ") + 1
 				desclines += ("  " + line) // Pad any unpadded lines, so they look pretty
 			else
 				desclines += line
 	if(usrinfo) //If this info isn't null, it hasn't been added yet
 		desclines.Add(usrinfo)
+	if(is_lua_call)
+		SSlua.log_involved_runtime(E, desclines, lua_stacks)
 	if(silencing)
 		desclines += "  (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])"
 	if(GLOB.error_cache)
diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm
index d271fc8389853..6d72a90d7e9be 100644
--- a/code/modules/events/anomaly/_anomaly.dm
+++ b/code/modules/events/anomaly/_anomaly.dm
@@ -28,7 +28,7 @@
 /datum/round_event/anomaly/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Энергетический поток обнаружен на [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Обнаружена аномалия")
 
 /datum/round_event/anomaly/start()
 	var/turf/anomaly_turf
diff --git a/code/modules/events/anomaly/anomaly_bioscrambler.dm b/code/modules/events/anomaly/anomaly_bioscrambler.dm
index 65ce17e8f2456..dd4da4f827001 100644
--- a/code/modules/events/anomaly/anomaly_bioscrambler.dm
+++ b/code/modules/events/anomaly/anomaly_bioscrambler.dm
@@ -17,4 +17,4 @@
 /datum/round_event/anomaly/anomaly_bioscrambler/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Биологический агент замены конечностей обнаружен на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Используйте биокостюмы или другое защитное снаряжение, чтобы противостоять последствиям. Расчетный период полураспада %9£$T$%F3 года.", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Биологический агент замены конечностей обнаружен на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name]. Используйте биокостюмы или другое защитное снаряжение, чтобы противостоять последствиям. Расчетный период полураспада %9£$T$%F3 года.", "Обнаружена аномалия")
diff --git a/code/modules/events/anomaly/anomaly_bluespace.dm b/code/modules/events/anomaly/anomaly_bluespace.dm
index 93ee3279b4db7..5c174dac7bee9 100644
--- a/code/modules/events/anomaly/anomaly_bluespace.dm
+++ b/code/modules/events/anomaly/anomaly_bluespace.dm
@@ -16,4 +16,4 @@
 /datum/round_event/anomaly/anomaly_bluespace/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Нестабильная блюспейс-аномалия обнаружена на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Нестабильная блюспейс-аномалия обнаружена на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Обнаружена аномалия")
diff --git a/code/modules/events/anomaly/anomaly_dimensional.dm b/code/modules/events/anomaly/anomaly_dimensional.dm
index f5df191d48685..adab8757228c3 100644
--- a/code/modules/events/anomaly/anomaly_dimensional.dm
+++ b/code/modules/events/anomaly/anomaly_dimensional.dm
@@ -25,7 +25,7 @@
 /datum/round_event/anomaly/anomaly_dimensional/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Пространственная аномалия обнаружена на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Пространственная аномалия обнаружена на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Обнаружена аномалия")
 
 /datum/event_admin_setup/listed_options/anomaly_dimensional
 	input_text = "Выбрать тему пространственной аномалии?"
diff --git a/code/modules/events/anomaly/anomaly_ectoplasm.dm b/code/modules/events/anomaly/anomaly_ectoplasm.dm
index d7a41b6c3615e..3363f50984638 100644
--- a/code/modules/events/anomaly/anomaly_ectoplasm.dm
+++ b/code/modules/events/anomaly/anomaly_ectoplasm.dm
@@ -8,7 +8,7 @@
 	typepath = /datum/round_event/anomaly/anomaly_ectoplasm
 	min_players = 30
 	max_occurrences = 2
-	weight = 4 //Rare because of it's wacky and silly nature
+	weight = 4 //Rare because of its wacky and silly nature
 	category = EVENT_CATEGORY_ANOMALIES
 	min_wizard_trigger_potency = 0
 	max_wizard_trigger_potency = 3
@@ -41,7 +41,7 @@
 /datum/round_event/anomaly/anomaly_ectoplasm/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Паранормальный выброс эктоплазмы обнаружен на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Паранормальный выброс эктоплазмы обнаружен на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Обнаружена аномалия")
 
 /datum/event_admin_setup/anomaly_ectoplasm
 	///The admin-selected intensity
diff --git a/code/modules/events/anomaly/anomaly_flux.dm b/code/modules/events/anomaly/anomaly_flux.dm
index e9d7de154b8d8..65025bdb847ac 100644
--- a/code/modules/events/anomaly/anomaly_flux.dm
+++ b/code/modules/events/anomaly/anomaly_flux.dm
@@ -17,4 +17,4 @@
 /datum/round_event/anomaly/anomaly_flux/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Поточная гиперэнергетическая аномалия обнаружена на [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Поточная гиперэнергетическая аномалия обнаружена на [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Обнаружена аномалия")
diff --git a/code/modules/events/anomaly/anomaly_grav.dm b/code/modules/events/anomaly/anomaly_grav.dm
index 85d6d34f8142b..4df23c5e1ef2b 100644
--- a/code/modules/events/anomaly/anomaly_grav.dm
+++ b/code/modules/events/anomaly/anomaly_grav.dm
@@ -29,4 +29,4 @@
 /datum/round_event/anomaly/anomaly_grav/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Гравитационная аномалия обнаружена на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия" , ANNOUNCER_GRANOMALIES)
+	priority_announce("Гравитационная аномалия обнаружена на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Обнаружена аномалия" , ANNOUNCER_GRANOMALIES)
diff --git a/code/modules/events/anomaly/anomaly_hallucination.dm b/code/modules/events/anomaly/anomaly_hallucination.dm
index 73f44370ba37e..f9ab91f255ae5 100644
--- a/code/modules/events/anomaly/anomaly_hallucination.dm
+++ b/code/modules/events/anomaly/anomaly_hallucination.dm
@@ -17,4 +17,4 @@
 /datum/round_event/anomaly/anomaly_hallucination/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Галлюцинаторное событие обнаружено на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Галлюцинаторное событие обнаружено на [ANOMALY_ANNOUNCE_MEDIUM_TEXT] [impact_area.name].", "Обнаружена аномалия")
diff --git a/code/modules/events/anomaly/anomaly_pyro.dm b/code/modules/events/anomaly/anomaly_pyro.dm
index bd5ffe01ce4d9..5f7af240a325f 100644
--- a/code/modules/events/anomaly/anomaly_pyro.dm
+++ b/code/modules/events/anomaly/anomaly_pyro.dm
@@ -16,4 +16,4 @@
 /datum/round_event/anomaly/anomaly_pyro/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Пирокластическая аномалия обнаружена на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Пирокластическая аномалия обнаружена на [ANOMALY_ANNOUNCE_HARMFUL_TEXT] [impact_area.name].", "Обнаружена аномалия")
diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm
index fa4f45e68deb1..90f509b77bd17 100644
--- a/code/modules/events/anomaly/anomaly_vortex.dm
+++ b/code/modules/events/anomaly/anomaly_vortex.dm
@@ -17,4 +17,4 @@
 /datum/round_event/anomaly/anomaly_vortex/announce(fake)
 	if(isnull(impact_area))
 		impact_area = placer.findValidArea()
-	priority_announce("Вихревая аномалия высокой интенсивности обнаружена на [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "ВНИМАНИЕ: Обнаружена аномалия")
+	priority_announce("Вихревая аномалия высокой интенсивности обнаружена на [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Обнаружена аномалия")
diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm
index f834ede72a3e7..72bf37c9cdef1 100644
--- a/code/modules/events/aurora_caelus.dm
+++ b/code/modules/events/aurora_caelus.dm
@@ -20,7 +20,7 @@
 /datum/round_event/aurora_caelus/announce()
 	priority_announce("[station_name()]: безобидное облако ионов приближается к вашей станции и истощает свою энергию, ударяя по корпусу. Компания Нанотрейзен одобрила небольшой перерыв для всех сотрудников, чтобы они могли расслабиться и понаблюдать за этим очень редким событием. В это время звездный свет будет ярким, но нежным, меняющимся между спокойными зелеными и синими цветами. Любой персонал, желающий увидеть эти огни самостоятельно, может пройти в ближайшую к ним зону со смотровыми иллюминаторами на космос. Мы надеемся, что вам понравится это явление.",
 	sound = 'sound/misc/notice2.ogg',
-	sender_override = "Nanotrasen Meteorology Division")
+	sender_override = "Отдел метеорологии Нанотрейзен")
 	for(var/V in GLOB.player_list)
 		var/mob/M = V
 		if((M.client.prefs.read_preference(/datum/preference/toggle/sound_midi)) && is_station_level(M.z))
@@ -60,7 +60,7 @@
 	fade_kitchen()
 	priority_announce("Событие aurora caelus подходит к концу. Условия звездного света постепенно вернутся в норму. Когда все закончится, пожалуйста, вернитесь на свое рабочее место и продолжайте работать в обычном режиме. Приятной смены, [station_name()] и спасибо, что смотрите с нами.",
 	sound = 'sound/misc/notice2.ogg',
-	sender_override = "Nanotrasen Meteorology Division")
+	sender_override = "Отдел метеорологии Нанотрейзен")
 
 /datum/round_event/aurora_caelus/proc/fade_space(fade_in = FALSE)
 	set waitfor = FALSE
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index ca651231b5627..554d4bd1b89ce 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -23,13 +23,13 @@
 	var/obj/machinery/vending/origin_machine
 	/// Murderous sayings from the machines.
 	var/list/rampant_speeches = list(
-		"Try our aggressive new marketing strategies!",
-		"You should buy products to feed your lifestyle obsession!",
-		"Consume!",
-		"Your money can buy happiness!",
-		"Engage direct marketing!",
-		"Advertising is legalized lying! But don't let that put you off our great deals!",
-		"You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.",
+		"Попробуйте нашу новую АГРЕССИВНУЮ стратегию маркетинга!",
+		"Вам стоит что-нибудь купить, дабы утолить ваши ПОТРЕБНОСТИ!",
+		"Потребляй!",
+		"За ваши деньги можно купить счастье!",
+		"Методика ПРЯМОГО маркетинга!",
+		"Реклама узаконила ложь! Но не позвольте ей отвлечь вас от наших замечательных предложений!",
+		"Не хочешь платить? Я твоей мамке тоже платить не хотел.",
 	)
 
 /datum/round_event/brand_intelligence/setup()
@@ -52,7 +52,7 @@
 	if(fake)
 		var/obj/machinery/vending/prototype = pick(subtypesof(/obj/machinery/vending))
 		machine_name = initial(prototype.name)
-	priority_announce("На борту станции [station_name()] зафиксировано распространение цифрового торгового вируса. Проверьте все торговые автоматы типа [machine_name] на наличие агрессивной маркетинговой тактики и при необходимости перезагрузите их.", "ОВНИМАНИЕ: Обнаружен цифровой вирус")
+	priority_announce("На борту станции [station_name()] зафиксировано распространение цифрового торгового вируса. Проверьте все торговые автоматы типа [machine_name] на наличие агрессивной маркетинговой тактики и при необходимости перезагрузите их.", "Обнаружен цифровой вирус")
 
 /datum/round_event/brand_intelligence/start()
 	origin_machine.shut_up = FALSE
@@ -60,7 +60,7 @@
 	announce_to_ghosts(origin_machine)
 
 /datum/round_event/brand_intelligence/tick()
-	if(!origin_machine || QDELETED(origin_machine) || origin_machine.shut_up || origin_machine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped
+	if(!origin_machine || QDELETED(origin_machine) || origin_machine.shut_up || origin_machine.wires.is_all_cut()) //if the original vending machine is missing or has its voice switch flipped
 		for(var/obj/machinery/vending/saved in infected_machines)
 			saved.shoot_inventory = FALSE
 		if(origin_machine)
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index a926bd3209f5f..975077ab35789 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -37,7 +37,7 @@
 	start_when = rand(40, 60)
 
 /datum/round_event/carp_migration/announce(fake)
-	priority_announce("[fluff_signal] были обнаружены вблизи [station_name()], будьте наготове.", "ВНИМАНИЕ: неопознанные формы жизни")
+	priority_announce("[fluff_signal] были обнаружены вблизи [station_name()], будьте наготове.", "Неопознанные формы жизни")
 
 /datum/round_event/carp_migration/start()
 	// Stores the most recent fish we spawn
diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm
index 3c2ca97530d4b..ab3f7e930d0f6 100644
--- a/code/modules/events/communications_blackout.dm
+++ b/code/modules/events/communications_blackout.dm
@@ -23,7 +23,7 @@
 		to_chat(A, "<br>[span_warning("<b>[alert]</b>")]<br>")
 
 	if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
-		priority_announce(alert, "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce(alert, "Обнаружена аномалия")
 
 
 /datum/round_event/communications_blackout/start()
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index 4cb76faae15f3..c999579f75b3f 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -102,7 +102,7 @@
 	var/list/afflicted = list()
 
 /datum/round_event/disease_outbreak/announce(fake)
-	if(isnull(illness_type))
+	if(!illness_type)
 		var/list/virus_candidates = list(
 			/datum/disease/anxiety,
 			/datum/disease/beesease,
@@ -119,7 +119,7 @@
 		)
 		var/datum/disease/fake_virus = pick(virus_candidates)
 		illness_type = initial(fake_virus.name)
-	priority_announce("Вспышка биологической угрозы 7-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение.", "ВНИМАНИЕ: [illness_type]", ANNOUNCER_OUTBREAK7)
+	priority_announce("Вспышка биологической угрозы 7-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение.", "[illness_type]", ANNOUNCER_OUTBREAK7)
 
 /datum/round_event/disease_outbreak/setup()
 	announce_when = ADV_ANNOUNCE_DELAY
diff --git a/code/modules/events/earthquake.dm b/code/modules/events/earthquake.dm
index cb0d992244bc1..70306bec8eb20 100644
--- a/code/modules/events/earthquake.dm
+++ b/code/modules/events/earthquake.dm
@@ -94,7 +94,7 @@
 
 /datum/round_event/earthquake/start()
 	notify_ghosts(
-		"The earthquake's epicenter has been located: [get_area_name(epicenter)]!",
+		"Эпицентр землетрясения был обнаружен: [get_area_name(epicenter)]!",
 		source = epicenter,
 		header = "Rumble Rumble Rumble!",
 	)
@@ -129,12 +129,12 @@
 			for(var/mob/living/quake_victim in turf_to_quake)
 				quake_victim.Knockdown(7 SECONDS)
 				quake_victim.Paralyze(5 SECONDS)
-				to_chat(quake_victim, span_warning("The ground quakes violently beneath you, throwing you off your feet!"))
+				to_chat(quake_victim, span_warning("Под вами яростно дрожит земля, сбивая вас с ног!"))
 
 		for(var/turf/turf_to_quake in underbelly)
 			turf_to_quake.Shake(pixelshiftx = 0.5, pixelshifty = 0.5, duration = 1 SECONDS)
 			for(var/mob/living/carbon/quake_victim in turf_to_quake)
-				to_chat(quake_victim, span_warning("Damn, I wonder what that rumbling noise is?")) ///You're about to find out
+				to_chat(quake_victim, span_warning("Интересно, а что это за грохот?")) ///You're about to find out
 
 	// Step one of the destruction, which clears natural tiles out from the underbelly and does a bit of initial damage to the topside.
 	if(activeFor == end_when - 1)
diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm
index 77fe278d7701c..3eaf38018c9b0 100644
--- a/code/modules/events/electrical_storm.dm
+++ b/code/modules/events/electrical_storm.dm
@@ -15,7 +15,7 @@
 	announce_when = 1
 
 /datum/round_event/electrical_storm/announce(fake)
-	priority_announce("На борту станции зафиксирована электрическая буря. Пожалуйста, устраните потенциальные перегрузки электросетей.", "ВНИМАНИЕ: Электрическая буря")
+	priority_announce("На борту станции зафиксирована электрическая буря. Пожалуйста, устраните потенциальные перегрузки электросетей.", "Электрическая буря")
 
 
 /datum/round_event/electrical_storm/start()
diff --git a/code/modules/events/ghost_role/alien_infestation.dm b/code/modules/events/ghost_role/alien_infestation.dm
index 1c0c938ce89fc..fee4a3704d2e4 100644
--- a/code/modules/events/ghost_role/alien_infestation.dm
+++ b/code/modules/events/ghost_role/alien_infestation.dm
@@ -41,7 +41,7 @@
 			living_aliens = TRUE
 
 	if(living_aliens || fake)
-		priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", ANNOUNCER_ALIENS)
+		priority_announce("Обнаружены неопознанные формы жизни на борту [station_name()]. Обезопасьте все наружные входы и выходы, включая вентиляцию и вытяжки.", "Неопознанные формы жизни", ANNOUNCER_ALIENS)
 
 
 /datum/round_event/ghost_role/alien_infestation/spawn_role()
diff --git a/code/modules/events/ghost_role/blob.dm b/code/modules/events/ghost_role/blob.dm
index 4164d690845c1..79478ad635b6e 100644
--- a/code/modules/events/ghost_role/blob.dm
+++ b/code/modules/events/ghost_role/blob.dm
@@ -24,7 +24,7 @@
 /datum/round_event/ghost_role/blob/announce(fake)
 	if(!fake)
 		return //the mob itself handles this.
-	priority_announce("Вспышка биологической угрозы 5-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение любой ценой!", "ВНИМАНИЕ: Биологическая угроза", ANNOUNCER_OUTBREAK5)
+	priority_announce("Вспышка биологической угрозы 5-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение любой ценой!", "Биологическая угроза", ANNOUNCER_OUTBREAK5)
 
 /datum/round_event/ghost_role/blob/spawn_role()
 	if(!GLOB.blobstart.len)
diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm
index 4017361dba51a..0cb8bdf12a5e5 100644
--- a/code/modules/events/ghost_role/sentience.dm
+++ b/code/modules/events/ghost_role/sentience.dm
@@ -34,19 +34,19 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
 	minimum_required = 1
 	role_name = "random animal"
 	var/animals = 1
-	var/one = "one"
+	var/one = "кто-то"
 	fakeable = TRUE
 
 /datum/round_event/ghost_role/sentience/announce(fake)
 	var/sentience_report = ""
 
-	var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED\]")
-	var/pets = pick("animals/bots", "bots/animals", "pets", "simple animals", "lesser lifeforms", "\[REDACTED\]")
-	var/strength = pick("human", "moderate", "lizard", "security", "command", "clown", "low", "very low", "\[REDACTED\]")
+	var/data = pick("данных со сканеров дальнего действия", "наших сложных вероятностных моделях", "коммуникационном трафике на вашей станции", "обнаруженом всплеске энергии", "\[ДАННЫЕ УДАЛЕНЫ\]")
+	var/pets = pick("животных/ботов", "ботов/животных", "питомцев", "простых животных", "низших форм жизни", "\[ДАННЫЕ УДАЛЕНЫ\]")
+	var/strength = pick("человека", "ящеров", "офицеров службы безопасности", "командования", "клоуна", "\[ДАННЫЕ УДАЛЕНЫ\]")
 
-	sentience_report += "Based on [data], we believe that [one] of the station's [pets] has developed [strength] level intelligence, and the ability to communicate."
+	sentience_report += "Основаваясь на [data], мы думаем что [one] из [pets] обрел(и) уровень интеллекта как у [strength], и возможность общаться."
 
-	priority_announce(sentience_report,"[command_name()] Medium-Priority Update")
+	priority_announce(sentience_report,"[command_name()]: Сообщение со средним приоритетом")
 
 /datum/round_event/ghost_role/sentience/spawn_role()
 	var/list/mob/dead/observer/candidates = SSpolling.poll_ghost_candidates(check_jobban = ROLE_SENTIENCE, role = ROLE_SENTIENCE, alert_pic = /obj/item/slimepotion/slime/sentience, role_name_text = role_name)
@@ -128,6 +128,6 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
 	description = "ALL animals and robots become sentient, provided there is enough ghosts."
 
 /datum/round_event/ghost_role/sentience/all
-	one = "all"
+	one = "все"
 	animals = INFINITY // as many as there are ghosts and animals
 	// cockroach pride, station wide
diff --git a/code/modules/events/ghost_role/space_dragon.dm b/code/modules/events/ghost_role/space_dragon.dm
index 44ca2b6561072..8e5fa1886f5d5 100644
--- a/code/modules/events/ghost_role/space_dragon.dm
+++ b/code/modules/events/ghost_role/space_dragon.dm
@@ -16,7 +16,7 @@
 	announce_when = 10
 
 /datum/round_event/ghost_role/space_dragon/announce(fake)
-	priority_announce("Зафиксирован большой поток органической энергии вблизи станции [station_name()]. Будьте наготове.", "Внимание: неопознанные формы жизни")
+	priority_announce("Зафиксирован большой поток органической энергии вблизи станции [station_name()]. Будьте наготове.", "Неопознанные формы жизни")
 
 /datum/round_event/ghost_role/space_dragon/spawn_role()
 	var/mob/chosen_one = SSpolling.poll_ghost_candidates(check_jobban = ROLE_SPACE_DRAGON, role = ROLE_SPACE_DRAGON, alert_pic = /mob/living/basic/space_dragon, amount_to_pick = 1)
diff --git a/code/modules/events/gravity_generator_blackout.dm b/code/modules/events/gravity_generator_blackout.dm
index 71ea70703b010..9d48f2428d81c 100644
--- a/code/modules/events/gravity_generator_blackout.dm
+++ b/code/modules/events/gravity_generator_blackout.dm
@@ -26,7 +26,7 @@
 	announce_chance = 33
 
 /datum/round_event/gravity_generator_blackout/announce(fake)
-	priority_announce("Гравносферные аномалии обнаружены вблизи [station_name()]. Требуется ручная перезагрузка генераторов гравитации.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_GRANOMALIES)
+	priority_announce("Гравносферные аномалии обнаружены вблизи [station_name()]. Требуется ручная перезагрузка генераторов гравитации.", "Обнаружена аномалия", ANNOUNCER_GRANOMALIES)
 
 /datum/round_event/gravity_generator_blackout/start()
 	for(var/obj/machinery/gravity_generator/main/the_generator as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/gravity_generator/main))
diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm
index e8433c26fd007..b0b975e82badb 100644
--- a/code/modules/events/grid_check.dm
+++ b/code/modules/events/grid_check.dm
@@ -22,7 +22,7 @@
 			CRASH("event started without controller!")
 		if(!COOLDOWN_FINISHED(controller, announcement_spam_protection))
 			return
-	priority_announce("Обнаружена аномальная активность в сети питания [station_name()]. В качестве меры предосторожности питание будет отключено на неопределенный срок.", "ВНИМАНИЕ: Критический сбой системы питания", ANNOUNCER_POWEROFF)
+	priority_announce("Обнаружена аномальная активность в сети питания [station_name()]. В качестве меры предосторожности питание будет отключено на неопределенный срок.", "Критический сбой системы питания", ANNOUNCER_POWEROFF)
 	if(!fake) // Only start the CD if we're real
 		COOLDOWN_START(controller, announcement_spam_protection, 30 SECONDS)
 
diff --git a/code/modules/events/immovable_rod/immovable_rod_event.dm b/code/modules/events/immovable_rod/immovable_rod_event.dm
index 7c618a83a76e7..9fa2ab82cfdd0 100644
--- a/code/modules/events/immovable_rod/immovable_rod_event.dm
+++ b/code/modules/events/immovable_rod/immovable_rod_event.dm
@@ -19,7 +19,7 @@
 	var/force_looping = FALSE
 
 /datum/round_event/immovable_rod/announce(fake)
-	priority_announce("What the fuck was that?!", "General Alert")
+	priority_announce("Что это за хуйня?!", "Общая тревога")
 
 /datum/round_event/immovable_rod/start()
 	var/startside = pick(GLOB.cardinals)
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 790c788d6b67d..822b1de8fed0a 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -27,7 +27,7 @@
 
 /datum/round_event/ion_storm/announce(fake)
 	if(prob(announce_chance) || fake)
-		priority_announce("Вблизи станции обнаружена ионная буря. Пожалуйста, проверьте всё оборудование, управляемое ИИ, на наличие ошибок.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_IONSTORM)
+		priority_announce("Вблизи станции обнаружена ионная буря. Пожалуйста, проверьте всё оборудование, управляемое ИИ, на наличие ошибок.", "Обнаружена аномалия", ANNOUNCER_IONSTORM)
 
 
 /datum/round_event/ion_storm/start()
@@ -106,7 +106,7 @@
 	var/ionallergysev = pick_list(ION_FILE, "ionallergysev")
 	//Species, for when the AI has to commit genocide. Plural.
 	var/ionspecies = pick_list(ION_FILE, "ionspecies")
-	//Abstract concepts for the AI to decide on it's own definition of.
+	//Abstract concepts for the AI to decide on its own definition of.
 	var/ionabstract = pick_list(ION_FILE, "ionabstract")
 	//Foods. Drinks aren't included due to grammar; if you want to add drinks, make a new set
 	//of possible laws for best effect. Unless you want the crew having to drink hamburgers.
diff --git a/code/modules/events/market_crash.dm b/code/modules/events/market_crash.dm
index 3fd9f43cfe069..849082798be6a 100644
--- a/code/modules/events/market_crash.dm
+++ b/code/modules/events/market_crash.dm
@@ -24,11 +24,11 @@
 		"некоторых рискованных результаты на рынке жилья",\
 		"сильно преувеличенных сообщений об \"увольнении\" бухгалтерского состава Нанотрейзен",\
 		"\"огромного вложения\" в \"НФТ\" \"идиотом\"",\
-		"рейдов со стороны агентов Кооператива Тигр",\
+		"рейдов со стороны агентов Кооператива \"Тигр\"",\
 		"сокращения цепочек поставок",\
-		"падения акций социальной сети \"Nanotrasen+\"",\
-		"неудачного успеха социальной сети \"Нанотрейзен+\"",\
-		"эм, невезению, мы полагаем"
+		"падения акций социальной сети \"Нанотрейзен+\"",\
+		"неожиданного успеха социальной сети \"Нанотрейзен+\"",\
+		"неудачного стечения обстоятельств"
 	)
 	var/reason = pick(poss_reasons)
 	priority_announce("Из-за [reason], цены в торговых автоматах на станции будут повышены на короткий период.", "Отдел бухгалтерского учета Нанотрейзен")
diff --git a/code/modules/events/meteors/dark_matteor_event.dm b/code/modules/events/meteors/dark_matteor_event.dm
index 86d38f93e6cca..c73f287f36a07 100644
--- a/code/modules/events/meteors/dark_matteor_event.dm
+++ b/code/modules/events/meteors/dark_matteor_event.dm
@@ -25,7 +25,7 @@
 	spawn_meteor(list(/obj/effect/meteor/dark_matteor = 1), null, target)
 
 /datum/round_event/dark_matteor/announce(fake)
-	priority_announce("Warning. Excessive tampering of meteor satellites has attracted a dark matt-eor. Signature approaching [GLOB.station_name]. Please brace for impact.", "Meteor Alert", 'sound/misc/airraid.ogg')
+	priority_announce("Тревога. Помехи в работе метеоритных спутников привлекли темный маттериор. Объект стремительно приближается к [GLOB.station_name]. Приготовьтесь к столкновению", "Метеоры", 'sound/misc/airraid.ogg')
 
 /datum/event_admin_setup/warn_admin/dark_matteor
 	warning_text = "Dark Matt-eors spawn singularities. The round is ending once a dark matt-eor hits the station. Proceed anyways?"
diff --git a/code/modules/events/meteors/meteor_wave_events.dm b/code/modules/events/meteors/meteor_wave_events.dm
index 8a43af74601ad..10c9ca5922738 100644
--- a/code/modules/events/meteors/meteor_wave_events.dm
+++ b/code/modules/events/meteors/meteor_wave_events.dm
@@ -50,7 +50,7 @@
 			kill()
 
 /datum/round_event/meteor_wave/announce(fake)
-	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", ANNOUNCER_METEORS)
+	priority_announce("Зафиксировано движение метеоритов на встречном со станцией курсе.", "Метеоры", ANNOUNCER_METEORS)
 
 /datum/round_event/meteor_wave/tick()
 	if(ISMULTIPLE(activeFor, 3))
@@ -91,7 +91,7 @@
 	wave_name = "meaty"
 
 /datum/round_event/meteor_wave/meaty/announce(fake)
-	priority_announce("Meaty ores have been detected on collision course with the station.", "Oh crap, get the mop.", ANNOUNCER_METEORS)
+	priority_announce("Зафиксировано движение мясоритов на встречном со станцией курсе.", "Мясориты", ANNOUNCER_METEORS)
 
 /datum/round_event_control/meteor_wave/dust_storm
 	name = "Major Space Dust"
@@ -109,24 +109,22 @@
 /datum/round_event/meteor_wave/dust_storm/announce(fake)
 	var/list/reasons = list()
 
-	reasons += "[station_name()] is passing through a debris cloud, expect minor damage \
-		to external fittings and fixtures."
+	reasons += "[station_name()] проходит через облако обломков, возможны незначительные повреждения \
+		внешнего оборудования."
 
-	reasons += "Nanotrasen Superweapons Division is testing a new prototype \
-		[pick("field","projection","nova","super-colliding","reactive")] \
-		[pick("cannon","artillery","tank","cruiser","\[REDACTED\]")], \
-		some mild debris is expected."
+	reasons += "Отдел эксперементального вооружения Нанотрейзен испытывает новый прототип \
+		[pick("флагманского крейсера", "электромагнитной пушки", "нано-квантового ускорителя", "реактивной артиллерии", "\[ДАННЫЕ УДАЛЕНЫ\]")] \
+		возможны остатки космического мусора."
 
-	reasons += "A neighbouring station is throwing rocks at you. (Perhaps they've \
-		grown tired of your messages.)"
+	reasons += "Зафиксированы незначительные космические обьекты на встречном со станцией курсе."
 
-	reasons += "[station_name()]'s orbit is passing through a cloud of remnants from an asteroid \
-		mining operation. Minor hull damage is to be expected."
+	reasons += "Орбита [station_name()] проходит через остатки астероида после шахтерской выработки. \
+		Ожидаются незначительные повреждения корпуса."
 
-	reasons += "A large meteoroid on intercept course with [station_name()] has been demolished. \
-		Residual debris may impact the station exterior."
+	reasons += "На встречном курсе с [station_name()] был уничтожен крупный метеороид. \
+		Остатки обломков могут повредить обшивку станции."
 
-	reasons += "[station_name()] has hit a particularly rough patch of space. \
-		Please mind any turbulence or damage from debris."
+	reasons += "[station_name()] проходит через опасный участок космоса. \
+		Не обращайте внимания на турбулентность и повреждения от обломков."
 
-	priority_announce(pick(reasons), "Collision Alert")
+	priority_announce(pick(reasons), "Предупреждение о столкновении")
diff --git a/code/modules/events/meteors/stray_meteor_event.dm b/code/modules/events/meteors/stray_meteor_event.dm
index 53daff1ac8a1a..00001857e216f 100644
--- a/code/modules/events/meteors/stray_meteor_event.dm
+++ b/code/modules/events/meteors/stray_meteor_event.dm
@@ -30,7 +30,7 @@
 	if(GLOB.meteor_list)
 		var/obj/effect/meteor/detected_meteor = pick(GLOB.meteor_list) //If we accidentally pick a meteor not spawned by the event, we're still technically not wrong
 		var/sensor_name = detected_meteor.signature
-		priority_announce("Our [sensor_name] sensors have detected an incoming signature approaching [GLOB.station_name]. Please brace for impact.", "Meteor Alert")
+		priority_announce("Наши датчики [sensor_name] обнаружили приближающуюся к [GLOB.station_name] сигнатуру. Приготовьтесь к столкновению.", "Метеоры")
 
 /datum/event_admin_setup/listed_options/stray_meteor
 	input_text = "Select a meteor type?"
diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm
index fd162e272323b..ef15a9a43d6cd 100644
--- a/code/modules/events/mice_migration.dm
+++ b/code/modules/events/mice_migration.dm
@@ -11,13 +11,13 @@
 
 /datum/round_event/mice_migration/announce(fake)
 	var/cause = pick("космозимы", "сокращения бюджета", "Рагнарёка",
-		"того, что космос холодный", "\[УДАЛЕНО\]", "климатических изменений",
+		"того, что космос холодный", "\[ДАННЫЕ УДАЛЕНЫ\]", "климатических изменений",
 		"неудачи")
 	var/plural = pick("кучка", "орда", "стая", "рой", "не более чем [maximum_mice]")
-	var/name = pick("грызунов", "мышей", "сквикеров", "проводоедов", "\[УДАЛЕНО\]", "поглощающих энергию паразитов")
-	var/movement = pick("мигрировала", "зароились", "убежала в панике", "проникла")
+	var/name = pick("грызунов", "мышей", "проводоедов", "\[ДАННЫЕ УДАЛЕНЫ\]", "поглощающих энергию паразитов")
+	var/movement = pick("мигрировала", "зароилась", "убежала в панике", "проникла")
 	var/location = pick("технические тоннели", "технические помещения",
-		"\[УДАЛЕНО\]", "кишащее сочными проводами место")
+		"\[ДАННЫЕ УДАЛЕНЫ\]", "кишащее сочными проводами место")
 
 	priority_announce("Из-за [cause], [plural] [name] [movement] \
 		в [location].", "Оповещение о миграции",
diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm
index c5610bb918563..0b2e18669278f 100644
--- a/code/modules/events/processor_overload.dm
+++ b/code/modules/events/processor_overload.dm
@@ -10,11 +10,11 @@
 	announce_when = 1
 
 /datum/round_event/processor_overload/announce(fake)
-	var/alert = pick("Exospheric bubble inbound. Processor overload is likely. Please contact you*%xp25)`6cq-BZZT",
-		"Exospheric bubble inbound. Processor overload is likel*1eta;c5;'1v¬-BZZZT",
-		"Exospheric bubble inbound. Processor ov#MCi46:5.;@63-BZZZZT",
-		"Exospheric bubble inbo'Fz\\k55_@-BZZZZZT",
-		"Exospheri:%£ QCbyj^j</.3-BZZZZZZT",
+	var/alert = pick("Приближается экзосферный пузырь. Возможна перегрузка процессора. Пожалуйста, свяжитесь с ваши*%xp25)`6cq-BZZT",
+		"Приближается экзосферный пузырь. Возможна перегрузка процl*1eta;c5;'1v¬-BZZZT",
+		"Приближается экзосферный пузырь. Возможна пер#MCi46:5.;@63-BZZZZT",
+		"Приближается экзосферн'Fz\\k55_@-BZZZZZT",
+		"Приближается экз:%£ QCbyj^j</.3-BZZZZZZT",
 		"!!hy%;f3l7e,<$^-BZZZZZZZT",
 	)
 
@@ -26,7 +26,7 @@
 	// whether it's, say, a tesla zapping tcomms, or some selective
 	// modification of the tcomms bus
 	if(prob(80) || fake)
-		priority_announce(alert, "ВНИМАНИЕ: Обнаружена аномалия")
+		priority_announce(alert, "Обнаружена аномалия")
 
 
 /datum/round_event/processor_overload/start()
diff --git a/code/modules/events/radiation_leak.dm b/code/modules/events/radiation_leak.dm
index caa3805eb7c24..2224d8e4161f1 100644
--- a/code/modules/events/radiation_leak.dm
+++ b/code/modules/events/radiation_leak.dm
@@ -71,14 +71,14 @@
 	// The key of this assoc list is the "method" of how they're fixing the thing (just flavor for examine),
 	// and the value is what tool they actually need to use on the thing to fix it
 	var/list/how_do_we_fix_it = list(
-		"wrenching a few valves" = TOOL_WRENCH,
-		"tightening its bolts" = TOOL_WRENCH,
-		"crowbaring its panel [pick("down", "up")]" = TOOL_CROWBAR,
-		"tightening some screws" = TOOL_SCREWDRIVER,
-		"checking its [pick("wires", "circuits")]" = TOOL_MULTITOOL,
-		"welding its panel [pick("open", "shut")]" = TOOL_WELDER,
-		"analyzing its readings" = TOOL_ANALYZER,
-		"cutting some excess wires" = TOOL_WIRECUTTER,
+		"закрутить несколько клапанов" = TOOL_WRENCH,
+		"затянуть болты" = TOOL_WRENCH,
+		"вправить панель ломом" = TOOL_CROWBAR,
+		"затянуть винты" = TOOL_SCREWDRIVER,
+		"проверить [pick("проводку", "микросхемы")]" = TOOL_MULTITOOL,
+		"[pick("разварить", "заварить")] панель" = TOOL_WELDER,
+		"проанализировать показатели" = TOOL_ANALYZER,
+		"обрезать лишние провода" = TOOL_WIRECUTTER,
 	)
 	var/list/fix_it_keys = assoc_to_keys(how_do_we_fix_it) // Returns a copy that we can pick and take from, fortunately
 
@@ -92,14 +92,14 @@
 	for(var/tool_method in methods_to_fix)
 		signals_to_add += COMSIG_ATOM_TOOL_ACT(how_do_we_fix_it[tool_method])
 
-	the_source_of_our_problems.visible_message(span_danger("[the_source_of_our_problems] starts to emanate a horrible green gas!"))
+	the_source_of_our_problems.visible_message(span_danger("[the_source_of_our_problems] начинает испускать ужасный зеленый газ!"))
 	// Add the component that makes the thing radioactive
 	the_source_of_our_problems.AddComponent(
 		/datum/component/radioactive_emitter, \
 		cooldown_time = 2 SECONDS, \
 		range = 5, \
 		threshold = RAD_MEDIUM_INSULATION, \
-		examine_text = span_green("<i>It's emanating a green gas... You could probably stop it by [english_list(methods_to_fix, and_text = " or ")].</i>"), \
+		examine_text = span_green("<i>Оно испускает зеленый газ... Возможно, вы сможете исправить это, если сделаете одно из следующего: [english_list(methods_to_fix, and_text = " или ")].</i>"), \
 	)
 	// Register signals to make it fixable
 	if(length(signals_to_add))
@@ -126,7 +126,7 @@
 	if(!the_end_of_our_problems)
 		return
 
-	the_end_of_our_problems.visible_message(span_notice("The gas emanating from [the_end_of_our_problems] dissipates."))
+	the_end_of_our_problems.visible_message(span_notice("Газ, исходящий от [the_end_of_our_problems] рассеивается."))
 	qdel(the_end_of_our_problems.GetComponent(/datum/component/radioactive_emitter))
 	if(length(signals_to_add))
 		UnregisterSignal(the_end_of_our_problems, signals_to_add)
@@ -157,15 +157,15 @@
 
 /// Attempts a do_after, and if successful, stops the event
 /datum/round_event/radiation_leak/proc/try_remove_radiation(obj/machinery/source, mob/living/user, obj/item/tool)
-	source.balloon_alert(user, "fixing leak...")
+	source.balloon_alert(user, "устраняем протечку...")
 	// Fairly long do after. It shouldn't be SUPER easy to just run in and stop it.
 	// A tider can fix it if they want to soak a bunch of rads and inhale noxious fumes,
 	// but only an equipped engineer should be able to handle it painlessly.
 	if(!tool.use_tool(source, user, 30 SECONDS, amount = (tool.tool_behaviour == TOOL_WELDER ? 2 : 0), volume = 50))
-		source.balloon_alert(user, "interrupted!")
+		source.balloon_alert(user, "прервано!")
 		return
 
-	source.balloon_alert(user, "leak repaired")
+	source.balloon_alert(user, "протечка исправлена")
 	// Force end the event
 	processing = FALSE
 	end()
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index 7fe251e5b9062..a6df97858ea90 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -16,7 +16,7 @@
 	announce_when = 1
 
 /datum/round_event/radiation_storm/announce(fake)
-	priority_announce("Вблизи станции обнаружено радиационное поле высокой интенсивности. Всему персоналу надлежит проследовать в технические тоннели.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_RADIATION)
+	priority_announce("Вблизи станции обнаружено радиационное поле высокой интенсивности. Всему персоналу надлежит проследовать в технические тоннели.", "Обнаружена аномалия", ANNOUNCER_RADIATION)
 	//sound not longer matches the text, but an audible warning is probably good
 
 /datum/round_event/radiation_storm/start()
diff --git a/code/modules/events/sandstorm.dm b/code/modules/events/sandstorm.dm
index 28a5df5d51341..db38265763334 100644
--- a/code/modules/events/sandstorm.dm
+++ b/code/modules/events/sandstorm.dm
@@ -38,19 +38,19 @@
 	var/start_side_text = "unknown"
 	switch(start_side)
 		if(NORTH)
-			start_side_text = "fore"
+			start_side_text = "носа"
 		if(SOUTH)
-			start_side_text = "aft"
+			start_side_text = "кормы"
 		if(EAST)
-			start_side_text = "starboard"
+			start_side_text = "правого борта"
 		if(WEST)
-			start_side_text = "port"
+			start_side_text = "левого борта"
 		else
 			stack_trace("Sandstorm event given [start_side] as unrecognized direction. Cancelling event...")
 			kill()
 			return
 
-	priority_announce("Большая волна космической пыли приближается с [start_side_text] стороны станции. \
+	priority_announce("Большая волна космической пыли приближается с [start_side_text] станции. \
 		Удар ожидается в ближайшие две минуты. Всем сотрудникам рекомендуется по возможности оказать помощь в ремонте и уменьшении ущерба.", "Экстренное оповещение о столкновении")
 
 /datum/round_event/sandstorm/tick()
diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm
index ed64c52a836a7..7c9b1954fd8a0 100644
--- a/code/modules/events/shuttle_catastrophe.dm
+++ b/code/modules/events/shuttle_catastrophe.dm
@@ -24,18 +24,18 @@
 	var/datum/map_template/shuttle/new_shuttle
 
 /datum/round_event/shuttle_catastrophe/announce(fake)
-	var/cause = pick("was attacked by [syndicate_name()] Operatives", "mysteriously teleported away", "had its refuelling crew mutiny",
-		"was found with its engines stolen", "\[REDACTED\]", "flew into the sunset, and melted", "learned something from a very wise cow, and left on its own",
-		"had cloning devices on it", "had its shuttle inspector put the shuttle in reverse instead of park, causing the shuttle to crash into the hangar")
-	var/message = "Your emergency shuttle [cause]. "
+	var/cause = pick("был атакован оперативниками [syndicate_name()]", "странным образом телепортировался в неизвестность", "лишился обслуживающего персонала из-за забастовки",
+		"лишился двигателей", "\[ДАННЫЕ УДАЛЕНЫ\]", "сбился с курса и сгорел вблизи звезды",
+		"был оборудовон устройством клонирования", "разбился об ангар при посадке")
+	var/message = "Ваш эвакуационный шаттл [cause]. "
 
 	if(SSshuttle.shuttle_insurance)
-		message += "Luckily, your shuttle insurance has covered the costs of repair!"
+		message += "К счастью, страховка вашего шаттла покрыла расходы на ремонт!"
 		if(SSeconomy.get_dep_account(ACCOUNT_CAR))
-			message += " You have been awarded a bonus from [command_name()] for smart spending."
+			message += " Вы получили премию от [command_name()] за умение распоряжаться финансами."
 	else
-		message += "Your replacement shuttle will be the [new_shuttle.name] until further notice."
-	priority_announce(message, "[command_name()] Spacecraft Engineering")
+		message += "На замену будет выслан [new_shuttle.name] до новых указаний."
+	priority_announce(message, "[command_name()]: Отдел проектирования космических кораблей")
 
 /datum/round_event/shuttle_catastrophe/setup()
 	if(SSshuttle.shuttle_insurance || !isnull(new_shuttle)) //If an admin has overridden it don't re-roll it
diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm
index 4442291a9ed9a..0e42b9ecfbd9b 100644
--- a/code/modules/events/shuttle_insurance.dm
+++ b/code/modules/events/shuttle_insurance.dm
@@ -28,7 +28,7 @@
 	var/insurance_evaluation = 0
 
 /datum/round_event/shuttle_insurance/announce(fake)
-	priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound())
+	priority_announce("Входящий подпространственный вызов. Защищенный канал открыт на всех коммуникационных консолях.", "Входящее сообщение", SSstation.announcer.get_rand_report_sound())
 
 /datum/round_event/shuttle_insurance/setup()
 	ship_name = pick(strings(PIRATE_NAMES_FILE, "rogue_names"))
@@ -41,18 +41,18 @@
 		insurance_evaluation = 5000 //gee i dunno
 
 /datum/round_event/shuttle_insurance/start()
-	insurance_message = new("Shuttle Insurance", "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [insurance_evaluation] to cover for your shuttle in case of any disaster.", list("Purchase Insurance.","Reject Offer."))
+	insurance_message = new("Страховка шаттла", "Привет, приятель, говорит капитан судна [ship_name]. Не могу не заметить, что у тебя там дикий и сумасшедший шаттл БЕЗ СТРАХОВКИ! Безумие! А что, если с ним что-нибудь случится?! Мы провели быструю оценку тарифов в этом секторе и возьмем всего [insurance_evaluation] за страховку вашего шаттла в случае любой катастрофы.", list("Приобрести страховку.","Отклонить предложение."))
 	insurance_message.answer_callback = CALLBACK(src, PROC_REF(answered))
 	GLOB.communications_controller.send_message(insurance_message, unique = TRUE)
 
 /datum/round_event/shuttle_insurance/proc/answered()
 	if(EMERGENCY_AT_LEAST_DOCKED)
-		priority_announce("You are definitely too late to purchase insurance, my friends. Our agents don't work on site.",sender_override = ship_name, color_override = "red")
+		priority_announce("Друзья, вы опоздали с покупкой страховки. Наши агенты уже покинули ваш сектор.",sender_override = ship_name, color_override = "red")
 		return
 	if(insurance_message && insurance_message.answered == 1)
 		var/datum/bank_account/station_balance = SSeconomy.get_dep_account(ACCOUNT_CAR)
 		if(!station_balance?.adjust_money(-insurance_evaluation))
-			priority_announce("You didn't send us enough money for shuttle insurance. This, in the space layman's terms, is considered scamming. We're keeping your money, scammers!", sender_override = ship_name, color_override = "red")
+			priority_announce("Вы не прислали нам достаточно денег за страховку шаттла. На языке космических дилетантов это считается мошенничеством. Мы оставим ваши деньги себе, мошенники!", sender_override = ship_name, color_override = "red")
 			return
-		priority_announce("Thank you for purchasing shuttle insurance!", sender_override = ship_name, color_override = "red")
+		priority_announce("Благодарим вас за покупку страховки для шаттла!", sender_override = ship_name, color_override = "red")
 		SSshuttle.shuttle_insurance = TRUE
diff --git a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
index 706274dfd85bf..75515f290295f 100644
--- a/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
+++ b/code/modules/events/shuttle_loan/shuttle_loan_datum.dm
@@ -1,7 +1,7 @@
 /// One of the potential shuttle loans you might receive.
 /datum/shuttle_loan_situation
 	/// Who sent the shuttle
-	var/sender = "Centcom"
+	var/sender = "Центральное Командование"
 	/// What they said about it.
 	var/announcement_text = "Unset announcement text"
 	/// What the shuttle says about it.
@@ -9,7 +9,7 @@
 	/// Supply points earned for taking the deal.
 	var/bonus_points = CARGO_CRATE_VALUE * 50
 	/// Response for taking the deal.
-	var/thanks_msg = "The cargo shuttle should return in five minutes. Have some supply points for your trouble."
+	var/thanks_msg = "Грузовой шаттл должен вернуться через пять минут. За ваши хлопоты будут начислены бонусные очки снабжения."
 	/// Small description of the loan for easier log reading.
 	var/logging_desc
 
@@ -26,9 +26,9 @@
 	CRASH("Unimplemented get_spawned_items() on [src.type].")
 
 /datum/shuttle_loan_situation/antidote
-	sender = "CentCom Research Initiatives"
-	announcement_text = "Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples."
-	shuttle_transit_text = "Virus samples incoming."
+	sender = "Центральное Командование: Научно-исследовательский центр"
+	announcement_text = "Ваша станция была выбрана для проведения эпидемиологического исследования. Пришлите нам свой грузовой шаттл, чтобы получить образцы для исследования."
+	shuttle_transit_text = "Орбразцы вирусов в пути."
 	logging_desc = "Virus shuttle"
 
 /datum/shuttle_loan_situation/antidote/spawn_items(list/spawn_list, list/empty_shuttle_turfs, list/blocked_shutte_turfs)
@@ -51,10 +51,10 @@
 	spawn_list.Add(/obj/item/reagent_containers/cup/bottle/magnitis)
 
 /datum/shuttle_loan_situation/department_resupply
-	sender = "CentCom Supply Department"
-	announcement_text = "Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?"
-	shuttle_transit_text = "Department resupply incoming."
-	thanks_msg = "The cargo shuttle should return in five minutes."
+	sender = "Центральное Командование: Отдел снабжения"
+	announcement_text = "Кажется, в этом месяце мы заказали в два раза больше пакетов пополнения для нашего отдела. Мы можем отправить их вам?"
+	shuttle_transit_text = "Пополнение для департаментов в пути."
+	thanks_msg = "Грузовой шаттл должен вернуться через пять минут."
 	bonus_points = 0
 	logging_desc = "Resupply packages"
 
@@ -79,9 +79,9 @@
 		new decal(pick_n_take(empty_shuttle_turfs))
 
 /datum/shuttle_loan_situation/syndiehijacking
-	sender = "CentCom Counterintelligence"
-	announcement_text = "The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache."
-	shuttle_transit_text = "Syndicate hijack team incoming."
+	sender = "Центральное Командование: Контрразведка"
+	announcement_text = "Синдикат пытается проникнуть на вашу станцию. Если вы позволите им захватить ваш грузовой шаттл, вы избавите нас от головной боли."
+	shuttle_transit_text = "Команда захвата Синдиката в пути."
 	logging_desc = "Syndicate boarding party"
 
 /datum/shuttle_loan_situation/syndiehijacking/spawn_items(list/spawn_list, list/empty_shuttle_turfs, list/blocked_shutte_turfs)
@@ -96,9 +96,9 @@
 		spawn_list.Add(/mob/living/basic/trooper/syndicate/ranged/infiltrator)
 
 /datum/shuttle_loan_situation/lots_of_bees
-	sender = "CentCom Janitorial Division"
-	announcement_text = "One of our freighters carrying a bee shipment has been attacked by eco-terrorists. Can you clean up the mess for us?"
-	shuttle_transit_text = "Biohazard cleanup incoming."
+	sender = "Центральное Командование: Отдел по уборке"
+	announcement_text = "Один из наших грузовых кораблей, перевозивший груз пчел, подвергся нападению экотеррористов. Вы можете навести порядок?"
+	shuttle_transit_text = "Зараженный шаттл в пути."
 	bonus_points = CARGO_CRATE_VALUE * 100 //Toxin bees can be unbeelievably lethal
 	logging_desc = "Shuttle full of bees"
 
@@ -131,10 +131,10 @@
 		new casing(pick_n_take(empty_shuttle_turfs))
 
 /datum/shuttle_loan_situation/jc_a_bomb
-	sender = "CentCom Security Division"
-	announcement_text = "We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it."
-	shuttle_transit_text = "Live explosive ordnance incoming. Exercise extreme caution."
-	thanks_msg = "Live explosive ordnance incoming via supply shuttle. Evacuating cargo bay is recommended."
+	sender = "Отдел безопасности Центрального Командования"
+	announcement_text = "Мы обнаружили активированную бомбу Синдиката рядом с топливопроводами нашего ВИП-шаттла. Если вы справитесь с задачей, мы заплатим вам за ее обезвреживание."
+	shuttle_transit_text = "Заминированный шаттл в пути. Соблюдайте предельную осторожность."
+	thanks_msg = "На шаттле находится бомба. Рекомендуется эвакуировать отдел снабжения."
 	bonus_points = CARGO_CRATE_VALUE * 225 //If you mess up, people die and the shuttle gets turned into swiss cheese
 	logging_desc = "Shuttle with a ticking bomb"
 
@@ -146,10 +146,10 @@
 		spawn_list.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase)
 
 /datum/shuttle_loan_situation/papers_please
-	sender = "CentCom Paperwork Division"
-	announcement_text = "A neighboring station needs some help handling some paperwork. Could you help process it for us?"
-	shuttle_transit_text = "Paperwork incoming."
-	thanks_msg = "The cargo shuttle should return in five minutes. Payment will be rendered when the paperwork is processed and returned."
+	sender = "Центральное Командование: Отдел бюрократии"
+	announcement_text = "Соседней станции нужна помощь с документами. Не могли бы вы помочь нам с оформлением?"
+	shuttle_transit_text = "Документы в пути."
+	thanks_msg = "Грузовой шаттл должен вернуться через пять минут. Оплата будет произведена после оформления и возвращения документов."
 	bonus_points = 0 //Payout is made when the stamped papers are returned
 	logging_desc = "Paperwork shipment"
 
@@ -157,10 +157,10 @@
 	spawn_list += subtypesof(/obj/item/paperwork) - typesof(/obj/item/paperwork/photocopy) - typesof(/obj/item/paperwork/ancient)
 
 /datum/shuttle_loan_situation/pizza_delivery
-	sender = "CentCom Spacepizza Division"
-	announcement_text = "It looks like a neighbouring station accidentally delivered their pizza to you instead."
-	shuttle_transit_text = "Pizza delivery!"
-	thanks_msg = "The cargo shuttle should return in five minutes."
+	sender = "Центральное Командование: Отдел космопиццы"
+	announcement_text = "Похоже, что соседняя станция случайно доставила вам свою пиццу."
+	shuttle_transit_text = "Доставка пиццы!"
+	thanks_msg = "Грузовой шаттл должен вернуться через пять минут."
 	bonus_points = 0
 	logging_desc = "Pizza delivery"
 
@@ -171,9 +171,9 @@
 		spawn_list.Add(pick(prob(5) ? naughtypizza : nicepizza))
 
 /datum/shuttle_loan_situation/russian_party
-	sender = "CentCom Russian Outreach Program"
-	announcement_text = "A group of angry Russians want to have a party. Can you send them your cargo shuttle then make them disappear?"
-	shuttle_transit_text = "Partying Russians incoming."
+	sender = "Центральное Командование: Программа по работе с русскими"
+	announcement_text = "Группа злых русских хочет устроить вечеринку. Сможете ли вы отправить им свой грузовой шаттл, а затем избавиться от них?"
+	shuttle_transit_text = "Пьяные русские уже в пути."
 	logging_desc = "Russian party squad"
 
 /datum/shuttle_loan_situation/russian_party/spawn_items(list/spawn_list, list/empty_shuttle_turfs, list/blocked_shutte_turfs)
@@ -189,9 +189,9 @@
 		spawn_list.Add(/mob/living/basic/bear/russian)
 
 /datum/shuttle_loan_situation/spider_gift
-	sender = "CentCom Diplomatic Corps"
-	announcement_text = "The Spider Clan has sent us a mysterious gift. Can we ship it to you to see what's inside?"
-	shuttle_transit_text = "Spider Clan gift incoming."
+	sender = "Центральное Командование: Дипломатический корпус"
+	announcement_text = "Клан Паука прислал нам таинственный подарок. Можем ли мы отправить его вам, чтобы вы посмотрели, что внутри?"
+	shuttle_transit_text = "Подарок от Клана Паука в пути."
 	logging_desc = "Shuttle full of spiders"
 
 /datum/shuttle_loan_situation/spider_gift/spawn_items(list/spawn_list, list/empty_shuttle_turfs, list/blocked_shutte_turfs)
@@ -227,11 +227,11 @@
  * It sends back a lot of mail to the station, at the cost of wrecking the cargo shuttle a little.
  */
 /datum/shuttle_loan_situation/mail_strike
-	sender = "Spinward Mail Workers Union"
-	announcement_text = "The Mail Workers Union wants to borrow your cargo shuttle to employ \"advanced union strike tactics\" with. Payment is strictly in mails."
+	sender = "Профсоюз почтовых рабочих \"Спинворд\""
+	announcement_text = "Профсоюз почтовых рабочих хочет одолжить ваш грузовой шаттл, чтобы применить на нем \"продвинутую тактику профсоюзных забастовок\". Оплата письмами."
 	bonus_points = 0
-	thanks_msg = "The cargo shuttle should return in five minutes."
-	shuttle_transit_text = "Nothing stops the mail."
+	thanks_msg = "Грузовой шаттл должен вернуться через пять минут."
+	shuttle_transit_text = "Почту не оставить!"
 	logging_desc = "Shuttle full of shady mail"
 
 /datum/shuttle_loan_situation/mail_strike/spawn_items(list/spawn_list, list/empty_shuttle_turfs, list/blocked_shutte_turfs)
diff --git a/code/modules/events/shuttle_loan/shuttle_loan_event.dm b/code/modules/events/shuttle_loan/shuttle_loan_event.dm
index c3fa0770c1da9..97244230ac126 100644
--- a/code/modules/events/shuttle_loan/shuttle_loan_event.dm
+++ b/code/modules/events/shuttle_loan/shuttle_loan_event.dm
@@ -45,13 +45,13 @@
 		situation = new fake_situation
 	else
 		SSshuttle.shuttle_loan = src
-	priority_announce("Cargo: [situation.announcement_text]", situation.sender)
+	priority_announce("Отдел снабжения: [situation.announcement_text]", situation.sender)
 	if(fake)
 		qdel(situation)
 
 
 /datum/round_event/shuttle_loan/proc/loan_shuttle()
-	priority_announce(situation.thanks_msg, "Cargo shuttle commandeered by [command_name()].")
+	priority_announce(situation.thanks_msg, "Грузовой шаттл под командованием [command_name()].")
 
 	dispatched = TRUE
 	var/datum/bank_account/dep_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index ab518fd3af11c..6dceccfefa384 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -18,7 +18,7 @@
 	announce_when = rand(announce_when, announce_when + 50)
 
 /datum/round_event/spider_infestation/announce(fake)
-	priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", ANNOUNCER_ALIENS)
+	priority_announce("Обнаружены неопознанные формы жизни на борту [station_name()]. Обезопасьте все наружные входы и выходы, включая вентиляцию и вытяжки.", "Неопознанные формы жизни", ANNOUNCER_ALIENS)
 
 /datum/round_event/spider_infestation/start()
 	create_midwife_eggs(spawncount)
diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm
index 274d45aa7ca8c..7a33ba9899057 100644
--- a/code/modules/events/stray_cargo.dm
+++ b/code/modules/events/stray_cargo.dm
@@ -42,7 +42,7 @@
 /datum/round_event/stray_cargo/announce(fake)
 	if(fake)
 		impact_area = find_event_area()
-	priority_announce("Stray cargo pod detected on long-range scanners. Expected location of impact: [impact_area.name].", "Collision Alert")
+	priority_announce("Бродячая грузовая капсула обнаружена на сканерах дальнего действия. Ожидаемое место падения: [impact_area.name].", "Предупреждение о столкновении")
 
 /**
 * Tries to find a valid area, throws an error if none are found
@@ -183,5 +183,5 @@
 ///Apply the syndicate pod skin
 /datum/round_event/stray_cargo/syndicate/make_pod()
 	var/obj/structure/closet/supplypod/S = new
-	S.setStyle(STYLE_SYNDICATE)
+	S.setStyle(/datum/pod_style/syndicate)
 	return S
diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm
index 6c790c84f8d7e..35d40f95b4a2b 100644
--- a/code/modules/events/supermatter_surge.dm
+++ b/code/modules/events/supermatter_surge.dm
@@ -91,7 +91,8 @@
 	end_when = rand(SURGE_DURATION_MIN, SURGE_DURATION_MAX)
 
 /datum/round_event/supermatter_surge/announce(fake)
-	priority_announce("The Crystal Integrity Monitoring System has detected unusual atmospheric properties in the supermatter chamber, energy output from the supermatter crystal has increased significantly. Engineering intervention is required to stabilize the engine.", "Class [surge_class] Supermatter Surge Alert", 'sound/machines/engine_alert3.ogg')
+	var/class_to_announce = fake ? pick(1, 2, 3, 4) : surge_class
+	priority_announce("Система мониторинга целостности кристала обнаружила необычные атмосферные параметры в камере суперматерии, выходная мощность кристалла суперматерии значительно увеличилась. Требуется инженерное вмешательство для стабилизации работы двигателя.", "Всплеск суперматерии класса [class_to_announce]", 'sound/machines/engine_alert3.ogg')
 
 /datum/round_event/supermatter_surge/start()
 	engine.bullet_energy = surge_class + SURGE_BULLET_ENERGY_ADDITION
@@ -99,7 +100,6 @@
 	sm_gas.heat_power_generation = (surge_class * SURGE_POWER_GENERATION_MODIFIER) - 1
 	sm_gas.heat_modifier = (surge_class * SURGE_HEAT_MODIFIER) - 1
 
-
 /datum/round_event/supermatter_surge/end()
 	engine.bullet_energy = initial(engine.bullet_energy)
 	sm_gas.powerloss_inhibition = initial(sm_gas.powerloss_inhibition)
@@ -126,7 +126,7 @@
 	fakeable = FALSE
 
 /datum/round_event/supermatter_surge/poly/announce(fake)
-	priority_announce("The Crystal Integrity Monitoring System has detected unusual parrot type resonance in the supermatter chamber, energy output from the supermatter crystal has increased significantly. Engineering intervention is required to stabilize the engine.", "Class P Supermatter Surge Alert", 'sound/machines/engine_alert3.ogg')
+	priority_announce("Система мониторинга целостности кристала обнаружила необычный резонанс типа «попугай» в камере суперматерии, выходная мощность кристалла суперматерии значительно увеличилась. Требуется инженерное вмешательство для стабилизации работы двигателя.", "Всплеск суперматерии класса По", 'sound/machines/engine_alert3.ogg')
 
 #undef SURGE_DURATION_MIN
 #undef SURGE_DURATION_MAX
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index a263059fa7211..c545f5414a3a5 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -38,7 +38,7 @@
 
 /datum/round_event/vent_clog/announce(fake)
 	var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent)
-	priority_announce("Minor biological obstruction detected in the ventilation network. Blockage is believed to be in the [event_area].", "Custodial Notification")
+	priority_announce("Обнаружено незначительное биологическое препятствие в вентиляции. Предполагается, что засор находится в [event_area].", "Оповещение о загрязнении")
 
 /datum/round_event/vent_clog/setup()
 	vent = get_vent()
@@ -230,7 +230,7 @@
 
 /datum/round_event/vent_clog/major/announce(fake)
 	var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent)
-	priority_announce("Major biological obstruction detected in the ventilation network. Blockage is believed to be in the [event_area] area.", "Infestation Alert")
+	priority_announce("Обнаружено значительное биологическое препятствие в вентиляции. Предполагается, что засор находится в [event_area].", "Заражение вредителями")
 
 /datum/round_event_control/vent_clog/critical
 	name = "Ventilation Clog: Critical"
@@ -254,7 +254,7 @@
 
 /datum/round_event/vent_clog/critical/announce(fake)
 	var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent)
-	priority_announce("Potentially hazardous lifesigns detected in the [event_area] ventilation network.", "Security Alert")
+	priority_announce("Потенциально опасные формы жизни обнаружены в вентиляции [event_area].", "Отчет о безопасности")
 
 /datum/round_event/vent_clog/critical/get_mob()
 	var/static/list/mob_list = list(
@@ -287,7 +287,7 @@
 
 /datum/round_event/vent_clog/strange/announce(fake)
 	var/area/event_area = fake ? pick(GLOB.teleportlocs) : get_area_name(vent)
-	priority_announce("Unusual lifesign readings detected in the [event_area] ventilation network.", "Lifesign Alert", ANNOUNCER_ALIENS)
+	priority_announce("Обнаружены необычные формы жизни в вентиляции [event_area].", "Неопознанные формы жизни", ANNOUNCER_ALIENS)
 
 /datum/round_event/vent_clog/strange/get_mob()
 	var/static/list/mob_list = list(
diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm
index fbe824c06e6b7..7866a1bbe70a4 100644
--- a/code/modules/events/wisdomcow.dm
+++ b/code/modules/events/wisdomcow.dm
@@ -23,7 +23,7 @@
 	var/datum/reagent/forced_reagent_type
 
 /datum/round_event/wisdomcow/announce(fake)
-	priority_announce("A wise cow has been spotted in the area. Be sure to ask for her advice.", "Nanotrasen Cow Ranching Agency")
+	priority_announce("В окрестностях станции была замечена мудрая корова. Не забудьте спросить у нее совета.", "Агентство по разведению коров Нанотрейзен")
 
 /datum/round_event/wisdomcow/start()
 	var/turf/targetloc
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index 30659ef51c056..069136c11c17e 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to
 		playsound(T, SFX_PORTAL_CREATED, 20, TRUE, SILENCED_SOUND_EXTRARANGE) // much much quieter
 
 /datum/round_event/wormholes/announce(fake)
-	priority_announce("Space-time anomalies detected on the station. There is no additional data.", "ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_SPANOMALIES)
+	priority_announce("Зафиксированы пространственно-временные аномалии на борту станции. Дополнительная информация отсутствует.", "Обнаружена аномалия", ANNOUNCER_SPANOMALIES)
 
 /datum/round_event/wormholes/tick()
 	if(activeFor % shift_frequency == 0)
diff --git a/code/modules/fishing/admin.dm b/code/modules/fishing/admin.dm
index 0a9cfc9d51dd9..ba5c29a7fd172 100644
--- a/code/modules/fishing/admin.dm
+++ b/code/modules/fishing/admin.dm
@@ -48,7 +48,7 @@ ADMIN_VERB(fishing_calculator, R_DEBUG, "Fishing Calculator", "A calculator... f
 			if(hook_type)
 				temporary_rod.set_slot(new hook_type(temporary_rod), ROD_SLOT_HOOK)
 			if(line_type)
-				temporary_rod.set_slot(new line_type(temporary_rod), ROD_SLOT_HOOK)
+				temporary_rod.set_slot(new line_type(temporary_rod), ROD_SLOT_LINE)
 
 			var/result_table = list()
 			var/modified_table = spot.get_modified_fish_table(temporary_rod,user)
diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm
index cd05d0bd34baf..5afbf4b72d9a9 100644
--- a/code/modules/fishing/aquarium/aquarium.dm
+++ b/code/modules/fishing/aquarium/aquarium.dm
@@ -13,7 +13,7 @@
 	name = "aquarium"
 	desc = "A vivarium in which aquatic fauna and flora are usually kept and displayed."
 	density = TRUE
-	anchored = TRUE
+	anchored = FALSE
 
 	icon = 'icons/obj/aquarium/tanks.dmi'
 	icon_state = "aquarium_map"
@@ -35,17 +35,17 @@
 	var/last_feeding
 
 	/// Can fish reproduce in this quarium.
-	var/allow_breeding = FALSE
+	var/allow_breeding = TRUE
 
 	//This is the area where fish can swim
 	var/aquarium_zone_min_px = 2
 	var/aquarium_zone_max_px = 31
 	var/aquarium_zone_min_py = 10
-	var/aquarium_zone_max_py = 24
+	var/aquarium_zone_max_py = 28
 
 	var/list/fluid_types = list(AQUARIUM_FLUID_SALTWATER, AQUARIUM_FLUID_FRESHWATER, AQUARIUM_FLUID_SULPHWATEVER, AQUARIUM_FLUID_AIR)
 
-	var/panel_open = TRUE
+	var/panel_open = FALSE
 
 	///Current layers in use by aquarium contents
 	var/list/used_layers = list()
@@ -64,7 +64,7 @@
 	RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked))
 	create_reagents(6, SEALED_CONTAINER)
 	RegisterSignal(reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
-	AddComponent(/datum/component/plumbing/aquarium)
+	AddComponent(/datum/component/plumbing/aquarium, start = anchored)
 	if(current_beauty)
 		AddElement(/datum/element/beauty, current_beauty)
 	ADD_KEEP_TOGETHER(src, INNATE_TRAIT)
@@ -390,6 +390,9 @@
 #undef AQUARIUM_BORDERS_LAYER
 #undef AQUARIUM_BELOW_GLASS_LAYER
 
+/obj/structure/aquarium/lawyer
+	anchored = TRUE
+
 /obj/structure/aquarium/lawyer/Initialize(mapload)
 	. = ..()
 
@@ -400,6 +403,9 @@
 
 	reagents.add_reagent(/datum/reagent/consumable/nutriment, 2)
 
+/obj/structure/aquarium/prefilled
+	anchored = TRUE
+
 /obj/structure/aquarium/prefilled/Initialize(mapload)
 	. = ..()
 
diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm
index 2038f1960f903..f59f1901b8563 100644
--- a/code/modules/fishing/aquarium/fish_analyzer.dm
+++ b/code/modules/fishing/aquarium/fish_analyzer.dm
@@ -20,14 +20,8 @@
 	greyscale_config_worn = /datum/greyscale_config/fish_analyzer_worn
 	///The color of the case. Used by grayscale configs and update_overlays()
 	var/case_color
-	/**
-	 * The radial menu shown when analyzing aquariums. Having a persistent one allows us
-	 * to update it whenever fish come and go, and is also required since we have a select callback
-	 * used to check right clicks for scanning traits instead of status.
-	 */
-	var/datum/radial_menu/persistent/fish_menu
-	/// A cached list of the current choices for the aforedefined radial menu.
-	var/list/radial_choices
+	///the item we have scanned
+	var/datum/weakref/scanned_item
 
 /obj/item/fish_analyzer/Initialize(mapload)
 	case_color = rgb(rand(16, 255), rand(16, 255), rand(16, 255))
@@ -47,11 +41,6 @@
 	register_item_context()
 	update_appearance()
 
-/obj/item/fish_analyzer/Destroy()
-	if(fish_menu)
-		QDEL_NULL(fish_menu)
-	radial_choices = null
-	return ..()
 
 /obj/item/fish_analyzer/examine(mob/user)
 	. = ..()
@@ -68,190 +57,82 @@
 	. += case
 	. += emissive_appearance(icon, "fish_analyzer_emissive", src)
 
-/obj/item/fish_analyzer/add_item_context(obj/item/source, list/context, atom/target)
-	if (isfish(target))
-		context[SCREENTIP_CONTEXT_LMB] = "Analyze status"
-		context[SCREENTIP_CONTEXT_RMB] = "Analyze traits"
-		return CONTEXTUAL_SCREENTIP_SET
-	else if(isaquarium(target))
-		context[SCREENTIP_CONTEXT_LMB] = "Open radial menu"
-		return CONTEXTUAL_SCREENTIP_SET
-	return NONE
-
 /obj/item/fish_analyzer/interact_with_atom(atom/target, mob/living/user, list/modifiers)
 	if(!isfish(target) && !isaquarium(target))
 		return NONE
 	if(!user.can_read(src) || user.is_blind())
 		return ITEM_INTERACT_BLOCKING
 
-	if(isfish(target))
-		balloon_alert(user, "analyzing stats")
-		user.visible_message(span_notice("[user] analyzes [target]."), span_notice("You analyze [target]."))
-		analyze_status(target, user)
-	else if(istype(target, /obj/structure/aquarium))
-		scan_aquarium(target, user)
-	return ITEM_INTERACT_SUCCESS
-
-/obj/item/fish_analyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
-	if(!isfish(interacting_with))
-		return NONE
-	if(!user.can_read(src) || user.is_blind())
-		return ITEM_INTERACT_BLOCKING
-
-	balloon_alert(user, "analyzing traits")
-	analyze_traits(interacting_with, user)
-	return ITEM_INTERACT_SUCCESS
-
-///Instantiates the radial menu, populates the list of choices, shows it and register signals on the aquarium.
-/obj/item/fish_analyzer/proc/scan_aquarium(obj/structure/aquarium/aquarium, mob/user)
-	if(fish_menu)
-		balloon_alert(user, "already scanning")
-		return
-	var/list/fishes = aquarium.get_fishes()
-	if(!length(fishes))
-		balloon_alert(user, "no fish to scan")
-		return
-	radial_choices = list()
-	for(var/obj/item/fish/fish as anything in fishes)
-		radial_choices(fish)
-	fish_menu = show_radial_menu_persistent(user, aquarium, radial_choices, select_proc = CALLBACK(src, PROC_REF(choice_selected), user, aquarium), tooltips = TRUE, custom_check = CALLBACK(src, PROC_REF(can_select_fish), user, aquarium))
-	RegisterSignal(aquarium, COMSIG_ATOM_ABSTRACT_ENTERED, PROC_REF(on_aquarium_entered))
-	RegisterSignal(aquarium, COMSIG_ATOM_ABSTRACT_EXITED, PROC_REF(on_aquarium_exited))
-	RegisterSignal(aquarium, COMSIG_QDELETING, PROC_REF(delete_radial))
-
-///Instantiates a radial menu choice datum for the current fish and adds it to the list of choices.
-/obj/item/fish_analyzer/proc/radial_choices(obj/item/fish/fish)
-	var/datum/radial_menu_choice/menu_choice = new
-	menu_choice.name = fish.name
-	menu_choice.info = "[fish.status == FISH_ALIVE ? "Alive" : "Dead"]\n[fish.size] cm\n[fish.weight] g\nProgenitors: [fish.progenitors]\nRight-click to analyze traits"
-	var/mutable_appearance/fish_appearance = new(fish)
-	fish_appearance.layer =  FLOAT_LAYER
-	fish_appearance.plane = FLOAT_PLANE
-	menu_choice.image = fish_appearance
-	radial_choices[fish] = menu_choice
-
-///Called when the user has selected a choice. If it's a right click, analyze the traits, else the status
-/obj/item/fish_analyzer/proc/choice_selected(mob/user, obj/structure/aquarium/aquarium, obj/item/fish/choice, params)
-	if(!choice || !can_select_fish(user, aquarium))
-		delete_radial(aquarium)
-		return
-	var/is_right_clicking = LAZYACCESS(params2list(params), RIGHT_CLICK)
-	user.visible_message(span_notice("[user] analyzes [choice] inside [aquarium]."), span_notice("You analyze [choice] inside [aquarium]."))
-	if(is_right_clicking)
-		analyze_traits(choice, user)
-	else
-		analyze_status(choice, user)
-
-///Whether the item should continue to show its radial menu or delete it.
-/obj/item/fish_analyzer/proc/can_select_fish(mob/user, obj/structure/aquarium/aquarium)
-	if(!user.is_holding(src) || !user?.CanReach(aquarium) || IS_DEAD_OR_INCAP(user))
-		delete_radial(aquarium)
-		return FALSE
-	return TRUE
-
-///Called when something enters the aquarium. If it's a fish, update the choices.
-/obj/item/fish_analyzer/proc/on_aquarium_entered(obj/structure/aquarium/source, atom/movable/arrived)
-	SIGNAL_HANDLER
-	if(isfish(arrived))
-		radial_choices(arrived)
-		fish_menu.change_choices(radial_choices, tooltips = TRUE, animate = TRUE)
-
-///Called when something exits the aquarium. If it's a fish, update the choices.
-/obj/item/fish_analyzer/proc/on_aquarium_exited(obj/structure/aquarium/source, atom/movable/gone)
-	SIGNAL_HANDLER
-	if(!isfish(gone))
-		return
-	radial_choices -= gone
-	if(!length(radial_choices))
-		delete_radial(source)
-		return
-	fish_menu.change_choices(radial_choices, tooltips = TRUE, animate = TRUE)
+	if(isfish(target) || istype(target, /obj/structure/aquarium))
+		scanned_item = WEAKREF(target)
+		ui_interact(user)
+		return ITEM_INTERACT_SUCCESS
 
-///Unregisters signals, delete the radial menu, unsets the choices.
-/obj/item/fish_analyzer/proc/delete_radial(obj/structure/aquarium/source)
-	SIGNAL_HANDLER
-	UnregisterSignal(source, list(COMSIG_ATOM_ABSTRACT_EXITED, COMSIG_ATOM_ABSTRACT_ENTERED, COMSIG_QDELETING))
-	QDEL_NULL(fish_menu)
-	radial_choices = null
-
-/**
- * Called when a fish or a menu choice is left-clicked.
- * This returns the fish's status, size, weight, feed type, hunger, breeding timeout.
- */
-/obj/item/fish_analyzer/proc/analyze_status(obj/item/fish/fish, mob/user)
-
-	// the final list of strings to render
-	var/render_list = list()
-
-	var/fish_status = fish.status == FISH_DEAD ? span_alert("<b>Deceased</b>") : "<b>[PERCENT(fish.health/initial(fish.health))]% healthy</b>"
-
-	render_list += "[span_info("Analyzing status for [fish]:")]\n<span class='info ml-1'>Overrall status: [fish_status]</span>\n"
-	render_list += "<span class='info ml-1'>Size: [fish.size] cm - Weight: [fish.weight] g</span>\n"
-	render_list += "<span class='info ml-1'>Required feed type: <font color='[initial(fish.food.color)]'>[initial(fish.food.name)]</font></span>\n"
-	render_list += "<span class='info ml-1'>Safe temperature: [fish.required_temperature_min] - [fish.required_temperature_max]K"
-	if(isaquarium(fish.loc))
-		var/obj/structure/aquarium/aquarium = fish.loc
-		if(!ISINRANGE(aquarium.fluid_temp, fish.required_temperature_min, fish.required_temperature_max))
-			render_list += span_alert("(OUT OF RANGE)")
-	render_list += "</span>\n"
-	render_list += "<span class='info ml-1'>Safe fluid type: [fish.required_fluid_type]"
-	if(isaquarium(fish.loc))
-		var/obj/structure/aquarium/aquarium = fish.loc
-		if(!compatible_fluid_type(fish.required_fluid_type, aquarium.fluid_type))
-			render_list += span_alert("(IN UNSAFE FLUID)")
-	render_list += "</span>"
-
-	if(fish.status != FISH_DEAD)
-		render_list += "\n"
-		if(!HAS_TRAIT(fish, TRAIT_FISH_NO_HUNGER))
-			var/hunger = PERCENT(min((world.time - fish.last_feeding) / fish.feeding_frequency, 1))
-			var/hunger_string = "[hunger]%"
-			switch(hunger)
-				if(0 to 60)
-					hunger_string = span_info(hunger_string)
-				if(60 to 90)
-					hunger_string = span_warning(hunger_string)
-				if(90 to 100)
-					hunger_string = span_alert(hunger_string)
-			render_list += "<span class='info ml-1'>Hunger: [hunger_string]</span>\n"
-		var/time_left = round(max(fish.breeding_wait - world.time, 0)/10)
-		render_list += "<span class='info ml-1'>Time until it can breed: [time_left] seconds</span>"
-
-	to_chat(user, examine_block(jointext(render_list, "")), type = MESSAGE_TYPE_INFO)
-
-	SEND_SIGNAL(src, COMSIG_FISH_ANALYZER_ANALYZE_STATUS, fish, user)
-
-/**
- * Called when a fish or a menu choice is left-clicked.
- * This returns the fish's progenitors, traits and their inheritability.
- */
-/obj/item/fish_analyzer/proc/analyze_traits(obj/item/fish/fish, mob/user)
-
-	// the final list of strings to render
-	var/render_list = list()
-
-	render_list += "[span_info("Analyzing traits for [fish]:")]\n<span class='info ml-1'>Progenitor species: [fish.progenitors]</span>\n"
-
-	if(!length(fish.fish_traits))
-		render_list += "<span class='info ml-1'>This fish has no trait to speak of...</span>\n"
-	else
-		render_list += "<span class='info ml-1'>Traits:</span>\n"
-		for(var/trait_type in fish.fish_traits)
-			var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
-			var/tooltipped_trait = span_tooltip(trait.catalog_description, trait.name)
-			render_list += "<span class='info ml-2'>[tooltipped_trait] - Inheritabilities: <font color='[COLOR_EMERALD]'>[trait.inheritability]%</font> - <font color='[COLOR_BRIGHT_ORANGE]'>[trait.diff_traits_inheritability]%</font></span>\n"
-
-	var/evolution_len = length(fish.evolution_types)
-	if(!evolution_len)
-		render_list += "<span class='info ml-1'>This fish has no evolution to speak of...</span>"
-	for(var/index in 1 to evolution_len)
-		var/datum/fish_evolution/evolution = GLOB.fish_evolutions[fish.evolution_types[index]]
-		var/evolution_name = evolution.name
-		var/evolution_tooltip = evolution.get_evolution_tooltip()
-		if(evolution_tooltip)
-			evolution_name = span_tooltip(evolution_tooltip, evolution_name)
-		render_list += "<span class='info ml-2'>[evolution_name] - Base Probability: [evolution.probability]%</span>"
-		if(index != evolution_len)
-			render_list += "\n"
+	return NONE
 
-	to_chat(user, examine_block(jointext(render_list, "")), type = MESSAGE_TYPE_INFO)
+/obj/item/fish_analyzer/ui_interact(mob/user, datum/tgui/ui)
+	if(isnull(scanned_item?.resolve()))
+		balloon_alert(user, "no specimen data!")
+		return TRUE
+
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "FishAnalyzer")
+		ui.open()
+
+/obj/item/fish_analyzer/ui_static_data(mob/user)
+	var/list/data = list()
+	var/atom/scanned_object = scanned_item?.resolve()
+	data["fish_list"] = list()
+	data["fish_scanned"] = FALSE
+
+	if(isfish(scanned_object))
+		data["fish_scanned"] = TRUE
+		return extract_fish_info(data, scanned_object)
+
+	var/obj/structure/aquarium/aquarium = scanned_object
+	for(var/obj/item/fish/fishie in aquarium)
+		extract_fish_info(data, fishie, aquarium)
+
+	return data
+
+/obj/item/fish_analyzer/proc/extract_fish_info(list/data, obj/item/fish/fishie, obj/structure/aquarium/aquarium)
+	var/list/fish_traits = list()
+	var/list/fish_evolutions = list()
+
+	for(var/evolution_type in fishie.evolution_types)
+		var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
+		var/obj/item/evolution_fish = evolution.new_fish_type
+		fish_evolutions += list(list(
+			"evolution_name" = evolution.name,
+			"evolution_icon" = evolution_fish::icon,
+			"evolution_icon_state" = evolution_fish::icon_state,
+			"evolution_probability" = evolution.probability,
+			"evolution_conditions" = evolution.conditions_note,
+		))
+
+	for(var/trait_type in fishie.fish_traits)
+		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+		fish_traits += list(list("trait_name" = trait.name, "trait_desc" = trait.catalog_description, "trait_inherit" = trait.diff_traits_inheritability))
+
+	data["fish_list"] += list(list(
+		"fish_name" = fishie.name,
+		"fish_icon" = fishie::icon,
+		"fish_icon_state" = fishie::icon_state,
+		"fish_health" = fishie.status == FISH_DEAD ? 0 : PERCENT(fishie.health/initial(fishie.health)),
+		"fish_size" = fishie.size,
+		"fish_weight" = fishie.weight,
+		"fish_food" = fishie.food::name,
+		"fish_food_color" = fishie.food::color,
+		"fish_min_temp" = fishie.required_temperature_min,
+		"fish_max_temp" = fishie.required_temperature_max,
+		"fish_hunger" = HAS_TRAIT(fishie, TRAIT_FISH_NO_HUNGER) ? 0 :  PERCENT(min((world.time - fishie.last_feeding) / fishie.feeding_frequency, 1)),
+		"fish_fluid_compatible" = aquarium ? compatible_fluid_type(fishie.required_fluid_type, aquarium.fluid_type) : null,
+		"fish_fluid_type" = fishie.required_fluid_type,
+		"fish_breed_timer" = round(max(fishie.breeding_wait - world.time, 0) / 10),
+		"fish_traits" = fish_traits,
+		"fish_evolutions" = fish_evolutions,
+		"fish_suitable_temp" = aquarium ? ISINRANGE(aquarium.fluid_temp, fishie.required_temperature_min, fishie.required_temperature_max) : null
+	))
+
+	return data
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index c4be35817b7ac..19a20a40a816b 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -12,7 +12,7 @@
 	attack_verb_simple = list("slap", "whack")
 	hitsound = 'sound/weapons/slap.ogg'
 	///The grind results of the fish. They scale with the weight of the fish.
-	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5)
+	grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5)
 	obj_flags = UNIQUE_RENAME
 
 	/// Resulting width of aquarium visual icon - default size of "fish_greyscale" state
@@ -253,18 +253,21 @@
 
 	var/list/same_traits = x_traits & y_traits
 	var/list/all_traits = (x_traits|y_traits)-removed_traits
-	/**
-	 * Traits that the fish is guaranteed to inherit will be inherited,
-	 * with the assertion that they're compatible anyway.
-	 */
-	for(var/trait_type in all_traits)
-		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
-		if(type in trait.guaranteed_inheritance_types)
-			fish_traits |= trait_type
-			all_traits -= trait_type
 
-	///Build a list of incompatible traits. Don't let any such trait pass onto the fish.
+	/// a list of incompatible traits that'll be filled as it goes on. Don't let any such trait pass onto the fish.
 	var/list/incompatible_traits = list()
+
+	///some traits can spontaneously manifest for some fishes. These have higher priorities than other traits
+	var/list/potential_spontaneous_traits = GLOB.spontaneous_fish_traits[type]
+	for(var/trait_type in potential_spontaneous_traits)
+		if(!prob(potential_spontaneous_traits[trait_type]))
+			continue
+		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+		if(length(fish_traits & trait.incompatible_traits))
+			continue
+		fish_traits |= trait_type
+		incompatible_traits |= trait.incompatible_traits
+
 	for(var/trait_type in fish_traits)
 		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
 		incompatible_traits |= trait.incompatible_traits
@@ -278,6 +281,8 @@
 		if(trait_type in incompatible_traits)
 			continue
 		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+		if(!isnull(trait.fish_whitelist) && !(type in trait.fish_whitelist))
+			continue
 		if(length(fish_traits & trait.incompatible_traits))
 			continue
 		if((trait_type in same_traits) ? prob(trait.inheritability) : prob(trait.diff_traits_inheritability))
@@ -447,10 +452,6 @@
 	if(health <= 0)
 		set_status(FISH_DEAD)
 
-
-//Fish breeding stops if fish count exceeds this.
-#define AQUARIUM_MAX_BREEDING_POPULATION 20
-
 /obj/item/fish/proc/ready_to_reproduce(being_targeted = FALSE)
 	var/obj/structure/aquarium/aquarium = loc
 	if(!istype(aquarium))
@@ -461,8 +462,6 @@
 		return FALSE
 	return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population > 1 && world.time >= breeding_wait
 
-#undef AQUARIUM_MAX_BREEDING_POPULATION
-
 /obj/item/fish/proc/try_to_reproduce()
 	var/obj/structure/aquarium/aquarium = loc
 	if(!istype(aquarium))
@@ -628,6 +627,14 @@
 		fish_zap_flags |= (ZAP_GENERATES_POWER | ZAP_MOB_STUN)
 	tesla_zap(source = get_turf(src), zap_range = fish_zap_range, power = fish_zap_power, cutoff = 1 MEGA JOULES, zap_flags = fish_zap_flags)
 
+///Returns the price of this fish, for the fish export.
+/obj/item/fish/proc/get_export_price(price, percent)
+	var/size_weight_exponentation = (size * weight * 0.01)^0.85
+	var/calculated_price = price + size_weight_exponentation * percent
+	if(HAS_TRAIT(src, TRAIT_FISH_FROM_CASE)) //Avoid printing money by simply ordering fish and sending it back.
+		calculated_price *= 0.05
+	return round(calculated_price)
+
 /// Returns random fish, using random_case_rarity probabilities.
 /proc/random_fish_type(required_fluid)
 	var/static/probability_table
diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm
index 8d6653781595f..ea9fcb4775770 100644
--- a/code/modules/fishing/fish/chasm_detritus.dm
+++ b/code/modules/fishing/fish/chasm_detritus.dm
@@ -24,27 +24,30 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d
 	/// Stuff which you can always fish up even if nothing fell into a hole. Associative by type.
 	var/static/list/default_contents = list(
 		NORMAL_CONTENTS = list(
-			/obj/item/stack/sheet/bone = 3,
-			/obj/item/stack/ore/slag = 2,
+			/obj/item/stack/sheet/bone = 6,
+			/obj/item/stack/ore/slag = 4,
+			/obj/effect/mob_spawn/corpse/human/skeleton = 2,
 			/mob/living/basic/mining/lobstrosity/lava = 1,
-			/obj/effect/mob_spawn/corpse/human/skeleton = 1,
+			/mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
 		),
 		BODIES_ONLY = list(
-			/obj/effect/mob_spawn/corpse/human/skeleton = 3,
+			/obj/effect/mob_spawn/corpse/human/skeleton = 6,
 			/mob/living/basic/mining/lobstrosity/lava = 1,
+			/mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
 		),
 		NO_CORPSES = list(
-			/obj/item/stack/sheet/bone = 14,
-			/obj/item/stack/ore/slag = 10,
+			/obj/item/stack/sheet/bone = 28,
+			/obj/item/stack/ore/slag = 20,
 			/mob/living/basic/mining/lobstrosity/lava = 1,
+			/mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
 		),
 	)
 
-/datum/chasm_detritus/proc/dispense_detritus(mob/fisherman, turf/fishing_spot)
+/datum/chasm_detritus/proc/dispense_detritus(atom/spawn_location, turf/fishing_spot)
 	if(prob(default_contents_chance))
 		var/default_spawn = pick(default_contents[default_contents_key])
-		return new default_spawn(get_turf(fisherman))
-	return find_chasm_contents(fishing_spot, get_turf(fisherman))
+		return new default_spawn(spawn_location)
+	return find_chasm_contents(fishing_spot, spawn_location)
 
 /// Returns the chosen detritus from the given list of things to choose from
 /datum/chasm_detritus/proc/determine_detritus(list/chasm_stuff)
diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm
index c04ef2c30796d..e6e2f1d9570ac 100644
--- a/code/modules/fishing/fish/fish_evolution.dm
+++ b/code/modules/fishing/fish/fish_evolution.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
 	conditions_note = "The fish (and its mate) need to be unusually big both in size and weight."
 
 /datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
-	if((source.size < 144 || source.weight < 4000) || (mate && (mate.size < 144 || mate.weight < 4000)))
+	if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000)))
 		return FALSE
 	return ..()
 
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index b03233e76a724..76b0cc8691c21 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -1,5 +1,26 @@
+///A global list of singleton fish traits by their paths
 GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list()))
 
+/**
+ * A nested list of fish types and traits that they can spontaneously manifest with associated probabilities
+ * e.g. list(/obj/item/fish = list(/datum/fish_trait = 100), etc...)
+ */
+GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
+
+/proc/populate_spontaneous_fish_traits()
+	var/list/list = list()
+	for(var/trait_path as anything in GLOB.fish_traits)
+		var/datum/fish_trait/trait = GLOB.fish_traits[trait_path]
+		if(isnull(trait.spontaneous_manifest_types))
+			continue
+		var/list/trait_typecache = zebra_typecacheof(trait.spontaneous_manifest_types) - /obj/item/fish
+		for(var/fish_type in trait_typecache)
+			var/trait_prob = trait_typecache[fish_type]
+			if(!trait_prob)
+				continue
+			LAZYSET(list[fish_type], trait_path, trait_typecache[fish_type])
+	return list
+
 /datum/fish_trait
 	var/name = "Unnamed Trait"
 	/// Description of the trait in the fishing catalog and scanner
@@ -10,8 +31,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	var/inheritability = 100
 	/// Same as above, but for when only one has it.
 	var/diff_traits_inheritability = 50
-	/// fishes of types within this list are granted to have this trait, no matter the probability
-	var/list/guaranteed_inheritance_types
+	/// A list of fish types and traits that they can spontaneously manifest with associated probabilities
+	var/list/spontaneous_manifest_types
+	/// An optional whitelist of fish that can get this trait
+	var/list/fish_whitelist
 	/// Depending on the value, fish with trait will be reported as more or less difficult in the catalog.
 	var/added_difficulty = 0
 
@@ -33,6 +56,15 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 /datum/fish_trait/proc/apply_to_fish(obj/item/fish/fish)
 	return
 
+/// Applies some special qualities to basic mobs generated by fish (i.e. chasm chrab --> young lobstrosity --> lobstrosity).
+/datum/fish_trait/proc/apply_to_mob(mob/living/basic/mob)
+	SHOULD_CALL_PARENT(TRUE)
+	RegisterSignal(mob, COMSIG_MOB_CHANGED_TYPE, PROC_REF(on_transformed))
+
+/datum/fish_trait/proc/on_transformed(mob/source, mob/desired_mob)
+	SIGNAL_HANDLER
+	apply_to_mob(desired_mob)
+
 /// Proc used by both the predator and necrophage traits.
 /datum/fish_trait/proc/eat_fish(obj/item/fish/predator, obj/item/fish/prey)
 	predator.last_feeding = world.time
@@ -41,6 +73,12 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	SEND_SIGNAL(prey, COMSIG_FISH_EATEN_BY_OTHER_FISH, predator)
 	qdel(prey)
 
+/// Proc that inserts a reagent to the grind_results list of the fish. You'll still have to set the processed comsig proc yourself.
+/datum/fish_trait/proc/add_to_reagents(obj/item/fish/fish, reagent_type, amount)
+	LAZYINITLIST(fish.grind_results)
+	fish.grind_results.Insert(1, reagent_type)
+	fish.grind_results[reagent_type] = amount
+
 /datum/fish_trait/wary
 	name = "Wary"
 	catalog_description = "This fish will avoid visible fish lines, cloaked line recommended."
@@ -98,9 +136,38 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 		if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD)
 			source.adjust_health(source.health - 0.5 * seconds_per_tick)
 
+/datum/fish_trait/nocturnal/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	// Make sure the mob can also ee in the dark
+	mob.lighting_cutoff_red = min(mob.lighting_cutoff_red, 20)
+	mob.lighting_cutoff_green = min(mob.lighting_cutoff_green, 20)
+	mob.lighting_cutoff_blue = min(mob.lighting_cutoff_blue, 20)
+	mob.update_sight()
+
+	RegisterSignal(mob, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life))
+
+/datum/fish_trait/nocturnal/proc/on_non_stasis_life(mob/living/basic/mob, seconds_per_tick = SSMOBS_DT)
+	SIGNAL_HANDLER
+	var/turf/our_turf = mob.loc
+	if(!isturf(our_turf))
+		return
+	var/light_amount = our_turf.get_lumcount()
+
+	if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
+		mob.apply_status_effect(/datum/status_effect/shadow_regeneration)
+
 /datum/fish_trait/heavy
 	name = "Heavy"
-	catalog_description = "This fish tends to stay near the waterbed.";
+	catalog_description = "This fish tends to stay near the waterbed."
+
+/datum/fish_trait/heavy/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	mob.add_movespeed_modifier(/datum/movespeed_modifier/heavy_fish)
+	mob.maxHealth *= 1.5
+	mob.health *= 1.5
+	mob.melee_damage_lower *= 1.3
+	mob.melee_damage_upper *= 1.3
+	mob.obj_damage *= 1.3
 
 /datum/fish_trait/heavy/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
 	minigame.fish_idle_velocity -= 10
@@ -161,6 +228,22 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 		source.adjust_health(source.health + 3 * seconds_per_tick)
 		source.last_feeding = world.time //it feeds on the emulsion!
 
+/datum/fish_trait/emulsijack/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	RegisterSignal(mob, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life))
+
+/datum/fish_trait/emulsijack/proc/on_non_stasis_life(mob/living/basic/mob, seconds_per_tick = SSMOBS_DT)
+	SIGNAL_HANDLER
+	var/turf/open/our_turf = get_turf(mob)
+	if(our_turf.return_air().return_pressure() > ONE_ATMOSPHERE * 1.5) //put a cap otherwise closed spaces may overpressurize
+		return
+
+	var/datum/gas_mixture/stench = new
+	ADD_GAS(/datum/gas/miasma, stench.gases)
+	stench.gases[/datum/gas/miasma][MOLES] = MIASMA_CORPSE_MOLES * 2 * seconds_per_tick
+	stench.temperature = mob.bodytemperature
+	our_turf.assume_air(stench)
+
 /datum/fish_trait/necrophage
 	name = "Necrophage"
 	catalog_description = "This fish will eat carcasses of dead fish when hungry."
@@ -205,7 +288,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	diff_traits_inheritability = 15
 	name = "Self-Revival"
 	catalog_description = "This fish shows a peculiar ability of reviving itself a minute or two after death."
-	guaranteed_inheritance_types = list(/obj/item/fish/boned, /obj/item/fish/mastodon)
+	spontaneous_manifest_types = list(/obj/item/fish/boned = 100, /obj/item/fish/mastodon = 100)
 
 /datum/fish_trait/revival/apply_to_fish(obj/item/fish/fish)
 	RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(check_status))
@@ -226,6 +309,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	else
 		source.visible_message(message)
 
+/datum/fish_trait/revival/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	mob.AddComponent(/datum/component/regenerator, regeneration_delay = 6 SECONDS, brute_per_second = 2 SECONDS, outline_colour = COLOR_BLUE)
+
 /datum/fish_trait/predator
 	name = "Predator"
 	catalog_description = "It's a predatory fish. It'll hunt down and eat live fishes of smaller size when hungry."
@@ -254,7 +341,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 /datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish)
 	RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_yuck))
 	ADD_TRAIT(fish, TRAIT_YUCKY_FISH, FISH_TRAIT_DATUM)
-	LAZYSET(fish.grind_results, /datum/reagent/yuck, 3)
+	add_to_reagents(fish, /datum/reagent/yuck, 3)
 
 /datum/fish_trait/yucky/proc/add_yuck(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
 	var/amount = source.grind_results[/datum/reagent/yuck] / length(results)
@@ -269,12 +356,12 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 /datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish)
 	RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_toxin))
 	RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten))
-	LAZYSET(fish.grind_results, /datum/reagent/toxin/tetrodotoxin, 2.5)
+	add_to_reagents(fish, /datum/reagent/toxin/tetrodotoxin, 2.5)
 
 /datum/fish_trait/toxic/proc/add_toxin(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
 	var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results)
 	for(var/atom/result as anything in results)
-		result.reagents?.add_reagent( /datum/reagent/toxin/tetrodotoxin, amount)
+		result.reagents?.add_reagent(/datum/reagent/toxin/tetrodotoxin, amount)
 
 /datum/fish_trait/toxic/proc/on_eaten(obj/item/fish/source, obj/item/fish/predator)
 	if(HAS_TRAIT(predator, TRAIT_FISH_TOXIN_IMMUNE))
@@ -291,6 +378,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	if(source.status == FISH_DEAD)
 		UnregisterSignal(source, list(COMSIG_FISH_LIFE, COMSIG_FISH_STATUS_CHANGED))
 
+/datum/fish_trait/toxic/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	mob.AddElement(/datum/element/venomous, /datum/reagent/toxin/tetrodotoxin, 0.5 * mob.mob_size)
+
 /datum/fish_trait/toxin_immunity
 	name = "Toxin Immunity"
 	catalog_description = "This fish has developed an ample-spected immunity to toxins."
@@ -335,13 +426,17 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 	name = "Lubed"
 	inheritability = 90
 	diff_traits_inheritability = 45
-	guaranteed_inheritance_types = list(/obj/item/fish/clownfish/lube)
-	catalog_description = "This fish exudes a viscous, slippery lubrificant. It's reccomended not to step on it."
+	spontaneous_manifest_types = list(/obj/item/fish/clownfish/lube = 100)
+	catalog_description = "This fish exudes a viscous, slippery lubrificant. It's recommended not to step on it."
 	added_difficulty = 5
 
 /datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish)
 	fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP)
 
+/datum/fish_trait/lubed/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	mob.AddElement(/datum/element/lube_walking)
+
 /datum/fish_trait/lubed/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
 	minigame.reeling_velocity *= 1.4
 	minigame.gravity_velocity *= 1.4
@@ -380,6 +475,11 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 /datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish)
 	fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)
 
+/datum/fish_trait/antigrav/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	mob.add_traits(list(TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_SPACEWALK), FISH_TRAIT_DATUM)
+	mob.AddElement(/datum/element/simple_flying)
+
 ///Anxiety means the fish will die if in a location with more than 3 fish (including itself)
 ///This is just barely enough to crossbreed out of anxiety, but it severely limits the potential of
 /datum/fish_trait/anxiety
@@ -429,3 +529,20 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
 		fish.attack_verb_continuous = fish::attack_verb_continuous
 		fish.attack_verb_simple = fish::attack_verb_simple
 		fish.hitsound = fish::hitsound
+
+/datum/fish_trait/electrogenesis/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	ADD_TRAIT(mob, TRAIT_SHOCKIMMUNE, FISH_TRAIT_DATUM)
+	mob.grant_actions_by_list(list(/datum/action/cooldown/mob_cooldown/charge_apc))
+	mob.AddElement(/datum/element/venomous, /datum/reagent/teslium, 3 * mob.mob_size)
+
+/datum/fish_trait/stunted
+	name = "Stunted Growth"
+	catalog_description = "This chrab's development is stunted, and will not properly reach adulthood."
+	spontaneous_manifest_types = list(/obj/item/fish/chasm_crab = 12, /obj/item/fish/chasm_crab/ice = 12)
+	fish_whitelist = list(/obj/item/fish/chasm_crab, /obj/item/fish/chasm_crab/ice)
+	diff_traits_inheritability = 40
+
+/datum/fish_trait/stunted/apply_to_mob(mob/living/basic/mob)
+	. = ..()
+	qdel(mob.GetComponent(/datum/component/growth_and_differentiation))
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
index cc001560ee0a9..ce9f36f0553d6 100644
--- a/code/modules/fishing/fish/fish_types.dm
+++ b/code/modules/fishing/fish/fish_types.dm
@@ -81,6 +81,55 @@
 	required_temperature_max = MIN_AQUARIUM_TEMP+30
 	beauty = FISH_BEAUTY_GOOD
 
+/obj/item/fish/tadpole
+	name = "tadpole"
+	desc = "The larval spawn of an amphibian. A very minuscle, round creature with a long tail it uses to swim around."
+	icon_state = "tadpole"
+	dedicated_in_aquarium_icon_state = "tadpole small"
+	average_size = 3
+	average_weight = 10
+	sprite_width = 3
+	sprite_height = 1
+	health = 50
+	feeding_frequency = 1.5 MINUTES
+	required_temperature_min = MIN_AQUARIUM_TEMP+15
+	required_temperature_max = MIN_AQUARIUM_TEMP+20
+	fillet_type = null
+	fish_traits = list(/datum/fish_trait/no_mating) //They grow into frogs and that's it.
+	beauty = FISH_BEAUTY_NULL
+	random_case_rarity = FISH_RARITY_NOPE //Why would you want generic frog tadpoles you get from ponds inside fish cases?
+	/// Once dead, tadpoles disappear after a dozen seconds, since you can get infinite tadpoles.
+	var/del_timerid
+
+/obj/item/fish/tadpole/Initialize(mapload, apply_qualities = TRUE)
+	. = ..()
+	AddComponent(/datum/component/fish_growth, /mob/living/basic/frog, 100 / rand(2.5, 3 MINUTES) * 10)
+	RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
+	RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
+
+/obj/item/fish/tadpole/set_status(new_status)
+	. = ..()
+	if(status == FISH_DEAD)
+		del_timerid = QDEL_IN_STOPPABLE(src, 12 SECONDS)
+	else
+		deltimer(del_timerid)
+
+/obj/item/fish/tadpole/proc/growth_checks(datum/source, seconds_per_tick)
+	SIGNAL_HANDLER
+	var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
+	if(hunger >= 0.7) //too hungry to grow
+		return COMPONENT_DONT_GROW
+	var/obj/structure/aquarium/aquarium = loc
+	if(!aquarium.allow_breeding) //the aquarium has breeding disabled
+		return COMPONENT_DONT_GROW
+
+/obj/item/fish/tadpole/proc/on_growth(datum/source, mob/living/basic/frog/result)
+	SIGNAL_HANDLER
+	playsound(result, result.attack_sound, 50, TRUE) // reeeeeeeeeeeeeee...
+
+/obj/item/fish/tadpole/get_export_price(price, percent)
+	return 2 //two credits. Tadpoles aren't really that valueable.
+
 // Saltwater fish below
 
 /obj/item/fish/clownfish
@@ -243,7 +292,7 @@
 	required_temperature_min = MIN_AQUARIUM_TEMP+10
 	required_temperature_max = MIN_AQUARIUM_TEMP+32
 
-//Chasm fish
+/// Commonly found on the mining fishing spots. Can be grown into lobstrosities
 /obj/item/fish/chasm_crab
 	name = "chasm chrab"
 	desc = "The young of the lobstrosity mature in pools below the earth, eating what falls in until large enough to clamber out. Those found near the station are well-fed."
@@ -252,7 +301,7 @@
 	sprite_height = 9
 	sprite_width = 8
 	stable_population = 4
-	feeding_frequency = 15 MINUTES
+	feeding_frequency = 10 MINUTES
 	random_case_rarity = FISH_RARITY_RARE
 	fillet_type = /obj/item/food/meat/slab/rawcrab
 	required_temperature_min = MIN_AQUARIUM_TEMP+9
@@ -270,17 +319,84 @@
 	evolution_types = list(/datum/fish_evolution/ice_chrab)
 	compatible_types = list(/obj/item/fish/chasm_crab/ice)
 	beauty = FISH_BEAUTY_GOOD
+	///This value represents how much the crab needs aren't being met. Higher values translate to a more likely hostile lobstrosity.
+	var/anger = 0
+	///The lobstrosity type this matures into
+	var/lob_type = /mob/living/basic/mining/lobstrosity/juvenile/lava
+	///at which rate the crab gains maturation
+	var/growth_rate = 100 / (10 MINUTES) * 10
+
+/obj/item/fish/chasm_crab/Initialize(mapload, apply_qualities = TRUE)
+	. = ..()
+	RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
+	RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
+
+///A chasm crab growth speed is determined by its initial weight and size, ergo bigger crabs for faster lobstrosities
+/obj/item/fish/chasm_crab/update_size_and_weight(new_size = average_size, new_weight = average_weight)
+	. = ..()
+	var/multiplier = 1
+	switch(size)
+		if(0 to FISH_SIZE_TINY_MAX)
+			multiplier -= 0.2
+		if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX)
+			multiplier += 0.2
+		if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX)
+			multiplier += 0.5
+		if(FISH_SIZE_BULKY_MAX to INFINITY)
+			multiplier += 0.8
+
+	if(weight <= 800)
+		multiplier -= 0.1 * round((1000 - weight) / 200)
+	else if(weight >= 1500)
+		multiplier += min(0.1 * round((weight - 1000) / 500), 2)
+
+	AddComponent(/datum/component/fish_growth, lob_type, initial(growth_rate) * multiplier)
+
+/obj/item/fish/chasm_crab/proc/growth_checks(datum/source, seconds_per_tick)
+	SIGNAL_HANDLER
+	var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
+	if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow.
+		anger += growth_rate * 2 * seconds_per_tick
+		return COMPONENT_DONT_GROW
+
+	if(hunger >= 0.4) //I'm hungry and angry
+		anger += growth_rate * 0.6 * seconds_per_tick
+
+	if(!isaquarium(loc))
+		return
+
+	var/obj/structure/aquarium/aquarium = loc
+	if(!aquarium.allow_breeding) //the aquarium has breeding disabled
+		return COMPONENT_DONT_GROW
+	if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren
+		anger += growth_rate * 0.25 * seconds_per_tick
+	var/fish_count = length(aquarium.get_fishes())
+	if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded
+		anger += growth_rate * 0.3 * seconds_per_tick
+	if(fish_count > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
+		return COMPONENT_DONT_GROW
+
+/obj/item/fish/chasm_crab/proc/on_growth(datum/source, mob/living/basic/mining/lobstrosity/juvenile/result)
+	SIGNAL_HANDLER
+	if(!prob(anger))
+		result.AddElement(/datum/element/ai_retaliate)
+		qdel(result.ai_controller)
+		result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/calm(result)
+	else if(anger < 30) //not really that mad, just a bit unstable.
+		qdel(result.ai_controller)
+		result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious(result)
 
 /obj/item/fish/chasm_crab/ice
 	name = "arctic chrab"
 	desc = "A subspecies of chasm chrabs that has adapted to the cold climate and lack of abysmal holes of the icemoon."
 	icon_state = "arctic_chrab"
-	dedicated_in_aquarium_icon_state = "ice_chrab_small"
+	dedicated_in_aquarium_icon_state = "arctic_chrab_small"
 	required_temperature_min = ICEBOX_MIN_TEMPERATURE-20
 	required_temperature_max = MIN_AQUARIUM_TEMP+15
 	evolution_types = list(/datum/fish_evolution/chasm_chrab)
 	compatible_types = list(/obj/item/fish/chasm_crab)
 	beauty = FISH_BEAUTY_GREAT
+	lob_type = /mob/living/basic/mining/lobstrosity/juvenile
 
 /obj/item/fish/donkfish
 	name = "donk co. company patent donkfish"
@@ -317,7 +433,7 @@
 	sprite_height = 5
 	stable_population = 12
 	average_size = 110
-	average_weight = 10000
+	average_weight = 6000
 	random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
 	required_temperature_min = MIN_AQUARIUM_TEMP+10
 	required_temperature_max = MIN_AQUARIUM_TEMP+30
@@ -349,7 +465,7 @@
 	)
 	beauty = FISH_BEAUTY_DISGUSTING
 
-/obj/item/fish/ratfish/Initialize(mapload)
+/obj/item/fish/ratfish/Initialize(mapload, apply_qualities = TRUE)
 	. = ..()
 	//stable pop reflects the config for how many mice migrate. powerful...
 	stable_population = CONFIG_GET(number/mice_roundstart)
@@ -366,7 +482,7 @@
 	average_size = 20
 	average_weight = 400
 	health = 50
-	breeding_timeout = 5 MINUTES
+	breeding_timeout = 2.5 MINUTES
 	fish_traits = list(/datum/fish_trait/parthenogenesis, /datum/fish_trait/no_mating)
 	required_temperature_min = MIN_AQUARIUM_TEMP+10
 	required_temperature_max = MIN_AQUARIUM_TEMP+40
@@ -424,7 +540,7 @@
 	min_pressure = HAZARD_LOW_PRESSURE
 	health = 150
 	stable_population = 3
-	grind_results = list(/datum/reagent/bone_dust = 20)
+	grind_results = list(/datum/reagent/bone_dust = 10)
 	fillet_type = /obj/item/stack/sheet/bone
 	num_fillets = 2
 	fish_traits = list(/datum/fish_trait/revival, /datum/fish_trait/carnivore)
@@ -452,7 +568,7 @@
 	min_pressure = HAZARD_LOW_PRESSURE
 	health = 300
 	stable_population = 2 //This means they can only crossbreed.
-	grind_results = list(/datum/reagent/bone_dust = 15, /datum/reagent/consumable/liquidgibs = 5)
+	grind_results = list(/datum/reagent/bone_dust = 5, /datum/reagent/consumable/liquidgibs = 5)
 	fillet_type = /obj/item/stack/sheet/bone
 	num_fillets = 2
 	feeding_frequency = 2 MINUTES
@@ -481,7 +597,7 @@
 	fish_traits = list(/datum/fish_trait/no_mating) //just to be sure, these shouldn't reproduce
 	experisci_scannable = FALSE
 
-/obj/item/fish/holo/Initialize(mapload)
+/obj/item/fish/holo/Initialize(mapload, apply_qualities = TRUE)
 	. = ..()
 	var/area/station/holodeck/holo_area = get_area(src)
 	if(!istype(holo_area))
@@ -565,12 +681,12 @@
 	safe_air_limits = null
 	min_pressure = 0
 	max_pressure = INFINITY
-	grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/consumable/liquidgibs = 5)
+	grind_results = list(/datum/reagent/bluespace = 10)
 	fillet_type = null
 	fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
 	beauty = FISH_BEAUTY_GREAT
 
-/obj/item/fish/starfish/Initialize(mapload)
+/obj/item/fish/starfish/Initialize(mapload, apply_qualities = TRUE)
 	. = ..()
 	update_appearance(UPDATE_OVERLAYS)
 
@@ -608,7 +724,7 @@
 	///maximum bonus damage when winded up
 	var/maximum_bonus = 25
 
-/obj/item/fish/lavaloop/Initialize(mapload)
+/obj/item/fish/lavaloop/Initialize(mapload, apply_qualities = TRUE)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_BYPASS_RANGED_ARMOR, INNATE_TRAIT)
 	AddComponent(/datum/component/boomerang, throw_range, TRUE)
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index 45739b79399e4..9c70d474a62d7 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -20,13 +20,15 @@
 /// The minimum velocity required for the bait to bounce
 #define BAIT_MIN_VELOCITY_BOUNCE 150
 /// The extra deceleration of velocity that happens when the bait switches direction
-#define BAIT_DECELERATION_MULT 1.5
+#define BAIT_DECELERATION_MULT 1.8
 
 /// Reduce initial completion rate depending on difficulty
 #define MAX_FISH_COMPLETION_MALUS 15
 /// The window of time between biting phase and back to baiting phase
 #define BITING_TIME_WINDOW 4 SECONDS
 
+/// The multiplier of how much the difficulty negatively impacts the bait height
+#define BAIT_HEIGHT_DIFFICULTY_MALUS 1.3
 
 ///Defines to know how the bait is moving on the minigame slider.
 #define REELING_STATE_IDLE 0
@@ -36,7 +38,7 @@
 ///The pixel height of the minigame bar
 #define MINIGAME_SLIDER_HEIGHT 76
 ///The standard pixel height of the bait
-#define MINIGAME_BAIT_HEIGHT 24
+#define MINIGAME_BAIT_HEIGHT 27
 ///The standard pixel height of the fish (minus a pixel on each direction for the sake of a better looking sprite)
 #define MINIGAME_FISH_HEIGHT 4
 
@@ -82,7 +84,7 @@
 	/// How much space the fish takes on the minigame slider
 	var/fish_height = 50
 	/// How much space the bait takes on the minigame slider
-	var/bait_height = 320
+	var/bait_height = 360
 	/// The height in pixels of the bait bar
 	var/bait_pixel_height = MINIGAME_BAIT_HEIGHT
 	/// The height in pixels of the fish
@@ -182,14 +184,16 @@
 		if(rod.hook.fishing_hook_traits & FISHING_HOOK_KILL)
 			special_effects |= FISHING_MINIGAME_RULE_KILL
 
+	completion_loss += user.mind?.get_skill_modifier(/datum/skill/fishing, SKILL_VALUE_MODIFIER)/5
+
 	if(special_effects & FISHING_MINIGAME_RULE_KILL && ispath(reward_path,/obj/item/fish))
-		RegisterSignal(user, COMSIG_MOB_FISHING_REWARD_DISPENSED, PROC_REF(hurt_fish))
+		RegisterSignal(comp.fish_source, COMSIG_FISH_SOURCE_REWARD_DISPENSED, PROC_REF(hurt_fish))
 
 	difficulty += comp.fish_source.calculate_difficulty(reward_path, rod, user, src)
-	difficulty = clamp(round(difficulty), 1, 100)
+	difficulty = clamp(round(difficulty), FISHING_EASY_DIFFICULTY - 5, 100)
 
 	if(difficulty > FISHING_EASY_DIFFICULTY)
-		completion -= round(MAX_FISH_COMPLETION_MALUS * (difficulty/100), 1)
+		completion -= MAX_FISH_COMPLETION_MALUS * (difficulty * 0.01)
 
 	if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH))
 		fish_icon = GLOB.specific_fish_icons[reward_path] || "fish"
@@ -211,7 +215,7 @@
 	else
 		long_jump_chance *= difficulty
 
-	bait_height -= difficulty
+	bait_height -= round(difficulty * BAIT_HEIGHT_DIFFICULTY_MALUS)
 	bait_pixel_height = round(MINIGAME_BAIT_HEIGHT * (bait_height/initial(bait_height)), 1)
 
 /datum/fishing_challenge/Destroy(force)
@@ -277,11 +281,11 @@
 	//You need to be holding the rod to use it.
 	if(LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, ALT_CLICK))
 		return
-	if(!source.get_active_held_item(used_rod) && !HAS_TRAIT(source, TRAIT_PROFOUND_FISHER))
+	if(!HAS_TRAIT(source, TRAIT_PROFOUND_FISHER) && source.get_active_held_item() != used_rod)
 		return
-	if(phase == WAIT_PHASE) //Reset wait
+	if(phase == WAIT_PHASE)
 		send_alert("miss!")
-		start_baiting_phase(TRUE)
+		start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder.
 	else if(phase == BITING_PHASE)
 		start_minigame_phase()
 	return COMSIG_MOB_CANCEL_CLICKON
@@ -329,7 +333,7 @@
 	if(penalty)
 		wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS)
 	else
-		wait_time = rand(1 SECONDS, 30 SECONDS)
+		wait_time = rand(3 SECONDS, 25 SECONDS)
 		if(special_effects & FISHING_MINIGAME_AUTOREEL && wait_time >= 15 SECONDS)
 			wait_time = max(wait_time - 7.5 SECONDS, 15 SECONDS)
 	deltimer(next_phase_timer)
@@ -409,7 +413,6 @@
 				completion *= 1.2
 			if(BITING_TIME_WINDOW - 0.5 SECONDS to BITING_TIME_WINDOW)
 				completion *= 1.4
-	completion = round(completion, 1)
 	if(!prepare_minigame_hud())
 		return
 	phase = MINIGAME_PHASE
@@ -736,6 +739,8 @@
 #undef MINIGAME_BAIT_HEIGHT
 #undef MINIGAME_FISH_HEIGHT
 
+#undef BAIT_HEIGHT_DIFFICULTY_MALUS
+
 #undef REELING_STATE_IDLE
 #undef REELING_STATE_UP
 #undef REELING_STATE_DOWN
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 6ee02d6d9de4d..c36ea48b15c02 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -71,6 +71,7 @@
 	. = ..()
 	if(currently_hooked)
 		context[SCREENTIP_CONTEXT_LMB] = "Reel in"
+		context[SCREENTIP_CONTEXT_RMB] = "Unhook"
 		return CONTEXTUAL_SCREENTIP_SET
 	return NONE
 
@@ -100,7 +101,7 @@
 
 /obj/item/fishing_rod/proc/consume_bait(atom/movable/reward)
 	// catching things that aren't fish or alive mobs doesn't consume baits.
-	if(isnull(reward) || isnull(bait))
+	if(isnull(reward) || isnull(bait) || HAS_TRAIT(bait, TRAIT_BAIT_UNCONSUMABLE))
 		return
 	if(isliving(reward))
 		var/mob/living/caught_mob = reward
@@ -212,6 +213,16 @@
 	cast_line(interacting_with, user)
 	return ITEM_INTERACT_SUCCESS
 
+/obj/item/fishing_rod/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+	return ranged_interact_with_atom_secondary(interacting_with, user, modifiers)
+
+/obj/item/fishing_rod/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+	//Stop reeling, delete the fishing line
+	if(currently_hooked)
+		QDEL_NULL(fishing_line)
+		return ITEM_INTERACT_BLOCKING
+	return ..()
+
 /// If the line to whatever that is is clear and we're not already busy, try fishing in it
 /obj/item/fishing_rod/proc/cast_line(atom/target, mob/user)
 	if(casting || currently_hooked)
@@ -219,9 +230,6 @@
 	if(!hook)
 		balloon_alert(user, "install a hook first!")
 		return
-	if(!CheckToolReach(user, target, cast_range))
-		balloon_alert(user, "cannot reach there!")
-		return
 	if(!COOLDOWN_FINISHED(src, casting_cd))
 		return
 	casting = TRUE
@@ -528,7 +536,7 @@
 	ui_description = "This rod has an infinite supply of synth-bait. Also doubles as an Experi-Scanner for fish."
 	icon_state = "fishing_rod_science"
 	reel_overlay = "reel_science"
-	bait = /obj/item/food/bait/doughball/synthetic
+	bait = /obj/item/food/bait/doughball/synthetic/unconsumable
 
 /obj/item/fishing_rod/tech/Initialize(mapload)
 	. = ..()
@@ -550,9 +558,6 @@
 	. = ..()
 	. += span_notice("<b>Alt-Click</b> to access the Experiment Configuration UI")
 
-/obj/item/fishing_rod/tech/consume_bait(atom/movable/reward)
-	return
-
 /obj/item/fishing_rod/tech/use_slot(slot, mob/user, obj/item/new_item)
 	if(slot == ROD_SLOT_BAIT)
 		return
@@ -578,23 +583,21 @@
 	if(owner.hook)
 		icon_state = owner.hook.icon_state
 		transform = transform.Scale(1, -1)
-	return ..()
-
-/obj/projectile/fishing_cast/Impact(atom/hit_atom)
 	. = ..()
-	owner.hook_hit(hit_atom)
-	qdel(src)
+	if(!QDELETED(src))
+		our_line = owner.create_fishing_line(src)
 
-/obj/projectile/fishing_cast/fire(angle, atom/direct_target)
+/obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
-	our_line = owner.create_fishing_line(src)
+	if(blocked < 100)
+		QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish.
+		owner.hook_hit(target)
 
 /obj/projectile/fishing_cast/Destroy()
-	. = ..()
 	QDEL_NULL(our_line)
 	owner?.casting = FALSE
-
-
+	owner = null
+	return ..()
 
 /datum/beam/fishing_line
 	// Is the fishing rod held in left side hand
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 059a532072204..feaa93424f9a8 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -53,6 +53,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
 	var/catalog_description
 	/// Background image name from /datum/asset/simple/fishing_minigame
 	var/background = "background_default"
+	/// It true, repeated and large explosions won't be as efficient. This is usually meant for global fish sources.
+	var/explosive_malus = FALSE
+	/// If explosive_malus is true, this will be used to keep track of the turfs where an explosion happened for when we'll spawn the loot.
+	var/list/exploded_turfs
 
 /datum/fish_source/New()
 	if(!PERFORM_ALL_TESTS(focus_only/fish_sources_tables))
@@ -61,6 +65,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
 		if(!(path in fish_table))
 			stack_trace("path [path] found in the 'fish_counts' list but not in the fish_table one of [type]")
 
+/datum/fish_source/Destroy()
+	exploded_turfs = null
+	return ..()
+
 ///Called when src is set as the fish source of a fishing spot component
 /datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot)
 	return
@@ -89,7 +97,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
 		. += EXPERT_FISHER_DIFFICULTY_MOD
 
 	// Difficulty modifier added by the fisher's skill level
-	if(!challenge || !(challenge.special_effects & FISHING_MINIGAME_RULE_NO_EXP))
+	if(!(challenge?.special_effects & FISHING_MINIGAME_RULE_NO_EXP))
 		. += fisherman.mind?.get_skill_modifier(/datum/skill/fishing, SKILL_VALUE_MODIFIER)
 
 	// Difficulty modifier added by the rod
@@ -166,13 +174,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
 
 /// Gives out the reward if possible
 /datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman, turf/fishing_spot)
-	if((reward_path in fish_counts)) // This is limited count result
-		fish_counts[reward_path] -= 1
-		if(!fish_counts[reward_path])
-			fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely)
-			fish_table -= reward_path
-
-	var/atom/movable/reward = spawn_reward(reward_path, fisherman, fishing_spot)
+	var/atom/movable/reward = simple_dispense_reward(reward_path, get_turf(fisherman), fishing_spot)
 	if(!reward) //balloon alert instead
 		fisherman.balloon_alert(fisherman, pick(duds))
 		return
@@ -185,18 +187,31 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
 		INVOKE_ASYNC(reward, TYPE_PROC_REF(/atom/movable, forceMove), get_turf(fisherman))
 	fisherman.balloon_alert(fisherman, "caught [reward]!")
 
-	SEND_SIGNAL(fisherman, COMSIG_MOB_FISHING_REWARD_DISPENSED, reward)
+	return reward
+
+///Simplified version of dispense_reward that doesn't need a fisherman.
+/datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot)
+	if(isnull(reward_path))
+		return null
+	if((reward_path in fish_counts)) // This is limited count result
+		fish_counts[reward_path] -= 1
+		if(!fish_counts[reward_path])
+			fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely)
+			fish_table -= reward_path
+
+	var/atom/movable/reward = spawn_reward(reward_path, spawn_location, fishing_spot)
+	SEND_SIGNAL(src, COMSIG_FISH_SOURCE_REWARD_DISPENSED, reward)
 	return reward
 
 /// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic.
-/datum/fish_source/proc/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot)
 	if(reward_path == FISHING_DUD)
 		return
 	if(ispath(reward_path, /datum/chasm_detritus))
-		return GLOB.chasm_detritus_types[reward_path].dispense_detritus(fisherman, fishing_spot)
+		return GLOB.chasm_detritus_types[reward_path].dispense_detritus(spawn_location, fishing_spot)
 	if(!ispath(reward_path, /atom/movable))
 		CRASH("Unsupported /datum path [reward_path] passed to fish_source/proc/spawn_reward()")
-	var/atom/movable/reward = new reward_path(get_turf(fisherman))
+	var/atom/movable/reward = new reward_path(spawn_location)
 	if(isfish(reward))
 		var/obj/item/fish/caught_fish = reward
 		caught_fish.randomize_size_and_weight()
@@ -244,6 +259,9 @@ GLOBAL_LIST(fishing_property_cache)
 	///Multiplier used to make fishes more common compared to everything else.
 	var/result_multiplier = 1
 
+
+	var/list/final_table = fish_table.Copy()
+
 	if(bait)
 		if(HAS_TRAIT(bait, TRAIT_GREAT_QUALITY_BAIT))
 			result_multiplier = 9
@@ -254,10 +272,10 @@ GLOBAL_LIST(fishing_property_cache)
 		else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT))
 			result_multiplier = 2
 			leveling_exponent = 0.1
+		final_table -= FISHING_DUD
 
 	var/list/fish_list_properties = collect_fish_properties()
 
-	var/list/final_table = fish_table.Copy()
 	for(var/result in final_table)
 		final_table[result] *= rod.hook?.get_hook_bonus_multiplicative(result)
 		final_table[result] += rod.hook?.get_hook_bonus_additive(result)//Decide on order here so it can be multiplicative
@@ -316,3 +334,37 @@ GLOBAL_LIST(fishing_property_cache)
 			final_table[fish] += round(difference**leveling_exponent, 1)
 
 	return final_table
+
+/datum/fish_source/proc/spawn_reward_from_explosion(atom/location, severity)
+	if(!explosive_malus)
+		explosive_spawn(location, severity)
+		return
+	if(isnull(exploded_turfs))
+		exploded_turfs = list()
+		addtimer(CALLBACK(src, PROC_REF(post_explosion_spawn)), 1) //run this the next tick.
+	var/turf/turf = get_turf(location)
+	var/peak_severity = max(exploded_turfs[turf], severity)
+	exploded_turfs[turf] = peak_severity
+
+/datum/fish_source/proc/post_explosion_spawn()
+	var/multiplier = 1/(length(exploded_turfs)**0.5)
+	for(var/turf/turf as anything in exploded_turfs)
+		explosive_spawn(turf, exploded_turfs[turf], multiplier)
+	exploded_turfs = null
+
+/datum/fish_source/proc/explosive_spawn(location, severity, multiplier = 1)
+	for(var/i in 1 to (severity + 2))
+		if(!prob((100 + 100 * severity)/i * multiplier))
+			continue
+		var/reward_loot = pick_weight(fish_table)
+		var/atom/movable/reward = simple_dispense_reward(reward_loot, location, location)
+		if(isnull(reward))
+			continue
+		if(isfish(reward))
+			var/obj/item/fish/fish = reward
+			fish.set_status(FISH_DEAD)
+		if(isitem(reward))
+			reward.pixel_x = rand(-9, 9)
+			reward.pixel_y = rand(-9, 9)
+		if(severity >= EXPLODE_DEVASTATE)
+			reward.ex_act(EXPLODE_LIGHT)
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index 9328f87be6905..dd5602b12f99d 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -14,6 +14,7 @@
 		/obj/item/fish/clownfish/lube = 2,
 	)
 	fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5
+	explosive_malus = TRUE
 
 /datum/fish_source/ocean/beach
 	catalog_description = "Beach shore water"
@@ -44,6 +45,7 @@
 	catalog_description = "Beach dimension (Fishing portal generator)"
 	radial_name = "Beach"
 	radial_state = "palm_beach"
+	overlay_state = "portal_beach"
 
 /datum/fish_source/portal/chasm
 	background = "background_lavaland"
@@ -159,7 +161,7 @@
 			challenge.special_effects |= effect
 
 ///Cherry on top, fish caught from the randomizer portal also have (almost completely) random traits
-/datum/fish_source/portal/random/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/portal/random/spawn_reward(reward_path, atom/movable/spawn_location, turf/fishing_spot)
 	if(!ispath(reward_path, /obj/item/fish))
 		return ..()
 
@@ -170,16 +172,11 @@
 			var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
 			weighted_traits[trait.type] = round(trait.inheritability**2/100)
 
-	var/obj/item/fish/caught_fish = new reward_path(get_turf(fisherman), FALSE)
-	var/list/fixed_traits = list()
-	for(var/trait_type in caught_fish.fish_traits)
-		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
-		if(caught_fish.type in trait.guaranteed_inheritance_types)
-			fixed_traits += trait_type
+	var/obj/item/fish/caught_fish = new reward_path(spawn_location, FALSE)
 	var/list/new_traits = list()
 	for(var/iteration in rand(1, 4))
 		new_traits |= pick_weight(weighted_traits)
-	caught_fish.inherit_traits(new_traits, fixed_traits = fixed_traits)
+	caught_fish.inherit_traits(new_traits)
 	caught_fish.randomize_size_and_weight(deviation = 0.3)
 	caught_fish.progenitors = full_capitalize(caught_fish.name)
 	return caught_fish
@@ -211,7 +208,8 @@
 
 	return rod.hook.chasm_detritus_type
 
-/datum/fish_source/chasm
+/datum/fish_source/chasm/spawn_reward_from_explosion(atom/location, severity)
+	return //Spawned content would immediately fall back into the chasm, so it wouldn't matter.
 
 /datum/fish_source/lavaland
 	catalog_description = "Lava vents"
@@ -228,6 +226,7 @@
 	)
 
 	fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
+	explosive_malus = TRUE
 
 /datum/fish_source/lavaland/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent)
 	. = ..()
@@ -241,14 +240,15 @@
 	catalog_description = "Liquid plasma vents"
 	fish_table = list(
 		FISHING_DUD = 5,
-		/obj/item/fish/chasm_crab/ice = 15,
-		/obj/item/fish/lavaloop/plasma_river = 15,
-		/obj/item/coin/plasma = 3,
-		/obj/item/stack/ore/plasma = 3,
+		/obj/item/fish/chasm_crab/ice = 30,
+		/obj/item/fish/lavaloop/plasma_river = 30,
+		/obj/item/coin/plasma = 6,
+		/obj/item/stack/ore/plasma = 6,
+		/obj/effect/decal/remains/plasma = 2,
+		/obj/item/stack/sheet/mineral/runite = 2,
+		/obj/item/stack/sheet/mineral/adamantine = 2,
 		/mob/living/basic/mining/lobstrosity = 1,
-		/obj/effect/decal/remains/plasma = 1,
-		/obj/item/stack/sheet/mineral/runite = 1,
-		/obj/item/stack/sheet/mineral/adamantine = 1,
+		/mob/living/basic/mining/lobstrosity/juvenile = 1,
 	)
 	fish_counts = list(
 		/obj/item/stack/sheet/mineral/adamantine = 3,
@@ -360,6 +360,15 @@
 
 	return ..()
 
+/datum/fish_source/hydro_tray/spawn_reward_from_explosion(atom/location, severity)
+	if(!istype(location, /obj/machinery/hydroponics/constructable))
+		return ..()
+
+	var/obj/machinery/hydroponics/constructable/basin = location
+	if(basin.myseed || basin.waterlevel <= 0)
+		return
+	return ..()
+
 /datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
 	if(reward_path != RANDOM_SEED)
 		var/mob/living/created_reward = ..()
diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm
index 33ec57b0e2109..ec4f74dc58316 100644
--- a/code/modules/food_and_drinks/machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm
@@ -38,6 +38,12 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 	var/frying_fried = FALSE
 	/// Has our currently frying object been burnt?
 	var/frying_burnt = FALSE
+	/// How dirty the fryer is - show overlay at 1
+	var/grease_level = 0
+	/// The chance (%) of grease_level increase on process()
+	var/grease_increase_chance = 50
+	/// The amount of grease_level increase on process()
+	var/grease_Increase_amount = 0.1
 
 	/// Our sound loop for the frying sounde effect.
 	var/datum/looping_sound/deep_fryer/fry_loop
@@ -56,6 +62,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 	create_reagents(50, OPENCONTAINER)
 	reagents.add_reagent(/datum/reagent/consumable/nutriment/fat/oil, 25)
 	fry_loop = new(src, FALSE)
+	RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_cleaned))
 
 /obj/machinery/deepfryer/Destroy()
 	QDEL_NULL(fry_loop)
@@ -75,6 +82,11 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 	oil_use = initial(oil_use) - (oil_efficiency * 0.00475)
 	fry_speed = oil_efficiency
 
+/obj/machinery/deepfryer/update_overlays()
+	. = ..()
+	if(grease_level >= 1)
+		. += "fryer_greasy"
+
 /obj/machinery/deepfryer/examine(mob/user)
 	. = ..()
 	if(frying)
@@ -140,6 +152,8 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 		return
 
 	reagents.trans_to(frying, oil_use * seconds_per_tick, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic
+	grease_level += prob(grease_increase_chance) * grease_Increase_amount
+
 	cook_time += fry_speed * seconds_per_tick
 	if(cook_time >= DEEPFRYER_COOKTIME && !frying_fried)
 		frying_fried = TRUE //frying... frying... fried
@@ -169,7 +183,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 	frying_burnt = FALSE
 	fry_loop.stop()
 	cook_time = 0
+	flick("fryer_stop", src)
 	icon_state = "fryer_off"
+	update_appearance(UPDATE_OVERLAYS)
 
 /obj/machinery/deepfryer/proc/start_fry(obj/item/frying_item, mob/user)
 	to_chat(user, span_notice("Вы кладете [frying_item.name] в [src.name]."))
@@ -188,6 +204,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 		ADD_TRAIT(frying, TRAIT_FOOD_CHEF_MADE, REF(user.mind))
 	SEND_SIGNAL(frying, COMSIG_ITEM_ENTERED_FRYER)
 
+	flick("fryer_start", src)
 	icon_state = "fryer_on"
 	fry_loop.start()
 
@@ -234,5 +251,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
 		user.changeNext_move(CLICK_CD_MELEE)
 	return ..()
 
+/obj/machinery/deepfryer/proc/on_cleaned(obj/source_component, obj/source)
+	grease_level = 0
+	update_appearance(UPDATE_OVERLAYS)
+
 #undef DEEPFRYER_COOKTIME
 #undef DEEPFRYER_BURNTIME
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index b861255a8b48c..0e842d3e3fbbd 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -112,7 +112,6 @@
 
 /obj/machinery/microwave/Destroy()
 	QDEL_LIST(ingredients)
-	QDEL_NULL(wires)
 	QDEL_NULL(soundloop)
 	QDEL_NULL(particles)
 	if(!isnull(cell))
@@ -382,6 +381,9 @@
 	if(operating)
 		return NONE
 
+	if (item.item_flags & ABSTRACT)
+		return NONE
+
 	if(broken > NOT_BROKEN)
 		balloon_alert(user, "он сломан!")
 		return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm
index e15f87092c0d4..b3cd5c8368b2d 100644
--- a/code/modules/food_and_drinks/machinery/processor.dm
+++ b/code/modules/food_and_drinks/machinery/processor.dm
@@ -159,7 +159,9 @@
 
 	var/duration = (total_time / rating_speed)
 	INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, Shake), 1, 0, duration)
-	sleep(duration)
+	addtimer(CALLBACK(src, PROC_REF(complete_processing)), duration)
+
+/obj/machinery/processor/proc/complete_processing()
 	for(var/atom/movable/content_item in processor_contents)
 		var/datum/food_processor_process/recipe = PROCESSOR_SELECT_RECIPE(content_item)
 		if (!recipe)
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index 923b85e845273..c39ff358564c1 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -5,8 +5,8 @@
 	name = "смарт-холодильник"
 	desc = "Сохраняет холодные вещи холодными, а горячие - горячими."
 	icon = 'icons/obj/machines/smartfridge.dmi'
-	icon_state = "smartfridge"
-	base_icon_state = "plant"
+	icon_state = "smartfridge-icon"
+	base_icon_state = "smartfridge"
 	layer = BELOW_OBJ_LAYER
 	density = TRUE
 	circuit = /obj/item/circuitboard/machine/smartfridge
@@ -14,9 +14,11 @@
 	light_range = MINIMUM_USEFUL_LIGHT_RANGE
 	integrity_failure = 0.5
 	can_atmos_pass = ATMOS_PASS_NO
+	/// Icon state part for contents display
+	var/contents_overlay_icon = "plant"
 	/// What path boards used to construct it should build into when dropped. Needed so we don't accidentally have them build variants with items preloaded in them.
 	var/base_build_path = /obj/machinery/smartfridge
-	/// Maximum number of items that can be loaded into the machine
+	/// Maximum number of items that can be loaded into the machine per matter bin tier
 	var/max_n_of_items = 1500
 	/// List of items that the machine starts with upon spawn
 	var/list/initial_contents
@@ -25,14 +27,20 @@
 	/// Is this smartfridge going to have a glowing screen? (Drying Racks are not)
 	var/has_emissive = TRUE
 	/// Whether the smartfridge is welded down to the floor disabling unwrenching
+	var/can_be_welded_down = TRUE
+	/// Whether the smartfridge is welded down to the floor disabling unwrenching
 	var/welded_down = FALSE
+	/// The sound of item retrieval
+	var/vend_sound = 'sound/machines/machine_vend.ogg'
+	/// Whether the UI should be set to list view by default
+	var/default_list_view = FALSE
 
 /obj/machinery/smartfridge/Initialize(mapload)
 	. = ..()
 	create_reagents(100, NO_REACT)
 	air_update_turf(TRUE, TRUE)
 	register_context()
-	if(mapload)
+	if(mapload && can_be_welded_down)
 		welded_down = TRUE
 
 	if(islist(initial_contents))
@@ -49,6 +57,8 @@
 	move_update_air(old_loc)
 
 /obj/machinery/smartfridge/welder_act(mob/living/user, obj/item/tool)
+	if(!can_be_welded_down)
+		return ..()
 	if(welded_down)
 		if(!tool.tool_start_check(user, amount=2))
 			return ITEM_INTERACT_BLOCKING
@@ -112,9 +122,9 @@
 /obj/machinery/smartfridge/screwdriver_act(mob/living/user, obj/item/tool)
 	if(default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
 		if(panel_open)
-			add_overlay("[initial(icon_state)]-panel")
+			add_overlay("[base_icon_state]-panel")
 		else
-			cut_overlay("[initial(icon_state)]-panel")
+			cut_overlay("[base_icon_state]-panel")
 		SStgui.update_uis(src)
 		return ITEM_INTERACT_SUCCESS
 	return ITEM_INTERACT_BLOCKING
@@ -156,7 +166,7 @@
 		if(welded_down)
 			context[SCREENTIP_CONTEXT_LMB] = "Разварить"
 			tool_tip_set = TRUE
-		else if (!welded_down && anchored)
+		else if (!welded_down && anchored && can_be_welded_down)
 			context[SCREENTIP_CONTEXT_LMB] = "Приварить"
 			tool_tip_set = TRUE
 		if(machine_stat & BROKEN)
@@ -181,7 +191,7 @@
 /obj/machinery/smartfridge/RefreshParts()
 	. = ..()
 	for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
-		max_n_of_items = 1500 * matter_bin.tier
+		max_n_of_items = initial(max_n_of_items) * matter_bin.tier
 
 /obj/machinery/smartfridge/examine(mob/user)
 	. = ..()
@@ -197,8 +207,9 @@
 
 	if(welded_down)
 		. += span_info("Крепежи накрепко [EXAMINE_HINT("приварены")] к полу.")
-	else
-		. += span_info("Крепежи [EXAMINE_HINT("срезаны")].")
+	else if (can_be_welded_down)
+		. += span_info("Крепежи можно [EXAMINE_HINT("срезать")].")
+
 
 	if(anchored)
 		. += span_info("Можно [EXAMINE_HINT("прикрутить")] болты.")
@@ -211,24 +222,21 @@
 	set_light((!(machine_stat & BROKEN) && powered()) ? MINIMUM_USEFUL_LIGHT_RANGE : 0)
 
 /obj/machinery/smartfridge/update_icon_state()
-	icon_state = "[initial(icon_state)]"
+	icon_state = "[base_icon_state]"
 	if(machine_stat & BROKEN)
 		icon_state += "-broken"
-	else if(!powered())
-		icon_state += "-off"
 	return ..()
 
 /// Returns the number of items visible in the fridge. Faster than subtracting 2 lists
 /obj/machinery/smartfridge/proc/visible_items()
-	return contents.len - 1 // Circuitboard
+	return contents.len - 1 // Exclude circuitboard
 
 /obj/machinery/smartfridge/update_overlays()
 	. = ..()
 
-	var/initial_icon_state = initial(icon_state)
 	var/shown_contents_length = visible_items()
 	if(visible_contents && shown_contents_length)
-		var/content_level = "[initial_icon_state]-[base_icon_state]"
+		var/content_level = "[base_icon_state]-[contents_overlay_icon]"
 		switch(shown_contents_length)
 			if(1 to 25)
 				content_level += "-1"
@@ -238,10 +246,10 @@
 				content_level += "-3"
 		. += mutable_appearance(icon, content_level)
 
-	. += mutable_appearance(icon, "[initial_icon_state]-glass[(machine_stat & BROKEN) ? "-broken" : ""]")
-
-	if(!machine_stat && has_emissive)
-		. += emissive_appearance(icon, "[initial_icon_state]-light-mask", src, alpha = src.alpha)
+	. += mutable_appearance(icon, "[base_icon_state]-glass[(machine_stat & BROKEN) ? "-broken" : ""]")
+	if(has_emissive && powered() && !(machine_stat & BROKEN))
+		. += mutable_appearance(icon, "[base_icon_state]-powered")
+		. += emissive_appearance(icon, "[base_icon_state]-light-mask", src, alpha = src.alpha)
 
 /obj/machinery/smartfridge/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
@@ -364,16 +372,21 @@
 
 		var/atom/movable/atom = item
 		if (!QDELETED(atom))
-			var/md5name = md5(atom.name) // This needs to happen because of a bug in a TGUI component, https://github.com/ractivejs/ractive/issues/744
-			if (listofitems[md5name]) // which is fixed in a version we cannot use due to ie8 incompatibility
-				listofitems[md5name]["amount"]++ // The good news is, #30519 made smartfridge UIs non-auto-updating
+			var/key = "[atom.type]-[atom.name]"
+			if (listofitems[key])
+				listofitems[key]["amount"]++
 			else
-				listofitems[md5name] = list("name" = atom.name, "amount" = 1)
-	sort_list(listofitems)
-
-	.["contents"] = listofitems
+				listofitems[key] = list(
+					"path" = key,
+					"name" = full_capitalize(atom.name),
+					"icon" = atom.icon,
+					"icon_state" = atom.icon_state,
+					"amount" = 1
+					)
+	.["contents"] = sort_list(listofitems)
 	.["name"] = name
 	.["isdryer"] = FALSE
+	.["default_list_view"] = default_list_view
 
 /obj/machinery/smartfridge/Exited(atom/movable/gone, direction) // Update the UIs in case something inside is removed
 	. = ..()
@@ -389,26 +402,23 @@
 
 	switch(action)
 		if("Release")
-			var/desired = 0
+			var/amount = text2num(params["amount"])
+			var/desired = 1
+			var/dispensed_amount = 0
 
 			if(isAI(living_mob))
 				to_chat(living_mob, span_warning("[src.name] вне зоны вашего контроля!"))
 				return
 
-			if (params["amount"])
-				desired = text2num(params["amount"])
-			else
-				desired = tgui_input_number(living_mob, "How many items would you like to take out?", "Release", max_value = 50)
+			if (amount > 1)
+				desired = tgui_input_number(living_mob, "How many items would you like to take out?", "Release", default = min(amount, 50), max_value = min(amount, 50))
 				if(!desired)
 					return
 
 			for(var/obj/item/dispensed_item in src)
 				if(desired <= 0)
 					break
-				// Grab the first item in contents which name matches our passed name.
-				// format_text() is used here to strip \improper and \proper from both names,
-				// which is required for correct string comparison between them.
-				if(format_text(dispensed_item.name) == format_text(params["name"]))
+				if(params["path"] == "[dispensed_item.type]-[dispensed_item.name]")
 					if(dispensed_item in component_parts)
 						CRASH("Attempted removal of [dispensed_item] component_part from smartfridge via smartfridge interface.")
 					//dispense the item
@@ -416,8 +426,10 @@
 						dispensed_item.forceMove(drop_location())
 						adjust_item_drop_location(dispensed_item)
 					use_energy(active_power_usage)
+					dispensed_amount++
 					desired--
-
+			if(dispensed_amount && vend_sound)
+				playsound(src, vend_sound, 50, TRUE, extrarange = -3)
 			if (visible_contents)
 				update_appearance()
 			return
@@ -425,89 +437,50 @@
 	return FALSE
 
 // ----------------------------
-//  Drying Rack 'smartfridge'
+//  Drying 'smartfridge'
 // ----------------------------
 /obj/machinery/smartfridge/drying_rack
 	name = "сушилка"
 	desc = "Деревянное сооружение, используемое для сушки растительных продуктов, еды и шкур."
-	icon = 'icons/obj/service/hydroponics/equipment.dmi'
-	icon_state = "drying_rack"
-	resistance_flags = FLAMMABLE
-	visible_contents = FALSE
-	base_build_path = /obj/machinery/smartfridge/drying_rack //should really be seeing this without admin fuckery.
-	use_power = NO_POWER_USE
-	idle_power_usage = 0
+	icon_state = "dehydrator-icon"
+	base_icon_state = "dehydrator"
+	contents_overlay_icon = "contents"
+	base_build_path = /obj/machinery/smartfridge/drying //should really be seeing this without admin fuckery.
+	circuit = /obj/item/circuitboard/machine/dehydrator
+	light_power = 0.5
 	has_emissive = FALSE
 	can_atmos_pass = ATMOS_PASS_YES
+	can_be_welded_down = FALSE
+	max_n_of_items = 25
+	vend_sound = null
 	/// Is the rack currently drying stuff
 	var/drying = FALSE
 	/// The reference to the last user's mind. Needed for the chef made trait to be properly applied correctly to dried food.
 	var/datum/weakref/current_user
 
-/obj/machinery/smartfridge/drying_rack/Initialize(mapload)
-	. = ..()
-
-	//you can't weld down wood
-	welded_down = FALSE
-
-	//so we don't drop any of the parent smart fridge parts upon deconstruction
-	clear_components()
-
-/obj/machinery/smartfridge/drying_rack/Destroy()
+/obj/machinery/smartfridge/drying/Destroy()
 	current_user = null
 	return ..()
 
-/// We cleared out the components in initialize so we can optimize this
-/obj/machinery/smartfridge/drying_rack/visible_items()
-	return contents.len
-
-/obj/machinery/smartfridge/drying_rack/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
-	if(isnull(held_item))
-		return NONE
-
-	var/tool_tip_set = FALSE
-	if(held_item.tool_behaviour == TOOL_CROWBAR)
-		context[SCREENTIP_CONTEXT_LMB] = "Разобрать"
-		tool_tip_set = TRUE
-	else if(held_item.tool_behaviour == TOOL_WRENCH)
-		context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "От" : "При"]крутить"
-		tool_tip_set = TRUE
-
-	return tool_tip_set ? CONTEXTUAL_SCREENTIP_SET : NONE
-
-/obj/machinery/smartfridge/drying_rack/structure_examine()
-	. = ""
-	if(anchored)
-		. += span_info("Он сейчас [EXAMINE_HINT("прикручен")] к полу.")
-	else
-		. += span_info("Он не прикручен к полу, его можно [EXAMINE_HINT("прикрутить")] сейчас.")
-	. += span_info("Внутренни можно [EXAMINE_HINT("порвать")] на части.")
-
-/obj/machinery/smartfridge/drying_rack/welder_act(mob/living/user, obj/item/tool)
-	return NONE
+/obj/machinery/smartfridge/drying/AllowDrop()
+	return TRUE // Allow drying results to stay inside
 
-/obj/machinery/smartfridge/drying_rack/welder_act_secondary(mob/living/user, obj/item/tool)
-	return NONE
-
-/obj/machinery/smartfridge/drying_rack/default_deconstruction_screwdriver()
-	return NONE
-
-/obj/machinery/smartfridge/drying_rack/exchange_parts()
-	return
-
-/obj/machinery/smartfridge/drying_rack/on_deconstruction(disassembled)
-	new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
+/obj/machinery/smartfridge/drying/update_overlays()
+	. = ..()
+	if(visible_contents && powered() && !(machine_stat & BROKEN))
+		var/suffix = drying ? "on" : "off"
+		. += mutable_appearance(icon, "[base_icon_state]-[suffix]")
+		. += emissive_appearance(icon, "[base_icon_state]-[suffix]", src, alpha = src.alpha)
 
-/obj/machinery/smartfridge/drying_rack/crowbar_act(mob/living/user, obj/item/tool)
-	if(default_deconstruction_crowbar(tool, ignore_panel = TRUE))
-		return ITEM_INTERACT_SUCCESS
+/obj/machinery/smartfridge/drying/visible_items()
+	return min(1, (contents.len - 1)) // Return one if has any, as there's only one icon for overlay
 
-/obj/machinery/smartfridge/drying_rack/ui_data(mob/user)
+/obj/machinery/smartfridge/drying/ui_data(mob/user)
 	. = ..()
 	.["isdryer"] = TRUE
 	.["drying"] = drying
 
-/obj/machinery/smartfridge/drying_rack/ui_act(action, params)
+/obj/machinery/smartfridge/drying/ui_act(action, params)
 	. = ..()
 	if(.)
 		update_appearance() // This is to handle a case where the last item is taken out manually instead of through drying pop-out
@@ -518,15 +491,15 @@
 			toggle_drying(FALSE, usr)
 			return TRUE
 
-/obj/machinery/smartfridge/drying_rack/powered()
+/obj/machinery/smartfridge/drying/powered()
 	return !anchored ? FALSE : ..()
 
-/obj/machinery/smartfridge/drying_rack/power_change()
+/obj/machinery/smartfridge/drying/power_change()
 	. = ..()
 	if(!powered())
 		toggle_drying(TRUE)
 
-/obj/machinery/smartfridge/drying_rack/load(obj/item/dried_object, mob/user) //For updating the filled overlay
+/obj/machinery/smartfridge/drying/load(obj/item/dried_object, mob/user) //For updating the filled overlay
 	. = ..()
 	if(!.)
 		return
@@ -534,25 +507,18 @@
 	if(drying && user?.mind)
 		current_user = WEAKREF(user.mind)
 
-/obj/machinery/smartfridge/drying_rack/update_overlays()
-	. = ..()
-	if(drying)
-		. += "drying_rack_drying"
-	if(contents.len)
-		. += "drying_rack_filled"
-
-/obj/machinery/smartfridge/drying_rack/process()
+/obj/machinery/smartfridge/drying/process(seconds_per_tick)
 	if(drying)
 		for(var/obj/item/item_iterator in src)
 			if(!accept_check(item_iterator))
 				continue
-			rack_dry(item_iterator)
+			SEND_SIGNAL(item_iterator, COMSIG_ITEM_DRIED, current_user, seconds_per_tick)
 
 		SStgui.update_uis(src)
 		update_appearance()
 		use_energy(active_power_usage)
 
-/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
+/obj/machinery/smartfridge/drying/accept_check(obj/item/O)
 	return HAS_TRAIT(O, TRAIT_DRYABLE)
 
 /**
@@ -560,7 +526,7 @@
  * Arguments
  * * forceoff - if TRUE will force the dryer off always
  */
-/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff, mob/user)
+/obj/machinery/smartfridge/drying/proc/toggle_drying(forceoff, mob/user)
 	if(drying || forceoff)
 		drying = FALSE
 		current_user = FALSE
@@ -572,15 +538,70 @@
 		update_use_power(ACTIVE_POWER_USE)
 	update_appearance()
 
-/obj/machinery/smartfridge/drying_rack/proc/rack_dry(obj/item/target)
-	SEND_SIGNAL(target, COMSIG_ITEM_DRIED, current_user)
-
-/obj/machinery/smartfridge/drying_rack/emp_act(severity)
+/obj/machinery/smartfridge/drying/emp_act(severity)
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
 	atmos_spawn_air("[TURF_TEMPERATURE(1000)]")
 
+/// Wooden version
+/obj/machinery/smartfridge/drying/rack
+	name = "drying rack"
+	desc = "A wooden contraption, used to dry plant products, food and hide."
+	icon_state = "drying-rack"
+	base_icon_state = "drying-rack"
+	resistance_flags = FLAMMABLE
+	visible_contents = FALSE
+	base_build_path = /obj/machinery/smartfridge/drying/rack
+	use_power = NO_POWER_USE
+	idle_power_usage = 0
+
+/obj/machinery/smartfridge/drying/rack/Initialize(mapload)
+	. = ..()
+	//so we don't drop any of the parent smart fridge parts upon deconstruction
+	clear_components()
+
+/obj/machinery/smartfridge/drying/rack/welder_act_secondary(mob/living/user, obj/item/tool)
+	return NONE // Can't repair wood with welder
+
+/obj/machinery/smartfridge/drying/rack/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+	if(isnull(held_item))
+		return NONE
+
+	var/tool_tip_set = FALSE
+	if(held_item.tool_behaviour == TOOL_CROWBAR)
+		context[SCREENTIP_CONTEXT_LMB] = "Deconstruct"
+		tool_tip_set = TRUE
+	else if(held_item.tool_behaviour == TOOL_WRENCH)
+		context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Un" : ""]anchore"
+		tool_tip_set = TRUE
+
+	return tool_tip_set ? CONTEXTUAL_SCREENTIP_SET : NONE
+
+/obj/machinery/smartfridge/drying/rack/structure_examine()
+	. = ..()
+	. += span_info("The whole rack can be [EXAMINE_HINT("pried")] apart.")
+
+/obj/machinery/smartfridge/drying/rack/default_deconstruction_screwdriver()
+	return NONE
+
+/obj/machinery/smartfridge/drying/rack/exchange_parts()
+	return
+
+/obj/machinery/smartfridge/drying/rack/on_deconstruction(disassembled)
+	new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
+
+/obj/machinery/smartfridge/drying/rack/crowbar_act(mob/living/user, obj/item/tool)
+	if(default_deconstruction_crowbar(tool, ignore_panel = TRUE))
+		return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/smartfridge/drying/rack/update_overlays()
+	. = ..()
+	if(drying)
+		. += "[base_icon_state]-drying"
+	if(contents.len)
+		. += "[base_icon_state]-filled"
+
 // ----------------------------
 //  Bar drink smartfridge
 // ----------------------------
@@ -588,7 +609,7 @@
 	name = "витрина напитков"
 	desc = "Холодильник для хранения вкусного алкоголя."
 	base_build_path = /obj/machinery/smartfridge/drinks
-	base_icon_state = "drink"
+	contents_overlay_icon = "drink"
 
 /obj/machinery/smartfridge/drinks/accept_check(obj/item/weapon)
 	//not an item or valid container
@@ -608,7 +629,7 @@
 /obj/machinery/smartfridge/food
 	desc = "Холодильник для хранения продуктов."
 	base_build_path = /obj/machinery/smartfridge/food
-	base_icon_state = "food"
+	contents_overlay_icon = "food"
 
 /obj/machinery/smartfridge/food/accept_check(obj/item/weapon)
 	if(weapon.w_class >= WEIGHT_CLASS_BULKY)
@@ -626,7 +647,7 @@
 	name = "умное хранилище экстракта слаймов"
 	desc = "Холодильник для хранения экстракта слаймов."
 	base_build_path = /obj/machinery/smartfridge/extract
-	base_icon_state = "slime"
+	contents_overlay_icon = "slime"
 
 /obj/machinery/smartfridge/extract/accept_check(obj/item/weapon)
 	return (istype(weapon, /obj/item/slime_extract) || istype(weapon, /obj/item/slime_scanner))
@@ -641,7 +662,7 @@
 	name = "умное хранилище чашек Петри"
 	desc = "Холодильник для хранения чашек Петри."
 	base_build_path = /obj/machinery/smartfridge/petri
-	base_icon_state = "petri"
+	contents_overlay_icon = "petri"
 
 /obj/machinery/smartfridge/petri/accept_check(obj/item/weapon)
 	return istype(weapon, /obj/item/petri_dish)
@@ -657,7 +678,7 @@
 	desc = "Холодильник для хранения органов."
 	max_n_of_items = 20 //vastly lower to prevent processing too long
 	base_build_path = /obj/machinery/smartfridge/organ
-	base_icon_state = "organ"
+	contents_overlay_icon = "organ"
 	/// The rate at which this fridge will repair damaged organs
 	var/repair_rate = 0
 
@@ -710,7 +731,8 @@
 	name = "умное хранилище химикатов"
 	desc = "Холодильник для хранения лекарств."
 	base_build_path = /obj/machinery/smartfridge/chemistry
-	base_icon_state = "chem"
+	contents_overlay_icon = "chem"
+	default_list_view = TRUE
 
 /obj/machinery/smartfridge/chemistry/accept_check(obj/item/weapon)
 	// not an item or reagent container
@@ -760,7 +782,8 @@
 	name = "умное хранилище вирусов"
 	desc = "Холодильник для хранения летучих образцов."
 	base_build_path = /obj/machinery/smartfridge/chemistry/virology
-	base_icon_state = "viro"
+	contents_overlay_icon = "viro"
+	default_list_view = TRUE
 
 /obj/machinery/smartfridge/chemistry/virology/preloaded
 	initial_contents = list(
@@ -781,10 +804,12 @@
 	name = "устройство для сортировки дисков"
 	desc = "Машина, способная хранить множество дисков. В большинстве случаев обозначается как DSU (disk storage unit)."
 	icon_state = "disktoaster"
-	icon = 'icons/obj/machines/vending.dmi'
+	base_icon_state = "disktoaster"
+	has_emissive = TRUE
 	pass_flags = PASSTABLE
 	can_atmos_pass = ATMOS_PASS_YES
 	visible_contents = FALSE
+	has_emissive = FALSE
 	base_build_path = /obj/machinery/smartfridge/disks
 
 /obj/machinery/smartfridge/disks/accept_check(obj/item/weapon)
diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm
index ef75de8db8672..446782d00cbf4 100644
--- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm
@@ -1469,6 +1469,20 @@
 		/datum/reagent/water = 5,
 	)
 
+//Fresh Jellyfish fillet soup!
+/datum/chemical_reaction/food/soup/jellyfish_stew_two
+	required_reagents = list(/datum/reagent/water = 50)
+	required_ingredients = list(
+		/obj/item/food/fishmeat/gunner_jellyfish = 1,
+		/obj/item/food/grown/soybeans = 1,
+		/obj/item/food/grown/redbeet = 1,
+		/obj/item/food/grown/potato = 1
+	)
+	results = list(
+		/datum/reagent/consumable/nutriment/soup/jellyfish = 50,
+	)
+
+
 // Rootbread Soup
 /datum/reagent/consumable/nutriment/soup/rootbread
 	name = "Rootbread Soup"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
index c02a7243368bd..4d028de06fb22 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
@@ -827,7 +827,7 @@
 
 // Machinery: Drying rack
 /datum/crafting_recipe/food/drying
-	machinery = list(/obj/machinery/smartfridge/drying_rack)
+	machinery = list(/obj/machinery/smartfridge/drying)
 	steps = list("Put into the rack and dry")
 	category = CAT_MISCFOOD
 	non_craftable = TRUE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
index 100e74fd91682..71716a1ee7c2a 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
@@ -480,6 +480,10 @@
 	reaction = /datum/chemical_reaction/food/soup/jellyfish_stew
 	category = CAT_LIZARD
 
+/datum/crafting_recipe/food/reaction/soup/jellyfish_stew_two
+	reaction = /datum/chemical_reaction/food/soup/jellyfish_stew_two
+	category = CAT_LIZARD
+
 /datum/crafting_recipe/food/reaction/soup/rootbread_soup
 	reaction = /datum/chemical_reaction/food/soup/rootbread_soup
 	category = CAT_LIZARD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 3ce319b1985a2..376c1d4f84509 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -399,6 +399,42 @@
 	result = /obj/item/food/donkpocket/gondola
 	category = CAT_PASTRY
 
+/datum/crafting_recipe/food/donkpocket/deluxe
+	time = 15
+	name = "Deluxe Donk-pocket"
+	reqs = list(
+		/obj/item/food/pastrybase = 1,
+		/obj/item/food/meatball = 1,
+		/obj/item/food/meat/bacon = 1,
+		/obj/item/food/onion_slice/red = 1
+	)
+	result = /obj/item/food/donkpocket/deluxe
+	category = CAT_PASTRY
+
+/datum/crafting_recipe/food/donkpocket/deluxe/nocarb
+	time = 15
+	name = "Deluxe Meat-pocket"
+	reqs = list(
+		/obj/item/organ/internal/heart = 1,
+		/obj/item/food/meatball = 1,
+		/obj/item/food/meat/slab = 1,
+		/obj/item/food/grown/herbs = 1
+	)
+	result = /obj/item/food/donkpocket/deluxe/nocarb
+	category = CAT_PASTRY
+
+/datum/crafting_recipe/food/donkpocket/deluxe/vegan
+	time = 15
+	name = "Deluxe Donk-roll"
+	reqs = list(
+		/obj/item/food/pastrybase = 1,
+		/obj/item/food/boiledrice = 1,
+		/obj/item/food/grown/bell_pepper = 1,
+		/obj/item/food/tofu = 2
+	)
+	result = /obj/item/food/donkpocket/deluxe/vegan
+	category = CAT_PASTRY
+
 ////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/muffin
diff --git a/code/modules/hallucination/station_message.dm b/code/modules/hallucination/station_message.dm
index 846ccf7deb481..f35ff19c003f6 100644
--- a/code/modules/hallucination/station_message.dm
+++ b/code/modules/hallucination/station_message.dm
@@ -10,7 +10,7 @@
 
 /datum/hallucination/station_message/blob_alert/start()
 	priority_announce("Вспышка биологической угрозы 5-го уровня зафиксирована на борту [station_name()]. Всему персоналу надлежит сдержать её распространение любой ценой!", \
-		"ВНИМАНИЕ: Биологическая угроза", ANNOUNCER_OUTBREAK5, players = list(hallucinator))
+		"Биологическая угроза", ANNOUNCER_OUTBREAK5, players = list(hallucinator))
 	return ..()
 
 /datum/hallucination/station_message/shuttle_dock
@@ -33,7 +33,7 @@
 		return FALSE
 
 	priority_announce("Во всех системах станций обнаружены вредоносные процессы. Пожалуйста, уничтожьте свой ИИ, чтобы предотвратить возможный ущерб его моральному ядру.", \
-		"ВНИМАНИЕ: Обнаружена аномалия", ANNOUNCER_AIMALF, players = list(hallucinator))
+		"Обнаружена аномалия", ANNOUNCER_AIMALF, players = list(hallucinator))
 	return ..()
 
 /datum/hallucination/station_message/heretic
@@ -105,7 +105,7 @@
 	random_hallucination_weight = 2
 
 /datum/hallucination/station_message/meteors/start()
-	priority_announce("Зафиксировано движение астероидов на встречном со станцией курсе.", "ВНИМАНИЕ: Астероиды", ANNOUNCER_METEORS, players = list(hallucinator))
+	priority_announce("Зафиксировано движение астероидов на встречном со станцией курсе.", "Астероиды", ANNOUNCER_METEORS, players = list(hallucinator))
 	return ..()
 
 /datum/hallucination/station_message/supermatter_delam
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 24e5274f7fbfe..6fe7fdbc57d94 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -856,7 +856,7 @@
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
 
 
-// EASTER (this having it's own spot should be understandable)
+// EASTER (this having its own spot should be understandable)
 
 /datum/holiday/easter
 	name = EASTER
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index ee62a12b3d0e1..0222fd41cdcf1 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -120,7 +120,11 @@
 	. = ..()
 	if(prob(15))
 		icon_state = "basalt[rand(0, 12)]"
-		set_basalt_light(src)
+		switch(icon_state)
+			if("basalt1", "basalt2", "basalt3")
+				set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+			if("basalt5", "basalt9")
+				set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
 
 /turf/open/floor/holofloor/space
 	name = "\proper space"
diff --git a/code/modules/hydroponics/grown/aloe.dm b/code/modules/hydroponics/grown/aloe.dm
index cfbefce6dba21..0548098732622 100644
--- a/code/modules/hydroponics/grown/aloe.dm
+++ b/code/modules/hydroponics/grown/aloe.dm
@@ -1,7 +1,7 @@
 
 // aloe
 /obj/item/seeds/aloe
-	name = "pack of aloe seeds"
+	name = "aloe seed pack"
 	desc = "These seeds grow into aloe."
 	icon_state = "seed-aloe"
 	species = "aloe"
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 2becc390f3980..92cdc2d62c8c1 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -11,7 +11,7 @@
 
 // Ambrosia Vulgaris
 /obj/item/seeds/ambrosia
-	name = "pack of ambrosia vulgaris seeds"
+	name = "ambrosia vulgaris seed pack"
 	desc = "These seeds grow into common ambrosia, a plant grown by and from medicine."
 	icon_state = "seed-ambrosiavulgaris"
 	plant_icon_offset = 0
@@ -36,7 +36,7 @@
 
 // Ambrosia Deus
 /obj/item/seeds/ambrosia/deus
-	name = "pack of ambrosia deus seeds"
+	name = "ambrosia deus seed pack"
 	desc = "These seeds grow into ambrosia deus. Could it be the food of the gods..?"
 	icon_state = "seed-ambrosiadeus"
 	species = "ambrosiadeus"
@@ -55,7 +55,7 @@
 
 //Ambrosia Gaia
 /obj/item/seeds/ambrosia/gaia
-	name = "pack of ambrosia gaia seeds"
+	name = "ambrosia gaia seed pack"
 	desc = "These seeds grow into ambrosia gaia, filled with infinite potential."
 	icon_state = "seed-ambrosia_gaia"
 	species = "ambrosia_gaia"
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 0079f63ec9023..c1739cc7dea82 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -1,6 +1,6 @@
 // Apple
 /obj/item/seeds/apple
-	name = "pack of apple seeds"
+	name = "apple seed pack"
 	desc = "These seeds grow into apple trees."
 	icon_state = "seed-apple"
 	species = "apple"
@@ -31,7 +31,7 @@
 
 // Gold Apple
 /obj/item/seeds/apple/gold
-	name = "pack of golden apple seeds"
+	name = "golden apple seed pack"
 	desc = "These seeds grow into golden apple trees. Good thing there are no firebirds in space."
 	icon_state = "seed-goldapple"
 	species = "goldapple"
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index ab38f6889907a..6e09ee3497cdd 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -1,6 +1,6 @@
 // Banana
 /obj/item/seeds/banana
-	name = "pack of banana seeds"
+	name = "banana seed pack"
 	desc = "They're seeds that grow into banana trees. When grown, keep away from clown."
 	icon_state = "seed-banana"
 	species = "banana"
@@ -91,7 +91,7 @@
 
 // Mimana - invisible sprites are totally a feature!
 /obj/item/seeds/banana/mime
-	name = "pack of mimana seeds"
+	name = "mimana seed pack"
 	desc = "They're seeds that grow into mimana trees. When grown, keep away from mime."
 	icon_state = "seed-mimana"
 	species = "mimana"
@@ -119,7 +119,7 @@
 
 // Bluespace Banana
 /obj/item/seeds/banana/bluespace
-	name = "pack of bluespace banana seeds"
+	name = "bluespace banana seed pack"
 	desc = "They're seeds that grow into bluespace banana trees. When grown, keep away from bluespace clown."
 	icon_state = "seed-banana-blue"
 	species = "bluespacebanana"
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index fb82737711404..885eb77c0c695 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -1,6 +1,6 @@
 // Soybeans
 /obj/item/seeds/soya
-	name = "pack of soybean seeds"
+	name = "soybean seed pack"
 	desc = "These seeds grow into soybean plants."
 	icon_state = "seed-soybean"
 	species = "soybean"
@@ -30,7 +30,7 @@
 
 // Koibean
 /obj/item/seeds/soya/koi
-	name = "pack of koibean seeds"
+	name = "koibean seed pack"
 	desc = "These seeds grow into koibean plants."
 	icon_state = "seed-koibean"
 	species = "koibean"
@@ -44,16 +44,26 @@
 /obj/item/food/grown/koibeans
 	seed = /obj/item/seeds/soya/koi
 	name = "koibean"
-	desc = "Something about these seems fishy."
+	desc = "Something about these seems fishy, they seem really soft, almost squeezable!"
 	icon_state = "koibeans"
 	foodtypes = VEGETABLES
 	tastes = list("koi" = 1)
 	wine_power = 40
 
+//Now squeezable for imitation carpmeat
+/obj/item/food/grown/koibeans/attack_self(mob/living/user)
+	user.visible_message(span_notice("[user] crushes [src] into a slab of carplike meat."), span_notice("You crush [src] into something that resembles a slab of carplike meat."))
+	playsound(user, 'sound/effects/blobattack.ogg', 50, TRUE)
+	var/obj/item/food/fishmeat/carp/imitation/fishie = new(null)
+	fishie.reagents.set_all_reagents_purity(seed.get_reagent_purity())
+	qdel(src)
+	user.put_in_hands(fishie)
+	return TRUE
+
 //Butterbeans, the beans wid da butta!
 // Butterbeans! - Squeeze for a single butter slice!
 /obj/item/seeds/soya/butter
-	name = "pack of butterbean seeds"
+	name = "butterbean seed pack"
 	desc = "These seeds grow into butterbean plants."
 	icon_state = "seed-butterbean"
 	species = "butterbean"
@@ -84,7 +94,7 @@
 
 // Green Beans
 /obj/item/seeds/greenbean
-	name = "pack of green bean seeds"
+	name = "green bean seed pack"
 	desc = "These seeds grow into green bean plants."
 	icon_state = "seed-greenbean"
 	species = "greenbean"
@@ -113,7 +123,7 @@
 
 // Jumping Bean
 /obj/item/seeds/greenbean/jump
-	name = "pack of jumping bean seeds"
+	name = "jumping bean seed pack"
 	desc = "These seeds grow into jumping bean plants."
 	icon_state = "seed-jumpingbean"
 	species = "jumpingbean"
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index 317f8ef2ed87f..10631e4dcb0b6 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -1,6 +1,6 @@
 // Berries
 /obj/item/seeds/berry
-	name = "pack of berry seeds"
+	name = "berry seed pack"
 	desc = "These seeds grow into berry bushes."
 	icon_state = "seed-berry"
 	species = "berry"
@@ -31,7 +31,7 @@
 
 // Poison Berries
 /obj/item/seeds/berry/poison
-	name = "pack of poison-berry seeds"
+	name = "poison-berry seed pack"
 	desc = "These seeds grow into poison-berry bushes."
 	icon_state = "seed-poisonberry"
 	species = "poisonberry"
@@ -55,7 +55,7 @@
 
 // Death Berries
 /obj/item/seeds/berry/death
-	name = "pack of death-berry seeds"
+	name = "death-berry seed pack"
 	desc = "These seeds grow into death berries."
 	icon_state = "seed-deathberry"
 	species = "deathberry"
@@ -81,7 +81,7 @@
 
 // Glow Berries
 /obj/item/seeds/berry/glow
-	name = "pack of glow-berry seeds"
+	name = "glow-berry seed pack"
 	desc = "These seeds grow into glow-berry bushes."
 	icon_state = "seed-glowberry"
 	species = "glowberry"
@@ -108,7 +108,7 @@
 
 // Grapes
 /obj/item/seeds/grape
-	name = "pack of grape seeds"
+	name = "grape seed pack"
 	desc = "These seeds grow into grape vines."
 	icon_state = "seed-grapes"
 	species = "grape"
@@ -143,7 +143,7 @@
 
 // Green Grapes
 /obj/item/seeds/grape/green
-	name = "pack of green grape seeds"
+	name = "green grape seed pack"
 	desc = "These seeds grow into green-grape vines."
 	icon_state = "seed-greengrapes"
 	species = "greengrape"
@@ -162,7 +162,7 @@
 
 // Toechtauese Berries
 /obj/item/seeds/toechtauese
-	name = "pack of töchtaüse berry seeds"
+	name = "töchtaüse berry seed pack"
 	desc = "These seeds grow into töchtaüse bushes."
 	icon_state = "seed-toechtauese"
 	species = "toechtauese"
@@ -190,7 +190,7 @@
 	distill_reagent = /datum/reagent/toxin/itching_powder
 
 /obj/item/seeds/lanternfruit
-	name = "pack of lanternfruit seeds"
+	name = "lanternfruit seed pack"
 	desc = "These seeds grow into lanternfruit pods."
 	icon_state = "seed-lanternfruit"
 	species = "lanternfruit"
diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index c336f0f4b2456..df2cda24b2d62 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -1,6 +1,6 @@
 // Cannabis
 /obj/item/seeds/cannabis
-	name = "pack of cannabis seeds"
+	name = "cannabis seed pack"
 	desc = "Taxable."
 	icon_state = "seed-cannabis"
 	plant_icon_offset = 6
@@ -24,7 +24,7 @@
 
 
 /obj/item/seeds/cannabis/rainbow
-	name = "pack of rainbow weed seeds"
+	name = "rainbow weed seed pack"
 	desc = "These seeds grow into rainbow weed. Groovy... and also highly addictive."
 	icon_state = "seed-megacannabis"
 	icon_grow = "megacannabis-grow"
@@ -36,7 +36,7 @@
 	rarity = 40
 
 /obj/item/seeds/cannabis/death
-	name = "pack of deathweed seeds"
+	name = "deathweed seed pack"
 	desc = "These seeds grow into deathweed. Not groovy."
 	icon_state = "seed-blackcannabis"
 	icon_grow = "blackcannabis-grow"
@@ -48,7 +48,7 @@
 	rarity = 40
 
 /obj/item/seeds/cannabis/white
-	name = "pack of lifeweed seeds"
+	name = "lifeweed seed pack"
 	desc = "I will give unto him that is munchies of the fountain of the cravings of life, freely."
 	icon_state = "seed-whitecannabis"
 	icon_grow = "whitecannabis-grow"
@@ -62,7 +62,7 @@
 
 
 /obj/item/seeds/cannabis/ultimate
-	name = "pack of omega weed seeds"
+	name = "omega weed seed pack"
 	desc = "These seeds grow into omega weed."
 	icon_state = "seed-ocannabis"
 	plant_icon_offset = 0
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index 744c0dc5b023c..b304382d2dc47 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -1,6 +1,6 @@
 // Wheat
 /obj/item/seeds/wheat
-	name = "pack of wheat seeds"
+	name = "wheat seed pack"
 	desc = "These may, or may not, grow into wheat."
 	icon_state = "seed-wheat"
 	species = "wheat"
@@ -30,7 +30,7 @@
 
 // Oat
 /obj/item/seeds/wheat/oat
-	name = "pack of oat seeds"
+	name = "oat seed pack"
 	desc = "These may, or may not, grow into oat."
 	icon_state = "seed-oat"
 	species = "oat"
@@ -52,7 +52,7 @@
 
 // Rice
 /obj/item/seeds/wheat/rice
-	name = "pack of rice seeds"
+	name = "rice seed pack"
 	desc = "These may, or may not, grow into rice."
 	icon_state = "seed-rice"
 	species = "rice"
@@ -76,7 +76,7 @@
 
 //Meatwheat - grows into synthetic meat
 /obj/item/seeds/wheat/meat
-	name = "pack of meatwheat seeds"
+	name = "meatwheat seed pack"
 	desc = "If you ever wanted to drive a vegetarian to insanity, here's how."
 	icon_state = "seed-meatwheat"
 	species = "meatwheat"
diff --git a/code/modules/hydroponics/grown/cherries.dm b/code/modules/hydroponics/grown/cherries.dm
index 4ebd42489d96f..ad35bacf8fe71 100644
--- a/code/modules/hydroponics/grown/cherries.dm
+++ b/code/modules/hydroponics/grown/cherries.dm
@@ -1,6 +1,6 @@
 // Cherries
 /obj/item/seeds/cherry
-	name = "pack of cherry pits"
+	name = "cherry pit pack"
 	desc = "Careful not to crack a tooth on one... That'd be the pits."
 	icon_state = "seed-cherry"
 	species = "cherry"
@@ -34,7 +34,7 @@
 
 // Blue Cherries
 /obj/item/seeds/cherry/blue
-	name = "pack of blue cherry pits"
+	name = "blue cherry pit pack"
 	desc = "The blue kind of cherries."
 	icon_state = "seed-bluecherry"
 	species = "bluecherry"
@@ -57,7 +57,7 @@
 
 //Cherry Bulbs
 /obj/item/seeds/cherry/bulb
-	name = "pack of cherry bulb pits"
+	name = "cherry bulb pit pack"
 	desc = "The glowy kind of cherries."
 	icon_state = "seed-cherrybulb"
 	species = "cherrybulb"
@@ -82,7 +82,7 @@
 
 //Cherry Bombs
 /obj/item/seeds/cherry/bomb
-	name = "pack of cherry bomb pits"
+	name = "cherry bomb pit pack"
 	desc = "They give you vibes of dread and frustration."
 	icon_state = "seed-cherry_bomb"
 	species = "cherry_bomb"
diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm
index 9f6d3bbd08ce0..1d9aaa8468ebf 100644
--- a/code/modules/hydroponics/grown/chili.dm
+++ b/code/modules/hydroponics/grown/chili.dm
@@ -1,6 +1,6 @@
 // Chili
 /obj/item/seeds/chili
-	name = "pack of chili seeds"
+	name = "chili seed pack"
 	desc = "These seeds grow into chili plants. HOT! HOT! HOT!"
 	icon_state = "seed-chili"
 	species = "chili"
@@ -30,7 +30,7 @@
 
 // Ice Chili
 /obj/item/seeds/chili/ice
-	name = "pack of chilly pepper seeds"
+	name = "chilly pepper seed pack"
 	desc = "These seeds grow into chilly pepper plants."
 	icon_state = "seed-icepepper"
 	species = "chiliice"
@@ -56,7 +56,7 @@
 
 // Ghost Chili
 /obj/item/seeds/chili/ghost
-	name = "pack of ghost chili seeds"
+	name = "ghost chili seed pack"
 	desc = "These seeds grow into a chili said to be the hottest in the galaxy."
 	icon_state = "seed-chilighost"
 	species = "chilighost"
@@ -83,7 +83,7 @@
 
 // Bell Pepper
 /obj/item/seeds/chili/bell_pepper
-	name = "pack of bell pepper seeds"
+	name = "bell pepper seed pack"
 	desc = "These seeds grow into bell pepper plants. MILD! MILD! MILD!"
 	icon_state = "seed-bell-pepper"
 	species = "bellpepper"
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index c624722f82392..6bfc8bc203af5 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -9,7 +9,7 @@
 
 // Lime
 /obj/item/seeds/lime
-	name = "pack of lime seeds"
+	name = "lime seed pack"
 	desc = "These are very sour seeds."
 	icon_state = "seed-lime"
 	species = "lime"
@@ -33,7 +33,7 @@
 
 // Orange
 /obj/item/seeds/orange
-	name = "pack of orange seeds"
+	name = "orange seed pack"
 	desc = "Sour seeds."
 	icon_state = "seed-orange"
 	species = "orange"
@@ -61,7 +61,7 @@
 
 // Lemon
 /obj/item/seeds/lemon
-	name = "pack of lemon seeds"
+	name = "lemon seed pack"
 	desc = "These are sour seeds."
 	icon_state = "seed-lemon"
 	species = "lemon"
@@ -86,7 +86,7 @@
 
 // Combustible lemon
 /obj/item/seeds/firelemon //combustible lemon is too long so firelemon
-	name = "pack of combustible lemon seeds"
+	name = "combustible lemon seed pack"
 	desc = "When life gives you lemons, don't make lemonade. Make life take the lemons back! Get mad! I don't want your damn lemons!"
 	icon_state = "seed-firelemon"
 	species = "firelemon"
@@ -112,7 +112,7 @@
 
 //3D Orange
 /obj/item/seeds/orange_3d
-	name = "pack of extradimensional orange seeds"
+	name = "extradimensional orange seed pack"
 	desc = "Polygonal seeds."
 	icon_state = "seed-orange"
 	species = "orange"
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 4e9a9810b4280..e4b6c916f7cc9 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -1,6 +1,6 @@
 // Cocoa Pod
 /obj/item/seeds/cocoapod
-	name = "pack of cocoa pod seeds"
+	name = "cocoa pod seed pack"
 	desc = "These seeds grow into cacao trees. They look fattening." //SIC: cocoa is the seeds. The trees are spelled cacao.
 	icon_state = "seed-cocoapod"
 	species = "cocoapod"
@@ -31,7 +31,7 @@
 
 // Vanilla Pod
 /obj/item/seeds/cocoapod/vanillapod
-	name = "pack of vanilla pod seeds"
+	name = "vanilla pod seed pack"
 	desc = "These seeds grow into vanilla trees. They look fattening."
 	icon_state = "seed-vanillapod"
 	species = "vanillapod"
@@ -52,7 +52,7 @@
 	distill_reagent = /datum/reagent/consumable/vanilla //Takes longer, but you can get even more vanilla from it.
 
 /obj/item/seeds/cocoapod/bungotree
-	name = "pack of bungo tree seeds"
+	name = "bungo tree seed pack"
 	desc = "These seeds grow into bungo trees. They appear to be heavy and almost perfectly spherical."
 	icon_state = "seed-bungotree"
 	plant_icon_offset = 4
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index d5f9f94e1b2df..02f77280c5ab9 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -1,6 +1,6 @@
 // Corn
 /obj/item/seeds/corn
-	name = "pack of corn seeds"
+	name = "corn seed pack"
 	desc = "I don't mean to sound corny..."
 	icon_state = "seed-corn"
 	species = "corn"
@@ -57,7 +57,7 @@
 
 // Snapcorn
 /obj/item/seeds/corn/snapcorn
-	name = "pack of snapcorn seeds"
+	name = "snapcorn seed pack"
 	desc = "Oh snap!"
 	icon_state = "seed-snapcorn"
 	species = "snapcorn"
@@ -100,7 +100,7 @@
 
 //Pepper-corn - Heh funny.
 /obj/item/seeds/corn/pepper
-	name = "pack of pepper-corn seeds"
+	name = "pepper-corn seed pack"
 	desc = "If Peter picked a pack of pepper-corn..."
 	icon_state = "seed-peppercorn"
 	species = "peppercorn"
diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
index 819d97f321f8d..c2149b7a33006 100644
--- a/code/modules/hydroponics/grown/cotton.dm
+++ b/code/modules/hydroponics/grown/cotton.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/cotton
-	name = "pack of cotton seeds"
+	name = "cotton seed pack"
 	desc = "A pack of seeds that'll grow into a cotton plant. Assistants make good free labor if neccesary."
 	icon_state = "seed-cotton"
 	species = "cotton"
@@ -45,7 +45,7 @@
 
 //reinforced mutated variant
 /obj/item/seeds/cotton/durathread
-	name = "pack of durathread seeds"
+	name = "durathread seed pack"
 	desc = "A pack of seeds that'll grow into an extremely durable thread that could easily rival plasteel if woven properly."
 	icon_state = "seed-durathread"
 	species = "durathread"
diff --git a/code/modules/hydroponics/grown/cucumber.dm b/code/modules/hydroponics/grown/cucumber.dm
index f3712c6a5c90a..a8487a0cac9bc 100644
--- a/code/modules/hydroponics/grown/cucumber.dm
+++ b/code/modules/hydroponics/grown/cucumber.dm
@@ -1,6 +1,6 @@
 // CUCUMBERS YEAH
 /obj/item/seeds/cucumber
-	name = "pack of cucumber seeds"
+	name = "cucumber seed pack"
 	desc = "These seeds grow into cucumber plants."
 	icon_state = "seed-cucumber"
 	species = "cucumber"
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index d4b38c3438bdb..47cbc6d934cd3 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -1,6 +1,6 @@
 // Eggplant
 /obj/item/seeds/eggplant
-	name = "pack of eggplant seeds"
+	name = "eggplant seed pack"
 	desc = "These seeds grow to produce berries that look nothing like eggs."
 	icon_state = "seed-eggplant"
 	species = "eggplant"
@@ -25,7 +25,7 @@
 
 // Egg-Plant
 /obj/item/seeds/eggplant/eggy
-	name = "pack of egg-plant seeds"
+	name = "egg-plant seed pack"
 	desc = "These seeds grow to produce berries that look a lot like eggs."
 	icon_state = "seed-eggy"
 	species = "eggy"
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 84b1414335caf..d4ef53474fc97 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -1,6 +1,6 @@
 // Poppy
 /obj/item/seeds/poppy
-	name = "pack of poppy seeds"
+	name = "poppy seed pack"
 	desc = "These seeds grow into poppies."
 	icon_state = "seed-poppy"
 	species = "poppy"
@@ -32,7 +32,7 @@
 
 // Lily
 /obj/item/seeds/poppy/lily
-	name = "pack of lily seeds"
+	name = "lily seed pack"
 	desc = "These seeds grow into lilies."
 	icon_state = "seed-lily"
 	species = "lily"
@@ -52,7 +52,7 @@
 
 	//Spacemans's Trumpet
 /obj/item/seeds/poppy/lily/trumpet
-	name = "pack of spaceman's trumpet seeds"
+	name = "spaceman's trumpet seed pack"
 	desc = "A plant sculped by extensive genetic engineering. The spaceman's trumpet is said to bear no resemblance to its wild ancestors. Inside NT AgriSci circles it is better known as NTPW-0372."
 	icon_state = "seed-trumpet"
 	species = "spacemanstrumpet"
@@ -86,7 +86,7 @@
 
 // Geranium
 /obj/item/seeds/poppy/geranium
-	name = "pack of geranium seeds"
+	name = "geranium seed pack"
 	desc = "These seeds grow into geranium."
 	icon_state = "seed-geranium"
 	species = "geranium"
@@ -106,7 +106,7 @@
 
 ///Fraxinella seeds.
 /obj/item/seeds/poppy/geranium/fraxinella
-	name = "pack of fraxinella seeds"
+	name = "fraxinella seed pack"
 	desc = "These seeds grow into fraxinella."
 	icon_state = "seed-fraxinella"
 	species = "fraxinella"
@@ -130,7 +130,7 @@
 
 // Harebell
 /obj/item/seeds/harebell
-	name = "pack of harebell seeds"
+	name = "harebell seed pack"
 	desc = "These seeds grow into pretty little flowers."
 	icon_state = "seed-harebell"
 	plant_icon_offset = 1
@@ -162,7 +162,7 @@
 
 // Sunflower
 /obj/item/seeds/sunflower
-	name = "pack of sunflower seeds"
+	name = "sunflower seed pack"
 	desc = "These seeds grow into sunflowers."
 	icon_state = "seed-sunflower"
 	species = "sunflower"
@@ -203,7 +203,7 @@
 
 // Moonflower
 /obj/item/seeds/sunflower/moonflower
-	name = "pack of moonflower seeds"
+	name = "moonflower seed pack"
 	desc = "These seeds grow into moonflowers."
 	icon_state = "seed-moonflower"
 	lefthand_file = 'icons/mob/inhands/items/food_lefthand.dmi'
@@ -231,7 +231,7 @@
 
 // Novaflower
 /obj/item/seeds/sunflower/novaflower
-	name = "pack of novaflower seeds"
+	name = "novaflower seed pack"
 	desc = "These seeds grow into novaflowers."
 	icon_state = "seed-novaflower"
 	species = "novaflower"
@@ -266,7 +266,7 @@
 
 // Rose
 /obj/item/seeds/rose
-	name = "pack of rose seeds"
+	name = "rose seed pack"
 	desc = "These seeds grow into roses."
 	icon_state = "seed-rose"
 	species = "rose"
@@ -311,7 +311,7 @@
 
 // Carbon Rose
 /obj/item/seeds/carbon_rose
-	name = "pack of carbon rose seeds"
+	name = "carbon rose seed pack"
 	desc = "These seeds grow into carbon roses."
 	icon_state = "seed-carbonrose"
 	species = "carbonrose"
diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm
index e37d49fa93032..755d0c2920a3f 100644
--- a/code/modules/hydroponics/grown/garlic.dm
+++ b/code/modules/hydroponics/grown/garlic.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/garlic
-	name = "pack of garlic seeds"
+	name = "garlic seed pack"
 	desc = "A packet of extremely pungent seeds."
 	icon_state = "seed-garlic"
 	species = "garlic"
diff --git a/code/modules/hydroponics/grown/gatfruit.dm b/code/modules/hydroponics/grown/gatfruit.dm
index f64b6eb3bd481..c6de17d6eb684 100644
--- a/code/modules/hydroponics/grown/gatfruit.dm
+++ b/code/modules/hydroponics/grown/gatfruit.dm
@@ -1,7 +1,7 @@
 
 // Gatfruit
 /obj/item/seeds/gatfruit
-	name = "pack of gatfruit seeds"
+	name = "gatfruit seed pack"
 	desc = "These seeds grow into .357 revolvers."
 	icon_state = "seed-gatfruit"
 	species = "gatfruit"
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index 732a6d32b881b..a5cdc08fb7658 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -1,6 +1,6 @@
 // Grass
 /obj/item/seeds/grass
-	name = "pack of grass seeds"
+	name = "grass seed pack"
 	desc = "These seeds grow into grass. Yummy!"
 	icon_state = "seed-grass"
 	species = "grass"
@@ -42,7 +42,7 @@
 
 //Fairygrass
 /obj/item/seeds/grass/fairy
-	name = "pack of fairygrass seeds"
+	name = "fairygrass seed pack"
 	desc = "These seeds grow into a more mystical grass."
 	icon_state = "seed-fairygrass"
 	species = "fairygrass"
@@ -65,7 +65,7 @@
 
 // Carpet
 /obj/item/seeds/grass/carpet
-	name = "pack of carpet seeds"
+	name = "carpet seed pack"
 	desc = "These seeds grow into stylish carpet samples."
 	icon_state = "seed-carpet"
 	species = "carpet"
diff --git a/code/modules/hydroponics/grown/hedges.dm b/code/modules/hydroponics/grown/hedges.dm
index 9127f70f78fd4..d02949bfd9813 100644
--- a/code/modules/hydroponics/grown/hedges.dm
+++ b/code/modules/hydroponics/grown/hedges.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/shrub
-	name = "pack of shrub seeds"
+	name = "shrub seed pack"
 	desc = "These seeds grow into hedge shrubs."
 	icon_state = "seed-shrub"
 	species = "shrub"
diff --git a/code/modules/hydroponics/grown/herbs.dm b/code/modules/hydroponics/grown/herbs.dm
index b22be06ec6aca..bc450d6857f18 100644
--- a/code/modules/hydroponics/grown/herbs.dm
+++ b/code/modules/hydroponics/grown/herbs.dm
@@ -1,6 +1,6 @@
 // Herbs
 /obj/item/seeds/herbs
-	name = "pack of herb seeds"
+	name = "herb seed pack"
 	desc = "These seeds grow to produce an assortment of herbs and seasonings."
 	icon_state = "seed-herbs"
 	species = "herbs"
diff --git a/code/modules/hydroponics/grown/korta_nut.dm b/code/modules/hydroponics/grown/korta_nut.dm
index cfa6c1e5b51f3..457ebff07163e 100644
--- a/code/modules/hydroponics/grown/korta_nut.dm
+++ b/code/modules/hydroponics/grown/korta_nut.dm
@@ -1,6 +1,6 @@
 //Korta Nut
 /obj/item/seeds/korta_nut
-	name = "pack of korta nut seeds"
+	name = "korta nut seed pack"
 	desc = "These seeds grow into korta nut bushes, native to Tizira."
 	icon_state = "seed-korta"
 	species = "kortanut"
@@ -29,7 +29,7 @@
 
 //Sweet Korta Nut
 /obj/item/seeds/korta_nut/sweet
-	name = "pack of sweet korta nut seeds"
+	name = "sweet korta nut seed pack"
 	desc = "These seeds grow into sweet korta nuts, a mutation of the original species that produces a thick syrup that Tizirans use for desserts."
 	icon_state = "seed-sweetkorta"
 	species = "kortanut"
diff --git a/code/modules/hydroponics/grown/kronkus.dm b/code/modules/hydroponics/grown/kronkus.dm
index 90d264230e750..b4ba30a5eddbe 100644
--- a/code/modules/hydroponics/grown/kronkus.dm
+++ b/code/modules/hydroponics/grown/kronkus.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/kronkus
-	name = "pack of kronkus seeds"
+	name = "kronkus seed pack"
 	desc = "A pack of highly illegal kronkus seeds.\nPossession of these seeds carries the death penalty in 7 sectors."
 	icon_state = "seed-kronkus"
 	plant_icon_offset = 6
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index 0e59231141fc4..3aca50ae1be54 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -1,6 +1,6 @@
 // Watermelon
 /obj/item/seeds/watermelon
-	name = "pack of watermelon seeds"
+	name = "watermelon seed pack"
 	desc = "These seeds grow into watermelon plants."
 	icon_state = "seed-watermelon"
 	species = "watermelon"
@@ -27,6 +27,7 @@
 	name = "watermelon"
 	desc = "It's full of watery goodness."
 	icon_state = "watermelon"
+	inhand_icon_state = "watermelon"
 	bite_consumption_mod = 2
 	w_class = WEIGHT_CLASS_NORMAL
 	foodtypes = FRUIT
@@ -39,9 +40,41 @@
 /obj/item/food/grown/watermelon/make_dryable()
 	return //No drying
 
+/obj/item/food/grown/watermelon/attackby(obj/item/I, mob/user, params)
+	if(!istype(I, /obj/item/kitchen/spoon))
+		return ..()
+
+	var/melon_pulp_count = 1
+	if(seed)
+		melon_pulp_count += round(seed.potency / 25)
+
+	user.balloon_alert(user, "scooped out [melon_pulp_count] pulp(s)")
+	for(var/i in 1 to melon_pulp_count)
+		new /obj/item/food/watermelonmush(user.loc)
+
+	/// The piece of armour melon turns into; either chetsplate or helmet
+	var/obj/item/clothing/melon_armour
+	/// Chance for the armour to be a chestplate instead of the helmet
+	var/melon_chestplate_chance = (max(0, seed.potency - 50) / 50)
+	if (prob(melon_chestplate_chance))
+		if(seed.resistance_flags & FIRE_PROOF)
+			melon_armour = new /obj/item/clothing/suit/armor/durability/watermelon/fire_resist
+		else
+			melon_armour = new /obj/item/clothing/suit/armor/durability/watermelon
+		to_chat(user, span_notice("You hollow the melon into a helmet with [I]."))
+	else
+		if(seed.resistance_flags & FIRE_PROOF)
+			melon_armour = new /obj/item/clothing/head/helmet/durability/watermelon/fire_resist
+		else
+			melon_armour = new /obj/item/clothing/head/helmet/durability/watermelon
+		to_chat(user, span_notice("You hollow the melon into a chestplate with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(melon_armour)
+
 // Holymelon
 /obj/item/seeds/watermelon/holy
-	name = "pack of holymelon seeds"
+	name = "holymelon seed pack"
 	desc = "These seeds grow into holymelon plants."
 	icon_state = "seed-holymelon"
 	species = "holymelon"
@@ -66,6 +99,9 @@
 	wine_power = 70 //Water to wine, baby.
 	wine_flavor = "divinity"
 
+/obj/item/food/grown/holymelon/make_processable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/holymelonslice, 5, 20, screentip_verb = "Slice")
+
 /obj/item/food/grown/holymelon/make_dryable()
 	return //No drying
 
@@ -73,6 +109,39 @@
 	. = ..()
 	AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_holyness)))
 
+
+/obj/item/food/grown/holymelon/attackby(obj/item/I, mob/user, params)
+	if(!istype(I, /obj/item/kitchen/spoon))
+		return ..()
+
+	var/holymelon_pulp_count = 1
+	if(seed)
+		holymelon_pulp_count += round(seed.potency / 25)
+
+	user.balloon_alert(user, "scooped out [holymelon_pulp_count] pulp(s)")
+	for(var/i in 1 to holymelon_pulp_count)
+		new /obj/item/food/holymelonmush(user.loc)
+
+	/// The piece of armour holymelon turns into; either chetsplate or helmet
+	var/obj/item/clothing/holymelon_armour
+	/// Chance for the armour to be a chestplate instead of the helmet
+	var/holymelon_chestplate_chance = (max(0, seed.potency - 50) / 50)
+	if (prob(holymelon_chestplate_chance))
+		if(seed.resistance_flags & FIRE_PROOF)
+			holymelon_armour = new /obj/item/clothing/suit/armor/durability/holymelon/fire_resist
+		else
+			holymelon_armour = new /obj/item/clothing/suit/armor/durability/holymelon
+		to_chat(user, span_notice("You hollow the holymelon into a helmet with [I]."))
+	else
+		if(seed.resistance_flags & FIRE_PROOF)
+			holymelon_armour = new /obj/item/clothing/head/helmet/durability/holymelon/fire_resist
+		else
+			holymelon_armour = new /obj/item/clothing/head/helmet/durability/holymelon
+		to_chat(user, span_notice("You hollow the holymelon into a chestplate with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(holymelon_armour)
+
 /*
  * Callback to be used with the edible component.
  * Checks whether or not the person eating the holymelon
@@ -90,7 +159,7 @@
 
 /// Barrel melon Seeds
 /obj/item/seeds/watermelon/barrel
-	name = "pack of barrelmelon seeds"
+	name = "barrelmelon seed pack"
 	desc = "These seeds grow into barrelmelon plants."
 	icon_state = "seed-barrelmelon"
 	species = "barrelmelon"
@@ -108,4 +177,41 @@
 	name = "barrelmelon"
 	desc = "The nutriments within this melon have been compressed and fermented into rich alcohol."
 	icon_state = "barrelmelon"
+	inhand_icon_state = "barrelmelon"
 	distill_reagent = /datum/reagent/medicine/antihol //You can call it a integer overflow.
+
+/obj/item/food/grown/barrelmelon/make_processable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/barrelmelonslice, 5, 20, screentip_verb = "Chop")
+
+/obj/item/food/grown/barrelmelon/attackby(obj/item/I, mob/user, params)
+	if(!istype(I, /obj/item/kitchen/spoon))
+		return ..()
+
+	var/barrelmelon_pulp_count = 1
+	if(seed)
+		barrelmelon_pulp_count += round(seed.potency / 25)
+
+	user.balloon_alert(user, "scooped out [barrelmelon_pulp_count] pulp(s)")
+	for(var/i in 1 to barrelmelon_pulp_count)
+		new /obj/item/food/barrelmelonmush(user.loc)
+
+	/// The piece of armour barrelmelon turns into; either chetsplate or helmet
+	var/obj/item/clothing/barrelmelon_armour
+	/// Chance for the armour to be a chestplate instead of the helmet
+	var/barrelmelon_chestplate_chance = (max(0, seed.potency - 50) / 50)
+	if (prob(barrelmelon_chestplate_chance))
+		if(seed.resistance_flags & FIRE_PROOF)
+			barrelmelon_armour = new /obj/item/clothing/suit/armor/durability/barrelmelon/fire_resist
+		else
+			barrelmelon_armour = new /obj/item/clothing/suit/armor/durability/barrelmelon
+		to_chat(user, span_notice("You hollow the barrelmelon into a helmet with [I]."))
+	else
+		if(seed.resistance_flags & FIRE_PROOF)
+			barrelmelon_armour = new /obj/item/clothing/head/helmet/durability/barrelmelon/fire_resist
+		else
+			barrelmelon_armour = new /obj/item/clothing/head/helmet/durability/barrelmelon
+		to_chat(user, span_notice("You hollow the barrelmelon into a chestplate with [I]."))
+
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(barrelmelon_armour)
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index bfc50f0c483b3..9d1d802916bff 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -11,7 +11,7 @@
 
 // Reishi
 /obj/item/seeds/reishi
-	name = "pack of reishi mycelium"
+	name = "reishi mycelium pack"
 	desc = "This mycelium grows into something medicinal and relaxing."
 	icon_state = "mycelium-reishi"
 	species = "reishi"
@@ -38,7 +38,7 @@
 
 // Fly Amanita
 /obj/item/seeds/amanita
-	name = "pack of fly amanita mycelium"
+	name = "fly amanita mycelium pack"
 	desc = "This mycelium grows into something horrible."
 	icon_state = "mycelium-amanita"
 	species = "amanita"
@@ -65,7 +65,7 @@
 
 // Destroying Angel
 /obj/item/seeds/angel
-	name = "pack of destroying angel mycelium"
+	name = "destroying angel mycelium pack"
 	desc = "This mycelium grows into something devastating."
 	icon_state = "mycelium-angel"
 	species = "angel"
@@ -93,7 +93,7 @@
 
 // Liberty Cap
 /obj/item/seeds/liberty
-	name = "pack of liberty-cap mycelium"
+	name = "liberty-cap mycelium pack"
 	desc = "This mycelium grows into liberty-cap mushrooms."
 	icon_state = "mycelium-liberty"
 	species = "liberty"
@@ -119,7 +119,7 @@
 
 // Plump Helmet
 /obj/item/seeds/plump
-	name = "pack of plump-helmet mycelium"
+	name = "plump-helmet mycelium pack"
 	desc = "This mycelium grows into helmets... maybe."
 	icon_state = "mycelium-plump"
 	species = "plump"
@@ -145,7 +145,7 @@
 
 // Walking Mushroom
 /obj/item/seeds/plump/walkingmushroom
-	name = "pack of walking mushroom mycelium"
+	name = "walking mushroom mycelium pack"
 	desc = "This mycelium will grow into huge stuff!"
 	icon_state = "mycelium-walkingmushroom"
 	species = "walkingmushroom"
@@ -171,7 +171,7 @@
 
 // Chanterelle
 /obj/item/seeds/chanter
-	name = "pack of chanterelle mycelium"
+	name = "chanterelle mycelium pack"
 	desc = "This mycelium grows into chanterelle mushrooms."
 	icon_state = "mycelium-chanter"
 	species = "chanter"
@@ -197,9 +197,23 @@
 	desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
 	icon_state = "chanterelle"
 
+/obj/item/food/grown/mushroom/chanterelle/attackby(obj/item/I, mob/user, params)
+	if(!istype(I, /obj/item/kitchen/spoon))
+		return ..()
+	if(seed.potency < 95)
+		return ..()
+
+	to_chat(user, span_notice("You hollow up the chanterelle with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	if(seed.resistance_flags & FIRE_PROOF)
+		user.put_in_hands(new /obj/item/clothing/head/wizard/chanterelle/fr())
+	else
+		user.put_in_hands(new /obj/item/clothing/head/wizard/chanterelle())
+
 //Jupiter Cup
 /obj/item/seeds/chanter/jupitercup
-	name = "pack of jupiter cup mycelium"
+	name = "jupiter cup mycelium pack"
 	desc = "This mycelium grows into jupiter cups. Zeus would be envious at the power at your fingertips."
 	icon_state = "mycelium-jupitercup"
 	species = "jupitercup"
@@ -224,7 +238,7 @@
 
 // Glowshroom
 /obj/item/seeds/glowshroom
-	name = "pack of glowshroom mycelium"
+	name = "glowshroom mycelium pack"
 	desc = "This mycelium -glows- into mushrooms!"
 	icon_state = "mycelium-glowshroom"
 	species = "glowshroom"
@@ -279,7 +293,7 @@
 
 // Glowcap
 /obj/item/seeds/glowshroom/glowcap
-	name = "pack of glowcap mycelium"
+	name = "glowcap mycelium pack"
 	desc = "This mycelium -powers- into mushrooms!"
 	icon_state = "mycelium-glowcap"
 	species = "glowcap"
@@ -303,7 +317,7 @@
 
 //Shadowshroom
 /obj/item/seeds/glowshroom/shadowshroom
-	name = "pack of shadowshroom mycelium"
+	name = "shadowshroom mycelium pack"
 	desc = "This mycelium will grow into something shadowy."
 	icon_state = "mycelium-shadowshroom"
 	species = "shadowshroom"
@@ -332,7 +346,7 @@
 		investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY)
 
 /obj/item/seeds/odious_puffball
-	name = "pack of odious pullball spores"
+	name = "odious pullball spore pack"
 	desc = "These spores reek! Disgusting."
 	icon_state = "seed-odiouspuffball"
 	species = "odiouspuffball"
diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm
index 38102cacb24ea..0b2f52c7a5e7b 100644
--- a/code/modules/hydroponics/grown/olive.dm
+++ b/code/modules/hydroponics/grown/olive.dm
@@ -1,6 +1,6 @@
 // Olive
 /obj/item/seeds/olive
-	name = "pack of olive seeds"
+	name = "olive seed pack"
 	desc = "These seeds grow into olive trees."
 	icon_state = "seed-olive"
 	species = "olive"
diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm
index 8f948407a37b8..0d33c3e1f395d 100644
--- a/code/modules/hydroponics/grown/onion.dm
+++ b/code/modules/hydroponics/grown/onion.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/onion
-	name = "pack of onion seeds"
+	name = "onion seed pack"
 	desc = "These seeds grow into onions."
 	icon_state = "seed-onion"
 	species = "onion"
@@ -29,7 +29,7 @@
 	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/onion_slice, 2, 15, screentip_verb = "Cut")
 
 /obj/item/seeds/onion/red
-	name = "pack of red onion seeds"
+	name = "red onion seed pack"
 	desc = "For growing exceptionally potent onions."
 	icon_state = "seed-onionred"
 	species = "onion_red"
diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm
index 69cf6d9e0568d..6560ec196c918 100644
--- a/code/modules/hydroponics/grown/peanut.dm
+++ b/code/modules/hydroponics/grown/peanut.dm
@@ -1,6 +1,6 @@
 // Peanuts!
 /obj/item/seeds/peanut
-	name = "pack of peanut seeds"
+	name = "peanut seed pack"
 	desc = "These seeds grow into peanut plants."
 	icon_state = "seed-peanut"
 	species = "peanut"
diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm
index c232ed247c690..66eaec6ff1d54 100644
--- a/code/modules/hydroponics/grown/peas.dm
+++ b/code/modules/hydroponics/grown/peas.dm
@@ -1,6 +1,6 @@
 // Finally, peas. Base plant.
 /obj/item/seeds/peas
-	name = "pack of pea pods"
+	name = "pea pod pack"
 	desc = "These seeds grows into vitamin rich peas!"
 	icon_state = "seed-peas"
 	species = "peas"
@@ -29,7 +29,7 @@
 
 // Laughin' Peas
 /obj/item/seeds/peas/laugh
-	name = "pack of laughin' peas"
+	name = "laughin' pea pack"
 	desc = "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
 	icon_state = "seed-laughpeas"
 	species = "laughpeas"
@@ -61,7 +61,7 @@
 
 // World Peas - Peace at last, peace at last...
 /obj/item/seeds/peas/laugh/peace
-	name = "pack of world peas"
+	name = "world pea pack"
 	desc = "These rather large seeds give off a soothing blue glow..."
 	icon_state = "seed-worldpeas"
 	species = "worldpeas"
diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm
index 3c0e462f38855..5de85e9168f1f 100644
--- a/code/modules/hydroponics/grown/pineapple.dm
+++ b/code/modules/hydroponics/grown/pineapple.dm
@@ -1,6 +1,6 @@
 // Pineapple!
 /obj/item/seeds/pineapple
-	name = "pack of pineapple seeds"
+	name = "pineapple seed pack"
 	desc = "Oooooooooooooh!"
 	icon_state = "seed-pineapple"
 	species = "pineapple"
diff --git a/code/modules/hydroponics/grown/plum.dm b/code/modules/hydroponics/grown/plum.dm
index cac12bdb1eb5d..c11acdf2db553 100644
--- a/code/modules/hydroponics/grown/plum.dm
+++ b/code/modules/hydroponics/grown/plum.dm
@@ -1,6 +1,6 @@
 // Plum
 /obj/item/seeds/plum
-	name = "pack of plum seeds"
+	name = "plum seed pack"
 	desc = "These seeds grow into plum trees."
 	icon_state = "seed-plum"
 	species = "plum"
@@ -28,7 +28,7 @@
 
 // Plumb
 /obj/item/seeds/plum/plumb
-	name = "pack of plumb seeds"
+	name = "plumb seed pack"
 	desc = "These seeds grow into plumb trees."
 	icon_state = "seed-plumb"
 	species = "plumb"
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 837937e41d128..c57111b86d0c0 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -1,6 +1,6 @@
 // Potato
 /obj/item/seeds/potato
-	name = "pack of potato seeds"
+	name = "potato seed pack"
 	desc = "Boil 'em! Mash 'em! Stick 'em in a stew!"
 	icon_state = "seed-potato"
 	species = "potato"
@@ -50,7 +50,7 @@
 
 // Sweet Potato
 /obj/item/seeds/potato/sweet
-	name = "pack of sweet potato seeds"
+	name = "sweet potato seed pack"
 	desc = "These seeds grow into sweet potato plants."
 	icon_state = "seed-sweetpotato"
 	species = "sweetpotato"
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 11130c153344a..dce207302c306 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -1,6 +1,6 @@
 // Pumpkin
 /obj/item/seeds/pumpkin
-	name = "pack of pumpkin seeds"
+	name = "pumpkin seed pack"
 	desc = "These seeds grow into pumpkin vines."
 	icon_state = "seed-pumpkin"
 	plant_icon_offset = 4
@@ -40,7 +40,7 @@
 
 // Blumpkin
 /obj/item/seeds/pumpkin/blumpkin
-	name = "pack of blumpkin seeds"
+	name = "blumpkin seed pack"
 	desc = "These seeds grow into blumpkin vines."
 	icon_state = "seed-blumpkin"
 	species = "blumpkin"
diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm
index 4ffad4583c705..c3d21347bf953 100644
--- a/code/modules/hydroponics/grown/rainbow_bunch.dm
+++ b/code/modules/hydroponics/grown/rainbow_bunch.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/rainbow_bunch
-	name = "pack of rainbow bunch seeds"
+	name = "rainbow bunch seed pack"
 	desc = "A pack of seeds that'll grow into a beautiful bush of various colored flowers."
 	icon_state = "seed-rainbowbunch"
 	species = "rainbowbunch"
diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm
index 560e3c71e5ce6..3a97277f0d85c 100644
--- a/code/modules/hydroponics/grown/random.dm
+++ b/code/modules/hydroponics/grown/random.dm
@@ -1,7 +1,7 @@
 //Random seeds; stats, traits, and plant type are randomized for each seed.
 
 /obj/item/seeds/random
-	name = "pack of strange seeds"
+	name = "strange seed pack"
 	desc = "Mysterious seeds as strange as their name implies. Spooky."
 	icon_state = "seed-x"
 	species = "?????"
diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm
index 31c0b7f81df64..602b90f4c3567 100644
--- a/code/modules/hydroponics/grown/replicapod.dm
+++ b/code/modules/hydroponics/grown/replicapod.dm
@@ -1,8 +1,8 @@
-// A very special plant, deserving it's own file.
+// A very special plant, deserving its own file.
 
 // Yes, i'm talking about cabbage, baby! No, just kidding, but cabbages are the precursor to replica pods, so they are here as well.
 /obj/item/seeds/cabbage
-	name = "pack of cabbage seeds"
+	name = "cabbage seed pack"
 	desc = "These seeds grow into cabbages."
 	icon_state = "seed-cabbage"
 	species = "cabbage"
@@ -31,7 +31,7 @@
 
 ///The actual replica pods themselves!
 /obj/item/seeds/replicapod
-	name = "pack of replica pod seeds"
+	name = "replica pod seed pack"
 	desc = "These seeds grow into replica pods. They say these are used to harvest humans."
 	icon_state = "seed-replicapod"
 	plant_icon_offset = 2
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index c272b1e448462..4393d76a5fa22 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -1,6 +1,6 @@
 // Carrot
 /obj/item/seeds/carrot
-	name = "pack of carrot seeds"
+	name = "carrot seed pack"
 	desc = "These seeds grow into carrots."
 	icon_state = "seed-carrot"
 	species = "carrot"
@@ -12,7 +12,7 @@
 	instability = 15
 	growthstages = 3
 	growing_icon = 'icons/obj/service/hydroponics/growing_vegetables.dmi'
-	mutatelist = list(/obj/item/seeds/carrot/parsnip)
+	mutatelist = list(/obj/item/seeds/carrot/parsnip, /obj/item/seeds/carrot/cahnroot)
 	reagents_add = list(/datum/reagent/medicine/oculine = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 
 /obj/item/food/grown/carrot
@@ -26,24 +26,26 @@
 	wine_power = 30
 
 /obj/item/food/grown/carrot/attackby(obj/item/I, mob/user, params)
-	if(I.get_sharpness())
-		var/carrot_blade
-		var/carrot_sword_chance = (max(0, seed.potency - 50) / 50)
-		if (prob(carrot_sword_chance))
-			carrot_blade = new /obj/item/claymore/carrot
-			to_chat(user, span_notice("You sharpen the carrot into a sword with [I]."))
-		else
-			carrot_blade = new /obj/item/knife/shiv/carrot
-			to_chat(user, span_notice("You sharpen the carrot into a shiv with [I]."))
-		remove_item_from_storage(user)
-		qdel(src)
-		user.put_in_hands(carrot_blade)
-	else
+	if(!I.get_sharpness())
 		return ..()
 
+	/// The blade carrot will turn into once sharpened
+	var/obj/item/carrot_blade
+	/// Chance for it to become a sword rather than a shiv
+	var/carrot_sword_chance = (max(0, seed.potency - 50) / 50)
+	if (prob(carrot_sword_chance))
+		carrot_blade = new /obj/item/claymore/carrot
+		to_chat(user, span_notice("You sharpen the carrot into a sword with [I]."))
+	else
+		carrot_blade = new /obj/item/knife/shiv/carrot
+		to_chat(user, span_notice("You sharpen the carrot into a shiv with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(carrot_blade)
+
 // Parsnip
 /obj/item/seeds/carrot/parsnip
-	name = "pack of parsnip seeds"
+	name = "parsnip seed pack"
 	desc = "These seeds grow into parsnips."
 	icon_state = "seed-parsnip"
 	species = "parsnip"
@@ -62,10 +64,73 @@
 	juice_typepath = /datum/reagent/consumable/parsnipjuice
 	wine_power = 35
 
+/obj/item/food/grown/parsnip/attackby(obj/item/I, mob/user, params)
+	if(!I.get_sharpness())
+		return ..()
+
+	/// The blade parsnip will turn into once sharpened
+	var/obj/item/parsnip_blade
+	/// Chance for it to become a sabre rather than a shiv
+	var/parsnip_sabre_chance = (max(0, seed.potency - 50) / 50)
+	if (prob(parsnip_sabre_chance))
+		parsnip_blade = new /obj/item/melee/parsnip_sabre
+		to_chat(user, span_notice("You sharpen the parsnip into a sabre with [I]."))
+	else
+		parsnip_blade = new /obj/item/knife/shiv/parsnip
+		to_chat(user, span_notice("You sharpen the parsnip into a shiv with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(parsnip_blade)
+
+
+// Cahn'root
+/obj/item/seeds/carrot/cahnroot
+	name = "cahn'root seed pack"
+	desc = "These seeds grow into cahn'roots."
+	icon_state = "seed-cahn'root"
+	species = "cahn'root"
+	plantname = "Cahn'root"
+	product = /obj/item/food/grown/cahnroot
+	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
+	endurance = 50
+	instability = 10
+	icon_dead = "cahn'root-dead"
+	mutatelist = null
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/cellulose = 0.01, /datum/reagent/consumable/sugar = 0.01)
+	rarity = 10
+	graft_gene = /datum/plant_gene/trait/plant_type/weed_hardy
+
+/obj/item/food/grown/cahnroot
+	seed = /obj/item/seeds/carrot/cahnroot
+	name = "cahn'root"
+	desc = "Heavily modified version of terran carrot, originally made to survive the scarciest of environments by an enterprising scientist of Moth Flotilla, Cahn'Mang."
+	icon_state = "cahn'root"
+	foodtypes = VEGETABLES
+	juice_typepath = null
+	tastes = list("sweet dirt" = 1)
+	distill_reagent = /datum/reagent/consumable/rootbeer
+
+/obj/item/food/grown/cahnroot/attackby(obj/item/I, mob/user, params)
+	if(!I.get_sharpness())
+		return ..()
+
+	/// The blade cahn'root will turn into once sharpened
+	var/obj/item/knife/root_blade
+	/// Chance for it to become a dagger rather than a shiv
+	var/root_dagger_chance = (max(0, seed.potency - 25) / 50)
+	if (prob(root_dagger_chance))
+		root_blade = new /obj/item/knife/combat/root
+		to_chat(user, span_notice("You sharpen the cahn'root into a dagger with [I]."))
+	else
+		root_blade = new /obj/item/knife/shiv/root
+		to_chat(user, span_notice("You sharpen the cahn'root into a shiv with [I]."))
+	remove_item_from_storage(user)
+	qdel(src)
+	user.put_in_hands(root_blade)
 
 // White-Beet
 /obj/item/seeds/whitebeet
-	name = "pack of white-beet seeds"
+	name = "white-beet seed pack"
 	desc = "These seeds grow into sugary beet producing plants."
 	icon_state = "seed-whitebeet"
 	species = "whitebeet"
@@ -91,7 +156,7 @@
 
 // Red Beet
 /obj/item/seeds/redbeet
-	name = "pack of redbeet seeds"
+	name = "redbeet seed pack"
 	desc = "These seeds grow into red beet producing plants."
 	icon_state = "seed-redbeet"
 	species = "redbeet"
diff --git a/code/modules/hydroponics/grown/seedling.dm b/code/modules/hydroponics/grown/seedling.dm
index 57fd11280b6ed..9ce83acfa9e36 100644
--- a/code/modules/hydroponics/grown/seedling.dm
+++ b/code/modules/hydroponics/grown/seedling.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/seedling
-	name = "pack of seedling seeds"
+	name = "seedling seed pack"
 	desc = "These seeds grow into a floral assistant which can help look after other plants!"
 	icon_state = "seed-seedling"
 	growing_icon = 'icons/obj/service/hydroponics/growing_fruits.dmi'
diff --git a/code/modules/hydroponics/grown/sugarcane.dm b/code/modules/hydroponics/grown/sugarcane.dm
index 1c5c55fece08d..e7845f1e55607 100644
--- a/code/modules/hydroponics/grown/sugarcane.dm
+++ b/code/modules/hydroponics/grown/sugarcane.dm
@@ -1,7 +1,7 @@
 
 // Sugarcane
 /obj/item/seeds/sugarcane
-	name = "pack of sugarcane seeds"
+	name = "sugarcane seed pack"
 	desc = "These seeds grow into sugarcane."
 	icon_state = "seed-sugarcane"
 	species = "sugarcane"
@@ -28,7 +28,7 @@
 
 ///and bamboo!
 /obj/item/seeds/bamboo
-	name = "pack of bamboo seeds"
+	name = "bamboo seed pack"
 	desc = "A plant known for its flexible and resistant logs."
 	icon_state = "seed-bamboo"
 	species = "bamboo"
@@ -59,7 +59,7 @@
 
 //Saltcane - Gross, salty shafts!
 /obj/item/seeds/sugarcane/saltcane
-	name = "pack of saltcane seeds"
+	name = "saltcane seed pack"
 	desc = "These seeds grow into saltcane."
 	icon_state = "seed-saltcane"
 	species = "saltcane"
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 366dd8b45237e..26a215be720b4 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -1,6 +1,6 @@
 // Tea
 /obj/item/seeds/tea
-	name = "pack of tea aspera seeds"
+	name = "tea aspera seed pack"
 	desc = "These seeds grow into tea plants."
 	icon_state = "seed-teaaspera"
 	species = "teaaspera"
@@ -27,7 +27,7 @@
 
 // Tea Astra
 /obj/item/seeds/tea/astra
-	name = "pack of tea astra seeds"
+	name = "tea astra seed pack"
 	icon_state = "seed-teaastra"
 	species = "teaastra"
 	plantname = "Tea Astra Plant"
@@ -46,7 +46,7 @@
 
 // Coffee
 /obj/item/seeds/coffee
-	name = "pack of coffee arabica seeds"
+	name = "coffee arabica seed pack"
 	desc = "These seeds grow into coffee arabica bushes."
 	icon_state = "seed-coffeea"
 	species = "coffeea"
@@ -75,7 +75,7 @@
 
 // Coffee Robusta
 /obj/item/seeds/coffee/robusta
-	name = "pack of coffee robusta seeds"
+	name = "coffee robusta seed pack"
 	desc = "These seeds grow into coffee robusta bushes."
 	icon_state = "seed-coffeer"
 	species = "coffeer"
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index 87f8253a4d96b..29e8fba6d6a8b 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -1,6 +1,6 @@
 // Tobacco
 /obj/item/seeds/tobacco
-	name = "pack of tobacco seeds"
+	name = "tobacco seed pack"
 	desc = "These seeds grow into tobacco plants."
 	icon_state = "seed-tobacco"
 	species = "tobacco"
@@ -24,7 +24,7 @@
 
 // Space Tobacco
 /obj/item/seeds/tobacco/space
-	name = "pack of space tobacco seeds"
+	name = "space tobacco seed pack"
 	desc = "These seeds grow into space tobacco plants."
 	icon_state = "seed-stobacco"
 	species = "stobacco"
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index e676d822bbf1a..1459887d6facb 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -1,6 +1,6 @@
 // Tomato
 /obj/item/seeds/tomato
-	name = "pack of tomato seeds"
+	name = "tomato seed pack"
 	desc = "These seeds grow into tomato plants."
 	icon_state = "seed-tomato"
 	species = "tomato"
@@ -29,7 +29,7 @@
 
 // Blood Tomato
 /obj/item/seeds/tomato/blood
-	name = "pack of blood-tomato seeds"
+	name = "blood-tomato seed pack"
 	desc = "These seeds grow into blood-tomato plants."
 	icon_state = "seed-bloodtomato"
 	species = "bloodtomato"
@@ -52,7 +52,7 @@
 
 // Blue Tomato
 /obj/item/seeds/tomato/blue
-	name = "pack of blue-tomato seeds"
+	name = "blue-tomato seed pack"
 	desc = "These seeds grow into blue-tomato plants."
 	icon_state = "seed-bluetomato"
 	species = "bluetomato"
@@ -77,7 +77,7 @@
 
 // Bluespace Tomato
 /obj/item/seeds/tomato/blue/bluespace
-	name = "pack of bluespace tomato seeds"
+	name = "bluespace tomato seed pack"
 	desc = "These seeds grow into bluespace tomato plants."
 	icon_state = "seed-bluespacetomato"
 	species = "bluespacetomato"
@@ -101,7 +101,7 @@
 
 // Killer Tomato
 /obj/item/seeds/tomato/killer
-	name = "pack of killer-tomato seeds"
+	name = "killer-tomato seed pack"
 	desc = "These seeds grow into killer-tomato plants."
 	icon_state = "seed-killertomato"
 	species = "killertomato"
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 1082b51665ff7..a09e4e61b4d15 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/tower
-	name = "pack of tower-cap mycelium"
+	name = "tower-cap mycelium pack"
 	desc = "This mycelium grows into tower-cap mushrooms."
 	icon_state = "mycelium-tower"
 	species = "towercap"
@@ -20,7 +20,7 @@
 	graft_gene = /datum/plant_gene/trait/plant_type/fungal_metabolism
 
 /obj/item/seeds/tower/steel
-	name = "pack of steel-cap mycelium"
+	name = "steel-cap mycelium pack"
 	desc = "This mycelium grows into steel logs."
 	icon_state = "mycelium-steelcap"
 	species = "steelcap"
diff --git a/code/modules/hydroponics/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm
index d8f1a66795b2b..a0a3c9405718c 100644
--- a/code/modules/hydroponics/grown/weeds/kudzu.dm
+++ b/code/modules/hydroponics/grown/weeds/kudzu.dm
@@ -1,7 +1,7 @@
-// A very special plant, deserving it's own file.
+// A very special plant, deserving its own file.
 
 /obj/item/seeds/kudzu
-	name = "pack of kudzu seeds"
+	name = "kudzu seed pack"
 	desc = "These seeds grow into a weed that grows incredibly fast."
 	icon_state = "seed-kudzu"
 	plant_icon_offset = 2
diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm
index 98868b8d6e748..33a0f6288912d 100644
--- a/code/modules/hydroponics/grown/weeds/nettle.dm
+++ b/code/modules/hydroponics/grown/weeds/nettle.dm
@@ -1,5 +1,5 @@
 /obj/item/seeds/nettle
-	name = "pack of nettle seeds"
+	name = "nettle seed pack"
 	desc = "These seeds grow into nettles."
 	icon_state = "seed-nettle"
 	plant_icon_offset = 0
@@ -17,7 +17,7 @@
 	graft_gene = /datum/plant_gene/trait/plant_type/weed_hardy
 
 /obj/item/seeds/nettle/death
-	name = "pack of death-nettle seeds"
+	name = "death-nettle seed pack"
 	desc = "These seeds grow into death-nettles."
 	icon_state = "seed-deathnettle"
 	species = "deathnettle"
diff --git a/code/modules/hydroponics/grown/weeds/starthistle.dm b/code/modules/hydroponics/grown/weeds/starthistle.dm
index 74627a31f88e8..af94cf3d98508 100644
--- a/code/modules/hydroponics/grown/weeds/starthistle.dm
+++ b/code/modules/hydroponics/grown/weeds/starthistle.dm
@@ -1,6 +1,6 @@
 // Starthistle
 /obj/item/seeds/starthistle
-	name = "pack of starthistle seeds"
+	name = "starthistle seed pack"
 	desc = "A robust species of weed that often springs up in-between the cracks of spaceship parking lots."
 	icon_state = "seed-starthistle"
 	plant_icon_offset = 3
@@ -33,7 +33,7 @@
 
 // Corpse flower
 /obj/item/seeds/starthistle/corpse_flower
-	name = "pack of corpse flower seeds"
+	name = "corpse flower seed pack"
 	desc = "A species of plant that emits a horrible odor. The odor stops being produced in difficult atmospheric conditions."
 	icon_state = "seed-corpse-flower"
 	species = "corpse-flower"
@@ -46,7 +46,7 @@
 
 //Galaxy Thistle
 /obj/item/seeds/galaxythistle
-	name = "pack of galaxythistle seeds"
+	name = "galaxythistle seed pack"
 	desc = "An impressive species of weed that is thought to have evolved from the simple milk thistle. Contains flavolignans that can help repair a damaged liver."
 	icon_state = "seed-galaxythistle"
 	species = "galaxythistle"
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 5f72806ca3635..9b2cbdfae40fb 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -160,7 +160,7 @@
 
 /**
  * This proc is called when we scan a hydroponics tray or soil on left click (stats mode)
- * It formats the plant name, it's age, the plant's stats, and the tray's stats.
+ * It formats the plant name, its age, the plant's stats, and the tray's stats.
  *
  * - scanned_tray - the tray or soil we are scanning.
  *
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 34fb9fc04622e..ed17254fa9b05 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -58,7 +58,7 @@
 
 /obj/machinery/hydroponics/Initialize(mapload)
 	//ALRIGHT YOU DEGENERATES. YOU HAD REAGENT HOLDERS FOR AT LEAST 4 YEARS AND NONE OF YOU MADE HYDROPONICS TRAYS HOLD NUTRIENT CHEMS INSTEAD OF USING "Points".
-	//SO HERE LIES THE "nutrilevel" VAR. IT'S DEAD AND I PUT IT OUT OF IT'S MISERY. USE "reagents" INSTEAD. ~ArcaneMusic, accept no substitutes.
+	//SO HERE LIES THE "nutrilevel" VAR. IT'S DEAD AND I PUT IT OUT OF ITS MISERY. USE "reagents" INSTEAD. ~ArcaneMusic, accept no substitutes.
 	create_reagents(maxnutri, INJECTABLE)
 	if(mapload)
 		reagents.add_reagent(/datum/reagent/plantnutriment/eznutriment, max(maxnutri / 2, 10)) //Half filled nutrient trays for dirt trays to have more to grow with in prison/lavaland.
@@ -781,7 +781,7 @@
 /**
  * Plant Cross-Pollination.
  * Checks all plants in the tray's oview range, then averages out the seed's potency, instability, and yield values.
- * If the seed's instability is >= 20, the seed donates one of it's reagents to that nearby plant.
+ * If the seed's instability is >= 20, the seed donates one of its reagents to that nearby plant.
  * * Range - The Oview range of trays to which to look for plants to donate reagents.
  */
 /obj/machinery/hydroponics/proc/pollinate(range = 1)
@@ -798,15 +798,7 @@
 			if(isnull(particles))
 				particles = new /particles/pollen()
 			if(myseed.instability >= 20 && prob(70) && length(T.myseed.reagents_add))
-				var/list/datum/plant_gene/reagent/possible_reagents = list()
-				for(var/datum/plant_gene/reagent/reag in T.myseed.genes)
-					possible_reagents += reag
-				var/datum/plant_gene/reagent/reagent_gene = pick(possible_reagents) //Let this serve as a lession to delete your WIP comments before merge.
-				if(reagent_gene.can_add(myseed))
-					if(!reagent_gene.try_upgrade_gene(myseed))
-						myseed.genes += reagent_gene.Copy()
-					myseed.reagents_from_genes()
-					continue
+				myseed.perform_reagent_pollination(T.myseed)
 	if(!any_adjacent)
 		particles = null
 
@@ -1033,7 +1025,7 @@
 			to_chat(user, span_warning("[src] is empty!"))
 			return
 		if(myseed.endurance <= FLORA_GUN_MIN_ENDURANCE)
-			to_chat(user, span_warning("[myseed.plantname] isn't hardy enough to sequence it's mutation!"))
+			to_chat(user, span_warning("[myseed.plantname] isn't hardy enough to sequence its mutation!"))
 			return
 		if(!LAZYLEN(myseed.mutatelist))
 			to_chat(user, span_warning("[myseed.plantname] has nothing else to mutate into!"))
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 6fc671ccd4c94..f59adad783968 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -487,7 +487,7 @@
 /**
  * A plant trait that causes the plant's capacity to double.
  *
- * When harvested, the plant's individual capacity is set to double it's default.
+ * When harvested, the plant's individual capacity is set to double its default.
  * However, the plant's maximum yield is also halved, only up to 5.
  */
 /datum/plant_gene/trait/maxchem
@@ -763,7 +763,7 @@
 /**
  * A plant trait that causes the plant's food reagents to ferment instead.
  *
- * In practice, it replaces the plant's nutriment and vitamins with half as much of it's fermented reagent.
+ * In practice, it replaces the plant's nutriment and vitamins with half as much of its fermented reagent.
  * This exception is executed in seeds.dm under 'prepare_result'.
  *
  * Incompatible with auto-juicing composition.
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index fefd4d999387f..18197c006b51e 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -40,7 +40,7 @@
 	var/potency = 10
 	/// Amount of growth sprites the plant has.
 	var/growthstages = 6
-	// Chance that a plant will mutate in each stage of it's life.
+	// Chance that a plant will mutate in each stage of its life.
 	var/instability = 5
 	/// How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
 	var/rarity = 0
@@ -616,3 +616,27 @@
 
 /obj/item/grown/get_plant_seed()
 	return seed
+
+/obj/item/seeds/proc/perform_reagent_pollination(obj/item/seeds/donor)
+	var/list/datum/plant_gene/reagent/valid_reagents = list()
+	for(var/datum/plant_gene/reagent/donor_reagent in donor.genes)
+		var/repeated = FALSE
+		for(var/datum/plant_gene/reagent/receptor_reagent in genes)
+			if(donor_reagent.reagent_id == receptor_reagent.reagent_id)
+				if(receptor_reagent.rate < donor_reagent.rate)
+					receptor_reagent.rate = donor_reagent.rate
+					// sucessful pollination/upgrade, we stop here.
+					reagents_from_genes()
+					return
+				else
+					repeated = TRUE
+					break
+
+		if(!repeated)
+			valid_reagents += donor_reagent
+
+	if(length(valid_reagents))
+		// pick a valid reagent that our receptor seed don't have and add the gene to it
+		var/datum/plant_gene/reagent/selected_reagent = pick(valid_reagents)
+		genes += selected_reagent.Copy()
+		reagents_from_genes()
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index dcc4ef8daba3d..170000eb11557 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -17,7 +17,7 @@
 /obj/item/instrument/Initialize(mapload)
 	. = ..()
 	song = new(src, allowed_instrument_ids, instrument_range)
-	allowed_instrument_ids = null //We don't need this clogging memory after it's used.
+	allowed_instrument_ids = null //We don't need this clogging memory after its used.
 
 /obj/item/instrument/Destroy()
 	QDEL_NULL(song)
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index b2c051a4e1c7d..6b429b25f4831 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -203,6 +203,6 @@ GLOBAL_PROTECT(exp_to_update)
 	if(flags_read.NextRow())
 		prefs.db_flags = text2num(flags_read.item[1])
 	else if(isnull(prefs.db_flags))
-		prefs.db_flags = 0 //This PROBABLY won't happen, but better safe than sorry.
+		prefs.db_flags = NONE //This PROBABLY won't happen, but better safe than sorry.
 	qdel(flags_read)
 	return TRUE
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index fbea013fc5ec6..71ffbc730233b 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -243,6 +243,11 @@
 	if(!SSdbcore.Connect())
 		return 0
 
+	// If they have been exempted from date availability checks, we assume they are old enough for all jobs.
+	// This is only added whenever an admin manually ticks the box for this player.
+	if(player.prefs?.db_flags & DB_FLAG_EXEMPT)
+		return 0
+
 	// As of the time of writing this comment, verifying database connection isn't "solved". Sometimes rust-g will report a
 	// connection mid-shift despite the database dying.
 	// If the client age is -1, it means that no code path has overwritten it. Even first time connections get it set to 0,
diff --git a/code/modules/jobs/job_types/antagonists/voidwalker.dm b/code/modules/jobs/job_types/antagonists/voidwalker.dm
new file mode 100644
index 0000000000000..c29d165efb807
--- /dev/null
+++ b/code/modules/jobs/job_types/antagonists/voidwalker.dm
@@ -0,0 +1,2 @@
+/datum/job/voidwalker
+	title = ROLE_VOIDWALKER
diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm
index aacb2ebe3ecfc..4790be9f551b9 100644
--- a/code/modules/jobs/job_types/assistant/assistant.dm
+++ b/code/modules/jobs/job_types/assistant/assistant.dm
@@ -39,7 +39,7 @@ Assistant
 
 /datum/job/assistant/get_outfit(consistent)
 	if(consistent)
-		return /datum/outfit/job/assistant/consistent
+		return /datum/outfit/job/assistant/preview
 	if(!HAS_TRAIT(SSstation, STATION_TRAIT_ASSISTANT_GIMMICKS))
 		return ..()
 
@@ -96,3 +96,12 @@ Assistant
 	if (SSatoms.initialized == INITIALIZATION_INSSATOMS)
 		H.w_uniform?.update_greyscale()
 		H.update_worn_undersuit()
+
+/datum/outfit/job/assistant/preview
+	name = "Assistant - Preview"
+
+/datum/outfit/job/assistant/preview/give_jumpsuit(mob/living/carbon/human/target)
+	if (target.jumpsuit_style == PREF_SUIT)
+		uniform = /obj/item/clothing/under/color/grey
+	else
+		uniform = /obj/item/clothing/under/color/jumpskirt/grey
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
index df658d71dddc2..b02dee12cf826 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -564,7 +564,7 @@
 /obj/item/nullrod/bostaff
 	name = "monk's staff"
 	desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, it is now used to harass the clown."
-	force = 15
+	force = 14
 	block_chance = 40
 	block_sound = 'sound/weapons/genhit.ogg'
 	slot_flags = ITEM_SLOT_BACK
@@ -574,11 +574,25 @@
 	attack_verb_simple = list("smash", "slam", "whack", "thwack")
 	icon = 'icons/obj/weapons/staff.dmi'
 	icon_state = "bostaff0"
+	base_icon_state = "bostaff"
 	inhand_icon_state = "bostaff0"
 	worn_icon_state = "bostaff0"
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-	menu_description = "A staff which provides a medium-low chance of blocking incoming melee attacks and deals a little less damage. Can be worn on the back."
+	menu_description = "A staff which provides a medium-low chance of blocking incoming melee attacks and deals less damage, unless dual-wielded. Can be worn on the back."
+
+/obj/item/nullrod/bostaff/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/two_handed, \
+		force_unwielded = 14, \
+		force_wielded = 18, \
+		icon_wielded = "[base_icon_state]1", \
+	)
+
+/obj/item/nullrod/bostaff/update_icon_state()
+	icon_state = "[base_icon_state]0"
+	return ..()
+
 
 // Arrhythmic Knife - Lets your walk without rhythm by varying your walk speed. Can't be put away.
 
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index 99990de207354..9497791bc8e9e 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -59,7 +59,7 @@
 	belt = /obj/item/modular_computer/pda/heads/hos
 	ears = /obj/item/radio/headset/heads/hos/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/hats/hos/beret
 	shoes = /obj/item/clothing/shoes/jackboots/sec
 	l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 1540bcbbc5973..af51aed853eb9 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
 		)
 	belt = /obj/item/modular_computer/pda/security
 	ears = /obj/item/radio/headset/headset_sec/alt
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/helmet/sec
 	shoes = /obj/item/clothing/shoes/jackboots/sec
 	l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/jobs/job_types/station_trait/human_ai.dm b/code/modules/jobs/job_types/station_trait/human_ai.dm
index 4edf01039cbf4..0370815759fd7 100644
--- a/code/modules/jobs/job_types/station_trait/human_ai.dm
+++ b/code/modules/jobs/job_types/station_trait/human_ai.dm
@@ -98,9 +98,7 @@
 		/obj/item/door_remote/omni = 1,
 		/obj/item/machine_remote = 1,
 		/obj/item/secure_camera_console_pod = 1,
-	)
-	implants = list(
-		/obj/item/implant/teleport_blocker,
+		/obj/item/sensor_device = 1,
 	)
 
 	uniform = /obj/item/clothing/under/rank/station_trait/human_ai
@@ -108,9 +106,6 @@
 	ears = /obj/item/radio/headset/silicon/human_ai
 	glasses = /obj/item/clothing/glasses/hud/diagnostic
 
-	suit = /obj/item/clothing/suit/costume/cardborg
-	head = /obj/item/clothing/head/costume/cardborg
-
 	l_pocket = /obj/item/laser_pointer/infinite_range //to punish borgs, this works through the camera console.
 	r_pocket = /obj/item/assembly/flash/handheld
 
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index 2854a3387ba45..2bed1131cd8b2 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -56,7 +56,7 @@
 	belt = /obj/item/modular_computer/pda/warden
 	ears = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/hats/warden/red
 	shoes = /obj/item/clothing/shoes/jackboots/sec
 	l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm
index 39abe7baa509b..5221dc8047422 100644
--- a/code/modules/library/bibles.dm
+++ b/code/modules/library/bibles.dm
@@ -316,7 +316,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
 		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
 		if(do_after(user, 4 SECONDS, target = sword))
 			playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
-			new /obj/item/nullrod/claymore(get_turf(sword))
+			new /obj/item/nullrod/nullblade(get_turf(sword))
 			user.visible_message(span_notice("[user] exorcises [sword]!"))
 			qdel(sword)
 			return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/library/bookcase.dm b/code/modules/library/bookcase.dm
index 16925dd5138e7..004db281c75c3 100644
--- a/code/modules/library/bookcase.dm
+++ b/code/modules/library/bookcase.dm
@@ -94,63 +94,81 @@
 			I.forceMove(Tsec)
 	update_appearance()
 
-/obj/structure/bookcase/attackby(obj/item/I, mob/user, params)
-	switch(state)
-		if(BOOKCASE_UNANCHORED)
-			if(I.tool_behaviour == TOOL_WRENCH)
-				if(I.use_tool(src, user, 20, volume=50))
-					to_chat(user, span_notice("You wrench the frame into place."))
-					set_anchored(TRUE)
-			else if(I.tool_behaviour == TOOL_CROWBAR)
-				if(I.use_tool(src, user, 20, volume=50))
-					to_chat(user, span_notice("You pry the frame apart."))
-					deconstruct(TRUE)
+/obj/structure/bookcase/attackby(obj/item/attacking_item, mob/user, params)
+	if(state == BOOKCASE_UNANCHORED)
+		if(attacking_item.tool_behaviour == TOOL_WRENCH)
+			if(attacking_item.use_tool(src, user, 20, volume=50))
+				balloon_alert(user, "wrenched in place")
+				set_anchored(TRUE)
+			return
+
+		if(attacking_item.tool_behaviour == TOOL_CROWBAR)
+			if(attacking_item.use_tool(src, user, 20, volume=50))
+				balloon_alert(user, "pried apart")
+				deconstruct(TRUE)
+			return
+		return ..()
 
-		if(BOOKCASE_ANCHORED)
-			if(istype(I, /obj/item/stack/sheet/mineral/wood))
-				var/obj/item/stack/sheet/mineral/wood/W = I
-				if(W.get_amount() >= 2)
-					W.use(2)
-					to_chat(user, span_notice("You add a shelf."))
-					state = BOOKCASE_FINISHED
-					update_appearance()
-			else if(I.tool_behaviour == TOOL_WRENCH)
-				I.play_tool_sound(src, 100)
-				to_chat(user, span_notice("You unwrench the frame."))
-				set_anchored(FALSE)
+	if(state == BOOKCASE_ANCHORED)
+		if(istype(attacking_item, /obj/item/stack/sheet/mineral/wood))
+			var/obj/item/stack/sheet/mineral/wood/W = attacking_item
+			if(W.get_amount() < 2)
+				balloon_alert(user, "not enough wood")
+				return
+			W.use(2)
+			balloon_alert(user, "shelf added")
+			state = BOOKCASE_FINISHED
+			update_appearance()
+			return
+
+		if(attacking_item.tool_behaviour == TOOL_WRENCH)
+			attacking_item.play_tool_sound(src, 100)
+			balloon_alert(user, "unwrenched the frame")
+			set_anchored(FALSE)
+			return
+		return ..()
 
-		if(BOOKCASE_FINISHED)
-			if(isbook(I))
-				if(!user.transferItemToLoc(I, src))
-					return
-				update_appearance()
-			else if(atom_storage)
-				for(var/obj/item/T in I.contents)
-					if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook))
-						atom_storage.attempt_remove(T, src)
-				to_chat(user, span_notice("You empty \the [I] into \the [src]."))
-				update_appearance()
-			else if(IS_WRITING_UTENSIL(I))
-				if(!user.can_perform_action(src) || !user.can_write(I))
-					return
-				var/newname = tgui_input_text(user, "What would you like to title this bookshelf?", "Bookshelf Renaming", max_length = MAX_NAME_LEN)
-				if(!user.can_perform_action(src) || !user.can_write(I))
-					return
-				if(!newname)
-					return
-				else
-					name = "bookcase ([sanitize(newname)])"
-			else if(I.tool_behaviour == TOOL_CROWBAR)
-				if(length(contents))
-					to_chat(user, span_warning("You need to remove the books first!"))
-				else
-					I.play_tool_sound(src, 100)
-					to_chat(user, span_notice("You pry the shelf out."))
-					new /obj/item/stack/sheet/mineral/wood(drop_location(), 2)
-					state = BOOKCASE_ANCHORED
-					update_appearance()
-			else
-				return ..()
+	if(isbook(attacking_item))
+		if(!user.transferItemToLoc(attacking_item, src))
+			return ..()
+		update_appearance()
+		return
+
+	if(atom_storage)
+		var/found_anything = FALSE
+		for(var/obj/item/T in attacking_item.contents)
+			if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook))
+				atom_storage.attempt_remove(T, src)
+				found_anything = TRUE
+
+		if (found_anything)
+			balloon_alert(user, "emptied into [src]")
+			update_appearance()
+			return
+
+	if(IS_WRITING_UTENSIL(attacking_item))
+		if(!user.can_perform_action(src) || !user.can_write(attacking_item))
+			return ..()
+		var/newname = tgui_input_text(user, "What would you like to title this bookshelf?", "Bookshelf Renaming", max_length = MAX_NAME_LEN)
+		if(!user.can_perform_action(src) || !user.can_write(attacking_item))
+			return ..()
+		if(!newname)
+			return
+		name = "bookcase ([sanitize(newname)])"
+		return
+
+	if(attacking_item.tool_behaviour == TOOL_CROWBAR)
+		if(length(contents))
+			balloon_alert(user, "remove the books first")
+			return
+		attacking_item.play_tool_sound(src, 100)
+		balloon_alert(user, "pried the shelf out")
+		new /obj/item/stack/sheet/mineral/wood(drop_location(), 2)
+		state = BOOKCASE_ANCHORED
+		update_appearance()
+		return
+
+	return ..()
 
 /obj/structure/bookcase/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
diff --git a/code/modules/lighting/lighting_setup.dm b/code/modules/lighting/lighting_setup.dm
deleted file mode 100644
index c148530d1cd86..0000000000000
--- a/code/modules/lighting/lighting_setup.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/proc/create_all_lighting_objects()
-	for(var/area/area as anything in GLOB.areas)
-		if(!area.static_lighting)
-			continue
-		for (var/list/zlevel_turfs as anything in area.get_zlevel_turf_lists())
-			for(var/turf/area_turf as anything in zlevel_turfs)
-				if(area_turf.space_lit)
-					continue
-				new /datum/lighting_object(area_turf)
-			CHECK_TICK
-		CHECK_TICK
diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm
index b15d4597d9a40..6242e0481a7cf 100644
--- a/code/modules/loadout/loadout_items.dm
+++ b/code/modules/loadout/loadout_items.dm
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
 
 	if(can_be_greyscale == DONT_GREYSCALE)
 		can_be_greyscale = FALSE
-	else if(item_path::flags_1 & IS_PLAYER_COLORABLE_1)
+	else if((item_path::flags_1 & IS_PLAYER_COLORABLE_1) && item_path::greyscale_config && item_path::greyscale_colors)
 		can_be_greyscale = TRUE
 
 	if(isnull(name))
diff --git a/code/modules/lootpanel/contents.dm b/code/modules/lootpanel/contents.dm
index 44f4acd47f24c..2fcd4201d8a7c 100644
--- a/code/modules/lootpanel/contents.dm
+++ b/code/modules/lootpanel/contents.dm
@@ -21,6 +21,8 @@
 		if(!istype(thing))
 			stack_trace("Non-atom in the contents of [source_turf]!")
 			continue
+		if(QDELETED(thing))
+			continue
 		if(thing.mouse_opacity == MOUSE_OPACITY_TRANSPARENT)
 			continue
 		if(thing.IsObscured())
diff --git a/code/modules/lootpanel/search_object.dm b/code/modules/lootpanel/search_object.dm
index 149be76e71064..2cb0bdf85dba9 100644
--- a/code/modules/lootpanel/search_object.dm
+++ b/code/modules/lootpanel/search_object.dm
@@ -62,6 +62,7 @@
 
 /datum/search_object/Destroy(force)
 	item = null
+	icon = null
 
 	return ..()
 
@@ -75,6 +76,9 @@
 /datum/search_object/proc/on_item_moved(atom/source)
 	SIGNAL_HANDLER
 
+	if(QDELETED(src))
+		return
+
 	qdel(src)
 
 
@@ -82,4 +86,4 @@
 /datum/search_object/proc/on_turf_change(turf/source, path, list/new_baseturfs, flags, list/post_change_callbacks)
 	SIGNAL_HANDLER
 
-	post_change_callbacks += CALLBACK(src, GLOBAL_PROC_REF(qdel), src)
+	post_change_callbacks += CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src)
diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm
index 3b805bd92f9c0..0fdc90c2f3213 100644
--- a/code/modules/mafia/outfits.dm
+++ b/code/modules/mafia/outfits.dm
@@ -89,7 +89,7 @@
 	name = "Mafia Security Officer"
 
 	uniform = /obj/item/clothing/under/rank/security/officer
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/helmet/sec
 	suit = /obj/item/clothing/suit/armor/vest/alt
 	shoes = /obj/item/clothing/shoes/jackboots
@@ -116,7 +116,7 @@
 	uniform = /obj/item/clothing/under/rank/security/head_of_security
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/hats/hos/beret
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 
@@ -126,7 +126,7 @@
 	uniform = /obj/item/clothing/under/rank/security/warden
 	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/armor/vest/warden/alt
-	gloves = /obj/item/clothing/gloves/color/black
+	gloves = /obj/item/clothing/gloves/color/black/security
 	head = /obj/item/clothing/head/hats/warden/red
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 
diff --git a/code/modules/mafia/roles/roles.dm b/code/modules/mafia/roles/roles.dm
index 07ca685dcc58a..85ad0f3ed9f38 100644
--- a/code/modules/mafia/roles/roles.dm
+++ b/code/modules/mafia/roles/roles.dm
@@ -176,6 +176,7 @@
 	var/list/result = list()
 	var/team_desc = ""
 	var/team_span = ""
+	//var/the = TRUE
 	switch(team)
 		if(MAFIA_TEAM_TOWN)
 			team_desc = "Гражданином"
@@ -186,7 +187,8 @@
 		if(MAFIA_TEAM_SOLO)
 			team_desc = "Одиночкой"
 			team_span = "comradio"
+			//the = FALSE
 	result += span_notice("[span_bold("[name]")] является <span class='[team_span]'>[team_desc]</span>")
-	result += "<span class='bold notice'>\"[desc]\"</span>"
-	result += span_notice("[name] выигрывает если [win_condition]")
+	result += "<span class='bold notice'>\"[initial(desc)]\"</span>"
+	result += span_notice("[name] выигрывает, если [win_condition]")
 	to_chat(clueless, result.Join("</br>"))
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
index 8dc9cec326d95..860eb8c816882 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
@@ -15,6 +15,7 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	light_range = 8
 	light_color = LIGHT_COLOR_LAVA
+	can_atmos_pass = ATMOS_PASS_DENSITY
 	var/open = FALSE
 	var/changing_openness = FALSE
 	var/locked = FALSE
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
index 3507cb7d94746..ce50fcccc1568 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
@@ -213,7 +213,7 @@
 		"\[15:29\] USELESS clown",
 		"\[15:35\] And BATSHIT fucking janitors",
 		"\[15:46\] That includes the crotchety fucking IBM piece of shit we're supposed to call an AI",
-		"\[15:52\] And it's legion of cyborg assholes",
+		"\[15:52\] And its legion of cyborg assholes",
 		"\[15:58\] If this wasn't bad enough there is the wizards federation to worry about",
 		"\[16:06\] Crazy bastards",
 		"\[16:10\] What can be worse than a bunch of plasma-humping-space-freaks?",
@@ -244,7 +244,7 @@
 		"\[47:32\] Once they called me captain, but when it's all said and done",
 		"\[47:41\] I'll be a hero",
 		"\[47:45\] If you run across this transmission by chance",
-		"\[47:52\] Get you pudgy little nerd ass over to Space Station 13 and start busting heads.",
+		"\[47:52\] Get your pudgy little nerd ass over to Space Station 13 and start busting heads.",
 		"\[48:00\] (farting noises)",
 	)
 	timestamp = list(
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm b/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm
new file mode 100644
index 0000000000000..03bd6c224deda
--- /dev/null
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm
@@ -0,0 +1,383 @@
+//code & items for the hauntedtradingpost.dmm ruin
+//CONTAINS: [Lore Papers],[Outpost ID Cards],[Gimmick Treasure],[Hazards & Traps],[Custom Turrets]
+
+// [Lore Papers]
+// clues to traps that exist in the ruin or just insights into the backstory of the place
+/obj/item/paper/fluff/ruins/hauntedtradingpost/warning
+	name = "Last Warning"
+	default_raw_text = "Next person who breaks a vending machine fucking around with those fucking toy guns gets fired on the spot. Try me. I am SICK of this shit.<BR><BR>Signed, Your Fucking Boss (Who Can Fucking Fire Your Ass)"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/warning/turrets
+	name = "Warning! Important! Read this!"
+	default_raw_text = "Foam darts do not go in the defence turrets! Live ammo only!"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming
+	name = "Notes"
+	default_raw_text = "Branding: Pizza In Your Pocket (check focus groups)<BR><BR>Tomato Mozzerella Basil<BR>etc<BR><BR>Spider 17-02667 Store 31-00314<BR><BR>18,000 approx BSD<BR><BR>common allergens - ?<BR><BR><BR>6127"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka
+	default_raw_text = "Got some ingredients from the moth trading fleet and used some of our discretionary budget to hire some factory space. Prototypes are going down well with both public and employees. If we can get central to fund mass production we'll be seeing a 18% permanant increase in regional profit according to AI. This fits the local brunch market *perfectly*."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka2
+	default_raw_text = "Early experiments with a fully carb-free recipe going well. Taste tests are all positive, just need a way to reduce costs."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/brainstorming/eureka3
+	default_raw_text = "PROJECT BIG DONK<BR>RnD has a few prototypes prepared.<BR>Testing will be complete by the end of the week."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/rpgclub
+	name = "RPG Club"
+	default_raw_text = "RPG Club is every Thursday from 20:00 to 01:00 AM. Entry to the break room is strictly by invitation only during that period of time. <BR> <BR> We apologise for any inconvenience."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/rpgrules
+	name = "GM Notes"
+	default_raw_text = "Session 4 NPCS <BR> Shadow Warriors <BR> S  A  T  C  H <BR> 40 65 40 15 10 <BR><BR>Shadow Clan Underlord <BR> S  A  T  C  H <BR> 40 65 40 15 10 <BR>Note: Gets shadow magic.<BR><BR><BR>Dire Corgi <BR> S  A  T  C  H <BR> 60 25 65 25 12 <BR><BR>If they beat this let them roll on loot table 4 twice but if it's 65-70 or 15-30 make it magic boots instead."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/curatorsnote
+	name = "For Adventurers"
+	default_raw_text = "The food court and the stalls are safe, everywhere else isn't. There's safes in the stalls and I didn't have a way to open them so if you can get whatever's inside, good for you. The employees area can be entered by tailing the bots, but security systems are active back there. I got shot by a turret taking a look, and when I stitched myself up and tried the other door I walked into a booby trap and nearly lost an arm.<BR><BR>If you're investigating this signal - BEWARE.<BR>For the record, I decided nothing in there's worth the risk. If you're braver than me, good luck.<BR>Signed, Curator P."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/officememo
+	name = "Memo"
+	default_raw_text = "The AI-Guided Defense System Will Stay Active Indefinitely To Protect Company Property. Please Ensure All Personal Items Are Removed From The Premises, As They Will Be Impossible To Recover If Forgotten. <BR><BR> Donk Co. Takes No Responsibility For Lost Personal Property Or Affects."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt
+	name = "Old Receipt"
+	desc = "A ratty old sales receipt printed on cheap thermal paper."
+	default_raw_text = "DONK CO OUTLET 6013<BR>YOUR SERVER TODAY WAS: COLM<BR><BR>2x DONKPOCKETPIZBOX    400<BR>1x CRYPTOGRAPHICSEQ    800<BR>2x CRYPTOGRAPHICTOY    200<BR>1x DONKPOCKETPLUSHY    120<BR><BR>TOTAL VALUE            1520<BR><BR>PAYMENT: CASH"
+	icon_state = "paperslip"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt/alternate
+	default_raw_text = "DONK CO OUTLET 6013<BR>YOUR SERVER TODAY WAS: VLAD<BR><BR>1x DONKPOCKETBERBOX    200<BR>1x GORLEXMODSUITRED    1400<BR>1x MODSUITMICROWAVE    200<BR><BR>TOTAL VALUE            1800<BR><BR>PAYMENT: CASH"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/receipt/alternate_alt
+	default_raw_text = "DONK CO OUTLET 6013<BR>YOUR SERVER TODAY WAS: COLM<BR><BR>10xDONKPOCKETORGBOX   2000<BR>4x GORLEXMODSUITRED    9600<BR>4x MODSUITMICROWAVE    800<BR><BR>TOTAL VALUE           13400<BR><BR>PAYMENT: CARD"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/nomodsuits
+	name = "Notice"
+	desc = "A bunch of words have been written on this slip of paper. Truly, this is the future."
+	default_raw_text = "We are SOLD OUT of modsuits."
+	icon_state = "paperslip"
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/oldnote
+	name = "Old Note"
+	default_raw_text = "Remember to check all the ammo before it's fed into the turrets. If the wrong caliber is loaded, the turrets will malfunction.<BR>We use 9mm ammunition ONLY."
+
+/obj/item/paper/fluff/ruins/hauntedtradingpost/oldnote/aiclue
+	name = "Old Handwritten Note"
+	default_raw_text = "All the appliances are now hooked up to the AI. If there's any problems, report it to the Cybersun rep (Mr Satung)."
+
+// [Outpost ID Cards]
+//ID cards for the space ruin
+/obj/item/card/id/away/donk
+	name = "\improper Donk Co. ID Card"
+	desc = "A plastic card that identifies its bearer as an employee of Donk Co. There are electronic chips embedded to communicate with airlocks and other machines. It does not have a name attached."
+	icon_state = "card_donk"
+	trim = /datum/id_trim/away/hauntedtradingpost
+
+/obj/item/card/id/away/donk/boss
+	desc = "A plastic card that identifies its bearer as a senior employee of Donk Co. There are electronic chips embedded to communicate with airlocks and other machines. It does not have a name attached."
+	icon_state = "card_donkboss"
+	trim = /datum/id_trim/away/hauntedtradingpost/boss
+
+// [Gimmick Treasure]
+// loot & weird items that should only exist in hauntedtradingpost.dmm
+//aquarium with two donkfish in it
+/obj/structure/aquarium/donkfish
+	name = "office aquarium"
+	desc = "A home for captive fish. This one has 'DONK CO' engraved on the glass."
+
+/obj/structure/aquarium/donkfish/Initialize(mapload)
+	. = ..()
+	new /obj/item/aquarium_prop/rocks(src)
+	new /obj/item/aquarium_prop/seaweed(src)
+	new /obj/item/fish/donkfish(src)
+	new /obj/item/fish/donkfish(src)
+	create_reagents(20, SEALED_CONTAINER)
+	reagents.add_reagent(/datum/reagent/consumable/nutriment, 20)
+
+//gimmick ketchup bottle for healing minor injuries
+/obj/item/reagent_containers/condiment/donksauce
+	name = "\improper Donk Co. Secret Sauce"
+	desc = "The famous ketchup with a highly classified recipe."
+	list_reagents = list(
+		/datum/reagent/consumable/ketchup = 25,
+		/datum/reagent/medicine/omnizine = 10,
+		/datum/reagent/consumable/astrotame = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 5,
+		/datum/reagent/consumable/bungojuice = 1,
+		/datum/reagent/consumable/curry_powder = 1,
+		/datum/reagent/consumable/soymilk = 1,
+		/datum/reagent/consumable/tomatojuice = 1,
+		/datum/reagent/consumable/vitfro = 1,
+	)
+	icon_state = "ketchup"
+	fill_icon_thresholds = null
+
+// [Hazards & Traps]
+//cyborg holobarriers that die when the boss dies, how exciting
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield
+	desc = "A fragile holographic energy field projected by an AI core. It keeps unwanted humanoids at safe distance."
+
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield/Initialize(mapload)
+	. = ..()
+	GLOB.selfdestructs_when_boss_dies += src
+
+/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield/Destroy()
+	GLOB.selfdestructs_when_boss_dies -= src
+	return ..()
+
+//smes that produces power, until the boss dies then it self destructs and you gotta make your own power
+/obj/machinery/power/smes/magical/cybersun
+	name = "cybersun-brand power storage unit"
+	desc = "A high-capacity superconducting magnetic energy storage (SMES) unit. It looks like any other SMES unit, except this one says 'Cybersun' on it."
+	//is this being used as part of the haunted trading post ruin? if true, will self destruct when boss dies
+	var/donk_ai_slave = FALSE
+
+/obj/machinery/power/smes/magical/cybersun/Initialize(mapload)
+	. = ..()
+	if(donk_ai_slave)
+		GLOB.selfdestructs_when_boss_dies += src
+
+/obj/machinery/power/smes/magical/cybersun/Destroy()
+	if(donk_ai_slave)
+		GLOB.selfdestructs_when_boss_dies -= src
+	return ..()
+
+//this is a trigger for traps involving doors and shutters
+//doors get closed and bolted, shutters get cycled open/closed
+/obj/machinery/button/door/invisible_tripwire
+	name = "Sonic Tripwire"
+	desc = "An invisible trigger for shutters and doors. Triggers when someone steps on the tile."
+	max_integrity = 50
+	invisibility = INVISIBILITY_ABSTRACT
+	anchored = TRUE
+	//is this being used as part of the haunted trading post ruin? if true, will self destruct when boss dies
+	var/donk_ai_slave = FALSE
+	//can the trap trigger more than once?
+	var/multiuse = FALSE
+	//(if multiuse) how many times the trap can trigger. 0 or lower is infinite
+	var/uses_remaining = 0
+	//if true, the trap will unbolt all doors it bolted and cycle shutters a second time after a delay
+	var/resets_self = FALSE
+	//time before resets_self kicks in
+	var/reset_timer = 1.8 SECONDS
+	//when multiple tripwires are in the same suicide pact, they will all die when any of them die
+	var/suicide_pact = FALSE
+	//id of the suicide pact this tripwire is in
+	var/suicide_pact_id
+GLOBAL_LIST_EMPTY(tripwire_suicide_pact)
+
+/obj/machinery/button/door/invisible_tripwire/Initialize(mapload)
+	. = ..()
+	if(donk_ai_slave == TRUE)
+		GLOB.selfdestructs_when_boss_dies += src
+	if(suicide_pact == TRUE && suicide_pact_id != null)
+		GLOB.tripwire_suicide_pact += src
+	var/static/list/loc_connections = list(
+	COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/machinery/button/door/invisible_tripwire/proc/on_entered(atom/source, atom/movable/victim)
+	SIGNAL_HANDLER
+	if(!isliving(victim))
+		return
+	var/mob/living/target = victim
+	if(target.stat != DEAD && target.mob_size == MOB_SIZE_HUMAN && target.mob_biotypes != MOB_ROBOTIC)
+		tripwire_triggered(target)
+		if(multiuse && uses_remaining < 1)
+			uses_remaining--
+		if(resets_self)
+			addtimer(CALLBACK(src, PROC_REF(tripwire_triggered), victim), reset_timer)
+
+/obj/machinery/button/door/invisible_tripwire/proc/tripwire_triggered(atom/victim)
+	INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), victim)
+	if(multiuse && uses_remaining != 1)
+		return
+	if(suicide_pact&& suicide_pact_id)
+		for (var/obj/machinery/button/door/invisible_tripwire/pact_member in GLOB.tripwire_suicide_pact)
+			if(src.suicide_pact_id == pact_member.suicide_pact_id)
+				qdel(pact_member)
+	qdel(src)
+
+
+/obj/machinery/button/door/invisible_tripwire/Destroy()
+	if(donk_ai_slave)
+		GLOB.selfdestructs_when_boss_dies -= src
+	if(suicide_pact && suicide_pact_id)
+		GLOB.tripwire_suicide_pact -= src
+	return ..()
+
+//door button that destroys itself when it is pressed
+/obj/machinery/button/door/selfdestructs
+	icon_state= "button-warning"
+	skin = "-warning"
+
+/obj/machinery/button/door/selfdestructs/attempt_press(mob/user)
+	. = ..()
+	do_sparks(rand(1,3), src)
+	playsound(src, SFX_SPARKS, 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+	qdel(src)
+
+//trap that gloms onto the first machine it finds on its tile, and lives inside it
+//then it zaps everyone who gets close. disarm by dissassembling the machine, or running out its charges
+/obj/effect/overloader_trap
+	name = "overloader trap"
+	desc = "A trap that overloads machines to electrify people who walk nearby."
+	alpha = 70
+	max_integrity = 50
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "empdisable"
+	//trap wont damage mobs in its faction
+	faction = list(ROLE_SYNDICATE)
+	invisibility = INVISIBILITY_ABSTRACT
+	plane = ABOVE_GAME_PLANE
+	//datum we use to trigger when someones close
+	var/datum/proximity_monitor/proximity_monitor
+	// how close someone has to be to set the trap off
+	var/trigger_range = 1
+	// max range the trap can zap someone
+	var/shock_range = 1
+	/// damage from getting zapped by this trap
+	var/shock_damage = 35
+	// length of time target spends stunned
+	var/stun_duration = 1.5 SECONDS
+	// length of time targets spend jittery
+	var/jitter_time = 5 SECONDS
+	// length of time targets stutter
+	var/stutter_time = 2 SECONDS
+	//is this being used as part of the haunted trading post ruin? if true, will self destruct when boss dies
+	var/donk_ai_slave = FALSE
+	// machine that the trap inhabits
+	var/obj/structure/host_machine
+	// turf that the trap is on
+	var/turf/my_turf
+	//how long until trap zaps everything, after it detects something
+	var/trigger_delay = 0.7 SECONDS
+	COOLDOWN_DECLARE(trigger_cooldown)
+	//time until trap can be triggered again
+	var/trigger_cooldown_duration = 4 SECONDS
+	//max amount of times the trap can trigger
+	var/uses_remaining = 4
+	//amount of damage the trap does to the machine its on, when its triggered
+	//this can kill the machine and if it does, the trap effectively disarms itself
+	//so acts as a soft cap of sorts on number of trap activations
+	var/machine_overload_damage = 80 //machine integrity is usually 200 or 300
+
+/obj/effect/overloader_trap/Initialize(mapload)
+	. = ..()
+	proximity_monitor = new(src, 0)
+	proximity_monitor?.set_range(trigger_range)
+	my_turf = get_turf(src)
+	host_machine = locate(/obj/machinery) in loc
+	if(donk_ai_slave == TRUE)
+		GLOB.selfdestructs_when_boss_dies += src
+
+/obj/effect/overloader_trap/Destroy()
+	if(donk_ai_slave == TRUE)
+		GLOB.selfdestructs_when_boss_dies -= src
+	return ..()
+
+/obj/effect/overloader_trap/proc/check_faction(mob/target)
+	for(var/faction1 in faction)
+		if(faction1 in target.faction)
+			return TRUE
+	return FALSE
+
+/obj/effect/overloader_trap/HasProximity(mob/living)
+	if(!locate(host_machine) in loc) //muh machine's gone, delete myself because im disarmed
+		qdel(src)
+		return
+	if(!COOLDOWN_FINISHED(src, trigger_cooldown)) //do nothing if we're on cooldown
+		return
+	if(uses_remaining == 0) //deletes trap if it triggers when it has no uses left. should only happen if var edited but lets just be safe
+		qdel(src)
+		return
+	if (!isliving(living)) //ensure the guy triggering us is alive
+		return
+	if (living.stat && check_faction(living)) //and make sure it ain't someone on our team
+		return
+	COOLDOWN_START(src, trigger_cooldown, 4 SECONDS)
+	trap_alerted()
+
+/obj/effect/overloader_trap/proc/trap_alerted()
+	if(host_machine in loc)
+		visible_message(span_boldwarning("Sparks fly from [host_machine] as it shakes vigorously!"))
+		do_sparks(number = 3, source = host_machine)
+		host_machine.Shake(2, 1, trigger_delay)
+		addtimer(CALLBACK(src, PROC_REF(trap_effect)), trigger_delay)
+	//if someone breaks or moves the machine before the trap goes off, this should fail to do anything
+
+/obj/effect/overloader_trap/proc/trap_effect()
+	for(var/mob/living/living_mob in range(shock_range, src))
+		if(faction_check_atom(living_mob))
+			continue
+		to_chat(living_mob, span_warning("You are struck by an arc of electricity!"))
+		src.Beam(living_mob, icon_state = "lightning[rand(1,12)]", time = 0.5 SECONDS)
+		living_mob.electrocute_act(shock_damage, host_machine, 1, SHOCK_NOGLOVES, stun_duration, jitter_time, stutter_time)
+	for(var/obj/item/food/deadmouse in range(shock_range, src))
+		src.Beam(deadmouse, icon_state = "lightning[rand(1,12)]", time = 0.5 SECONDS)
+	do_sparks(number = 1, source = host_machine)
+	host_machine.take_damage(machine_overload_damage, sound_effect = FALSE)
+	uses_remaining--
+	if(uses_remaining <= 0)
+		qdel(src)
+
+// [Custom Turrets]
+//these are the non-mob defenders of the hauntedtradingpost.dmm ruin
+//they are controlled with a syndicate ID and are hostile to anything non-syndicate by default
+
+//donk turret - 9mm
+/obj/machinery/porta_turret/syndicate/donk
+	//Medium speed, medium damage, fragile. Does brute damage.
+	name = "\improper Donk Co. Defense Turret"
+	icon_state = "donk_lethal"
+	max_integrity = 120
+	base_icon_state = "donk"
+	stun_projectile = /obj/projectile/bullet/foam_dart/riot
+	lethal_projectile = /obj/projectile/bullet/c9mm/blunttip
+	lethal_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
+	stun_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
+	desc = "A ballistic machine gun auto-turret with Donk Co. branding. It uses 9mm rounds."
+	armor_type = /datum/armor/donk_turret
+	scan_range = 6
+	shot_delay = 10
+
+/datum/armor/donk_turret
+	melee = 20
+	bullet = 20
+	laser = 40
+	energy = 40
+	bomb = 20
+	fire = 50
+	acid = 100
+
+/obj/projectile/bullet/c9mm/blunttip
+	wound_bonus = -40 //this will still cause bleeding wounds, but less often.
+
+//cybersun turret - plasma beam
+/obj/machinery/porta_turret/syndicate/energy/cybersun
+	//Slow speed, high damage. Does burn damage.
+	name = "\improper Cybersun Plasma Auto-turret"
+	icon_state = "red_lethal"
+	base_icon_state = "red"
+	stun_projectile = /obj/projectile/energy/electrode
+	stun_projectile_sound = 'sound/weapons/taser.ogg'
+	lethal_projectile = /obj/projectile/beam/laser/cybersun
+	lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+	desc = "An energy gun auto-turret with Cybersun branding. It fires high-energy plasma beams that do a lot of damage, but it can be fairly slow."
+	armor_type = /datum/armor/syndicate_shuttle
+	scan_range = 6
+	shot_delay = 50
+	always_up = FALSE
+	has_cover = TRUE
+
+/obj/projectile/beam/laser/cybersun
+	name = "plasma beam"
+	desc = "A big red plasma beam, currently in flight."
+	icon_state = "lava"
+	light_color = COLOR_DARK_RED
+	damage = 30
+	wound_bonus = -50
+
diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm
index b01ca83a8a24d..6ac3fd75f963c 100644
--- a/code/modules/mapping/preloader.dm
+++ b/code/modules/mapping/preloader.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(_preloader_path, null)
 		what.vars[attribute] = value
 
 /// Template noop (no operation) is used to skip a turf or area when the template is loaded this allows for template transparency
-/// ex. if a ship has gaps in it's design, you would use template_noop to fill these in so that when the ship moves z-level, any
+/// ex. if a ship has gaps in its design, you would use template_noop to fill these in so that when the ship moves z-level, any
 /// tiles these gaps land on will not be deleted and replaced with the ships (empty) tiles
 /area/template_noop
 	name = "Area Passthrough"
diff --git a/code/modules/meteors/meteor_changeling.dm b/code/modules/meteors/meteor_changeling.dm
index 9c25f8b6776a6..5d1aa81bf070e 100644
--- a/code/modules/meteors/meteor_changeling.dm
+++ b/code/modules/meteors/meteor_changeling.dm
@@ -7,7 +7,7 @@
 	hits = 1 //Instantly splatters apart when it hits anything.
 	hitpwr = EXPLODE_LIGHT
 	threat = 100
-	signature = "xenobiological lifesign" //In the extremely unlikely one-in-a-million chance that one of these gets reported by the stray meteor event
+	signature = "ксенобиологических форм жизни" //In the extremely unlikely one-in-a-million chance that one of these gets reported by the stray meteor event
 	///Where we want our changeling to, by whatever means, end up at.
 	var/atom/landing_target
 
diff --git a/code/modules/meteors/meteor_dark_matteor.dm b/code/modules/meteors/meteor_dark_matteor.dm
index f72bbcff6fa13..10f1ca0786d30 100644
--- a/code/modules/meteors/meteor_dark_matteor.dm
+++ b/code/modules/meteors/meteor_dark_matteor.dm
@@ -10,7 +10,7 @@
 	meteordrop = list(/obj/singularity/dark_matter) //what the FUCK
 	dropamt = 1
 	threat = 100
-	signature = "dark matter"
+	signature = "темной материи"
 	/// distortion to really give you that sense of oh shit
 	var/atom/movable/warp_effect/warp
 	/// and another oh shit in the form of quantum sparks
@@ -32,7 +32,7 @@
 	START_PROCESSING(SSobj, src)
 
 /obj/effect/meteor/dark_matteor/process(seconds_per_tick)
-	//meteor's warp quickly contracts then slowly expands it's ring
+	//meteor's warp quickly contracts then slowly expands its ring
 	animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5))
 	animate(time = seconds_per_tick*7, transform = matrix())
 
diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm
index 199f6517abb1e..a6a9977052f72 100644
--- a/code/modules/meteors/meteor_types.dm
+++ b/code/modules/meteors/meteor_types.dm
@@ -33,7 +33,7 @@
 	var/lifetime = DEFAULT_METEOR_LIFETIME
 
 	///Used by Stray Meteor event to indicate meteor type (the type of sensor that "detected" it) in announcement
-	var/signature = "motion"
+	var/signature = "движения"
 
 /obj/effect/meteor/Initialize(mapload, turf/target)
 	. = ..()
@@ -240,7 +240,7 @@
 	meteorsound = 'sound/effects/bamf.ogg'
 	meteordrop = list(/obj/item/stack/ore/plasma)
 	threat = 20
-	signature = "thermal"
+	signature = "тепла"
 
 /obj/effect/meteor/flaming/meteor_effect()
 	..()
@@ -255,7 +255,7 @@
 	hits = 9
 	meteordrop = list(/obj/item/stack/ore/uranium)
 	threat = 35
-	signature = "radiation"
+	signature = "радиации"
 
 /obj/effect/meteor/irradiated/meteor_effect()
 	..()
@@ -273,7 +273,7 @@
 	heavy = TRUE
 	meteorsound = 'sound/effects/break_stone.ogg'
 	threat = 25
-	signature = "ordnance"
+	signature = "артиллерии"
 	///Number of fragmentation meteors to be spawned
 	var/cluster_count = 8
 
@@ -305,7 +305,7 @@
 	meteordrop = list(/mob/living/basic/carp)
 	dropamt = 1
 	threat = 5
-	signature = "fishing and trawling"
+	signature = "рыболовства"
 
 /obj/effect/meteor/carp/Initialize(mapload)
 	if(prob(2))
@@ -321,7 +321,7 @@
 	hits = 12
 	meteordrop = list(/obj/item/stack/ore/bluespace_crystal)
 	threat = 15
-	signature = "bluespace flux"
+	signature = "блюспейс потоков"
 
 /obj/effect/meteor/bluespace/Bump()
 	..()
@@ -338,7 +338,7 @@
 	meteorsound = 'sound/items/bikehorn.ogg'
 	threat = 15
 	movement_type = PHASING
-	signature = "comedy"
+	signature = "комедии"
 
 /obj/effect/meteor/banana/meteor_effect()
 	..()
@@ -359,7 +359,7 @@
 	icon_state = "bluespace"
 	hits = 6
 	threat = 10
-	signature = "electromagnetic interference"
+	signature = "электромагнитных помех"
 
 /obj/effect/meteor/emp/Move()
 	. = ..()
@@ -382,7 +382,7 @@
 	meteordrop = list(/obj/item/food/meat/slab/human, /obj/item/food/meat/slab/human/mutant, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/tongue, /obj/item/organ/internal/appendix/)
 	var/meteorgibs = /obj/effect/gibspawner/generic
 	threat = 2
-	signature = "culinary material"
+	signature = "кулинарных ингридиентов"
 
 /obj/effect/meteor/meaty/Initialize(mapload)
 	for(var/path in meteordrop)
@@ -414,7 +414,7 @@
 	color = "#5EFF00"
 	meteordrop = list(/obj/item/food/meat/slab/xeno, /obj/item/organ/internal/tongue/alien)
 	meteorgibs = /obj/effect/gibspawner/xeno
-	signature = "exotic culinary material"
+	signature = "экзотических кулинарных ингридиентов"
 
 /obj/effect/meteor/meaty/xeno/Initialize(mapload)
 	meteordrop += subtypesof(/obj/item/organ/internal/alien)
@@ -435,7 +435,7 @@
 	meteorsound = 'sound/effects/bamf.ogg'
 	meteordrop = list(/obj/item/stack/ore/plasma)
 	threat = 50
-	signature = "armageddon"
+	signature = "армаггедона"
 
 /obj/effect/meteor/tunguska/Move()
 	. = ..()
diff --git a/code/modules/mining/boulder_processing/_boulder_processing.dm b/code/modules/mining/boulder_processing/_boulder_processing.dm
index 5795eed1d7490..ab72e4ebae57b 100644
--- a/code/modules/mining/boulder_processing/_boulder_processing.dm
+++ b/code/modules/mining/boulder_processing/_boulder_processing.dm
@@ -15,7 +15,7 @@
 	var/boulders_held_max = 1
 	/// What sound plays when a thing operates?
 	var/usage_sound = 'sound/machines/mining/wooping_teleport.ogg'
-	/// Silo link to it's materials list.
+	/// Silo link to its materials list.
 	var/datum/component/remote_materials/silo_materials
 	/// Mining points held by the machine for miners.
 	var/points_held = 0
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 0a4a6ce6572b1..6a276e830726b 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -105,15 +105,9 @@
 		crusher_trophy.on_melee_hit(target, user)
 	if(QDELETED(target))
 		return
-	// Clear existing marks
-	var/valid_crusher_attack = FALSE
-	for(var/datum/status_effect/crusher_mark/crusher_mark_effect as anything in target.get_all_status_effect_of_id(/datum/status_effect/crusher_mark))
-		//this will erase ALL crusher marks, not only ones by you.
-		if(crusher_mark_effect.hammer_synced != src || !target.remove_status_effect(/datum/status_effect/crusher_mark, src))
-			continue
-		valid_crusher_attack = TRUE
-		break
-	if(!valid_crusher_attack)
+	var/datum/status_effect/crusher_mark/mark = target.has_status_effect(/datum/status_effect/crusher_mark)
+	var/boosted_mark = mark?.boosted
+	if(!target.remove_status_effect(mark))
 		return
 	// Detonation effect
 	var/datum/status_effect/crusher_damage/crusher_damage_effect = target.has_status_effect(/datum/status_effect/crusher_damage) || target.apply_status_effect(/datum/status_effect/crusher_damage)
@@ -130,7 +124,7 @@
 	var/backstab_dir = get_dir(user, target)
 	var/def_check = target.getarmor(type = BOMB)
 	// Backstab bonus
-	if((user.dir & backstab_dir) && (target.dir & backstab_dir))
+	if((user.dir & backstab_dir) && (target.dir & backstab_dir) || boosted_mark)
 		backstabbed = TRUE
 		combined_damage += backstab_bonus
 		playsound(user, 'sound/weapons/kinetic_accel.ogg', 100, TRUE) //Seriously who spelled it wrong
@@ -164,7 +158,6 @@
 		attached_trophy.on_projectile_fire(destabilizer, user)
 	destabilizer.preparePixelProjectile(target, user, modifiers)
 	destabilizer.firer = user
-	destabilizer.hammer_synced = src
 	playsound(user, 'sound/weapons/plasma_cutter.ogg', 100, TRUE)
 	destabilizer.fire()
 	charged = FALSE
@@ -211,24 +204,24 @@
 	armor_flag = BOMB
 	range = 6
 	log_override = TRUE
-	///The crusher that's firing this projectile.
-	var/obj/item/kinetic_crusher/hammer_synced
+	/// Has this projectile been boosted
+	var/boosted = FALSE
 
-/obj/projectile/destabilizer/Destroy()
-	hammer_synced = null
-	return ..()
+/obj/projectile/destabilizer/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile, parry_callback = CALLBACK(src, PROC_REF(on_parry)))
+
+/obj/projectile/destabilizer/proc/on_parry(mob/user)
+	SIGNAL_HANDLER
+	boosted = TRUE
+	// Get a bit of a damage/range boost after being parried
+	damage = 10
+	range = 9
 
 /obj/projectile/destabilizer/on_hit(atom/target, blocked = 0, pierce_hit)
 	if(isliving(target))
 		var/mob/living/living_target = target
-		var/has_mark_from_this_crusher = FALSE
-		for(var/datum/status_effect/crusher_mark/crusher_mark_effect as anything in living_target.get_all_status_effect_of_id(/datum/status_effect/crusher_mark))
-			if(crusher_mark_effect.hammer_synced != hammer_synced)
-				continue
-			has_mark_from_this_crusher = TRUE
-			break
-		if(!has_mark_from_this_crusher)
-			living_target.apply_status_effect(/datum/status_effect/crusher_mark, hammer_synced)
+		living_target.apply_status_effect(/datum/status_effect/crusher_mark, boosted)
 	var/target_turf = get_turf(target)
 	if(ismineralturf(target_turf))
 		var/turf/closed/mineral/hit_mineral = target_turf
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 1e4e444861155..3a813aebd14a6 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -261,7 +261,7 @@
 	graft_gene = /datum/plant_gene/trait/fire_resistance
 
 /obj/item/seeds/lavaland/cactus
-	name = "pack of fruiting cactus seeds"
+	name = "fruiting cactus seed pack"
 	desc = "These seeds grow into fruiting cacti."
 	icon_state = "seed-cactus"
 	species = "cactus"
@@ -275,7 +275,7 @@
 
 ///Star Cactus seeds, mutation of lavaland cactus.
 /obj/item/seeds/star_cactus
-	name = "pack of star cacti seeds"
+	name = "star cacti seed pack"
 	desc = "These seeds grow into star cacti."
 	icon_state = "seed-starcactus"
 	species = "starcactus"
@@ -303,7 +303,7 @@
 	distill_reagent = /datum/reagent/consumable/ethanol/tequila
 
 /obj/item/seeds/lavaland/polypore
-	name = "pack of polypore mycelium"
+	name = "polypore mycelium pack"
 	desc = "This mycelium grows into bracket mushrooms, also known as polypores. Woody and firm, shaft miners often use them for makeshift crafts."
 	icon_state = "mycelium-polypore"
 	species = "polypore"
@@ -314,7 +314,7 @@
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/consumable/mintextract = 0.02)
 
 /obj/item/seeds/lavaland/porcini
-	name = "pack of porcini mycelium"
+	name = "porcini mycelium pack"
 	desc = "This mycelium grows into Boletus edulus, also known as porcini. Native to the late Earth, but discovered on Lavaland. Has culinary, medicinal and relaxant effects."
 	icon_state = "mycelium-porcini"
 	species = "porcini"
@@ -325,7 +325,7 @@
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.06,  /datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04)
 
 /obj/item/seeds/lavaland/inocybe
-	name = "pack of inocybe mycelium"
+	name = "inocybe mycelium pack"
 	desc = "This mycelium grows into an inocybe mushroom, a species of Lavaland origin with hallucinatory and toxic effects."
 	icon_state = "mycelium-inocybe"
 	species = "inocybe"
@@ -336,7 +336,7 @@
 	reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.04, /datum/reagent/consumable/entpoly = 0.08, /datum/reagent/drug/mushroomhallucinogen = 0.04)
 
 /obj/item/seeds/lavaland/ember
-	name = "pack of embershroom mycelium"
+	name = "embershroom mycelium pack"
 	desc = "This mycelium grows into embershrooms, a species of bioluminescent mushrooms native to Lavaland."
 	icon_state = "mycelium-ember"
 	species = "ember"
@@ -347,7 +347,7 @@
 	reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/drug/space_drugs = 0.02)
 
 /obj/item/seeds/lavaland/seraka
-	name = "pack of seraka mycelium"
+	name = "seraka mycelium pack"
 	desc = "This mycelium grows into seraka mushrooms, a species of savoury mushrooms originally native to Tizira used in food and traditional medicine."
 	icon_state = "mycelium-seraka"
 	species = "seraka"
@@ -358,7 +358,7 @@
 	reagents_add = list(/datum/reagent/toxin/mushroom_powder = 0.1, /datum/reagent/medicine/coagulant/seraka_extract = 0.02)
 
 /obj/item/seeds/lavaland/fireblossom
-	name = "pack of fire blossom seeds"
+	name = "fire blossom seed pack"
 	desc = "These seeds grow into fire blossoms."
 	plantname = "Fire Blossom"
 	icon_state = "seed-fireblossom"
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index 6dfc8cfe40c3a..ac3ee0b9b2774 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -246,13 +246,13 @@
 		inhand_icon_state = "lantern-blue"
 		wisp.orbit(user, 20)
 		SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed")
+		return
 
-	else
-		to_chat(user, span_notice("You return the wisp to the lantern."))
-		icon_state = "lantern-blue-on"
-		inhand_icon_state = "lantern-blue-on"
-		wisp.forceMove(src)
-		SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
+	to_chat(user, span_notice("You return the wisp to the lantern."))
+	icon_state = "lantern-blue-on"
+	inhand_icon_state = "lantern-blue-on"
+	wisp.forceMove(src)
+	SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
 
 /obj/item/wisp_lantern/Initialize(mapload)
 	. = ..()
@@ -278,26 +278,30 @@
 	light_flags = LIGHT_ATTACHED
 	layer = ABOVE_ALL_MOB_LAYER
 	plane = ABOVE_GAME_PLANE
-	var/sight_flags = SEE_MOBS
 	var/list/color_cutoffs = list(10, 25, 25)
 
 /obj/effect/wisp/orbit(atom/thing, radius, clockwise, rotation_speed, rotation_segments, pre_rotation, lockinorbit)
 	. = ..()
-	if(ismob(thing))
-		RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
-		var/mob/being = thing
-		being.update_sight()
-		to_chat(thing, span_notice("The wisp enhances your vision."))
+	if(!ismob(thing))
+		return
+	var/mob/being = thing
+	RegisterSignal(being, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
+	to_chat(being, span_notice("The wisp enhances your vision."))
+	ADD_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
+	being.update_sight()
 
 /obj/effect/wisp/stop_orbit(datum/component/orbiter/orbits)
-	. = ..()
-	if(ismob(orbits.parent))
-		UnregisterSignal(orbits.parent, COMSIG_MOB_UPDATE_SIGHT)
-		to_chat(orbits.parent, span_notice("Your vision returns to normal."))
+	if(!ismob(orbit_target))
+		return ..()
+	var/mob/being = orbit_target
+	UnregisterSignal(being, COMSIG_MOB_UPDATE_SIGHT)
+	to_chat(being, span_notice("Your vision returns to normal."))
+	REMOVE_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
+	being.update_sight()
+	return ..()
 
 /obj/effect/wisp/proc/update_user_sight(mob/user)
 	SIGNAL_HANDLER
-	user.add_sight(sight_flags)
 	if(!isnull(color_cutoffs))
 		user.lighting_color_cutoffs = blend_cutoff_colors(user.lighting_color_cutoffs, color_cutoffs)
 
@@ -772,7 +776,7 @@
 	user.physiology.brute_mod *= 0.5
 	user.next_move_modifier *= BERSERK_ATTACK_SPEED_MODIFIER
 	user.add_atom_colour(COLOR_BUBBLEGUM_RED, TEMPORARY_COLOUR_PRIORITY)
-	ADD_TRAIT(user, TRAIT_NOGUNS, BERSERK_TRAIT)
+	user.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), BERSERK_TRAIT)
 	ADD_TRAIT(src, TRAIT_NODROP, BERSERK_TRAIT)
 	berserk_active = TRUE
 	START_PROCESSING(SSobj, src)
@@ -790,7 +794,7 @@
 	user.physiology.brute_mod *= 2
 	user.next_move_modifier /= BERSERK_ATTACK_SPEED_MODIFIER
 	user.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_BUBBLEGUM_RED)
-	REMOVE_TRAIT(user, TRAIT_NOGUNS, BERSERK_TRAIT)
+	user.remove_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), BERSERK_TRAIT)
 	REMOVE_TRAIT(src, TRAIT_NODROP, BERSERK_TRAIT)
 	STOP_PROCESSING(SSobj, src)
 
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 79d7901dd9e44..c8a58a1d0f493 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -13,7 +13,7 @@
 /obj/machinery/mineral/stacking_unit_console/Initialize(mapload)
 	. = ..()
 	var/area/our_area = get_area(src)
-	if(!isnull(our_area))
+	if(isnull(our_area))
 		return
 	var/list/turf_list = our_area.get_turfs_by_zlevel(z)
 	if(!islist(turf_list))
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index d2a9af576ce42..5d9809a01f798 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 
 /*****************************Coin********************************/
 
-// The coin's value is a value of it's materials.
+// The coin's value is a value of its materials.
 // Yes, the gold standard makes a come-back!
 // This is the only way to make coins that are possible to produce on station actually worth anything.
 /obj/item/coin
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index c1a81b9d33847..bf4411a0d482d 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -36,7 +36,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	var/health_scan = FALSE //Are health scans currently enabled?
 	var/chem_scan = FALSE //Are chem scans currently enabled?
 	var/gas_scan = FALSE //Are gas scans currently enabled?
-	var/list/datahuds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED) //list of data HUDs shown to ghosts.
 	var/ghost_orbit = GHOST_ORBIT_CIRCLE
 
 	//These variables store hair data if the ghost originates from a species with head and/or facial hair.
@@ -63,6 +62,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	/// The POI we're orbiting (orbit menu)
 	var/orbiting_ref
 
+	var/static/list/observer_hud_traits = list(
+		TRAIT_SECURITY_HUD,
+		TRAIT_MEDICAL_HUD,
+		TRAIT_DIAGNOSTIC_HUD,
+		TRAIT_BOT_PATH_HUD
+	)
+
 /mob/dead/observer/Initialize(mapload)
 	set_invisibility(GLOB.observer_default_invisibility)
 
@@ -144,12 +150,12 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	. = ..()
 
 	grant_all_languages()
+	setup_hud_traits()
 	show_data_huds()
 	data_huds_on = 1
 
 	SSpoints_of_interest.make_point_of_interest(src)
 	ADD_TRAIT(src, TRAIT_HEAR_THROUGH_DARKNESS, ref(src))
-	ADD_TRAIT(src, TRAIT_SECURITY_HUD, ref(src))
 
 /mob/dead/observer/get_photo_description(obj/item/camera/camera)
 	if(!invisibility || camera.see_ghosts)
@@ -506,6 +512,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	. = ..()
 	//restart our floating animation after orbit is done.
 	pixel_y = base_pixel_y
+	// if we were autoobserving, reset perspective
+	if (!isnull(client) && !isnull(client.eye))
+		reset_perspective(null)
 
 /mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
 	set category = "Ghost"
@@ -757,14 +766,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	return
 
 /mob/dead/observer/proc/show_data_huds()
-	for(var/hudtype in datahuds)
-		var/datum/atom_hud/data_hud = GLOB.huds[hudtype]
-		data_hud.show_to(src)
+	add_traits(observer_hud_traits, REF(src))
 
 /mob/dead/observer/proc/remove_data_huds()
-	for(var/hudtype in datahuds)
-		var/datum/atom_hud/data_hud = GLOB.huds[hudtype]
-		data_hud.hide_from(src)
+	remove_traits(observer_hud_traits, REF(src))
 
 /mob/dead/observer/verb/toggle_data_huds()
 	set name = "Toggle Sec/Med/Diag HUD"
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index ee0b4528995ef..bdb0b7ce37e88 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -211,13 +211,25 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new)
 	if(issilicon(player))
 		serialized["job"] = player.job
 		serialized["icon"] = "borg"
-	else
-		var/obj/item/card/id/id_card = player.get_idcard(hand_first = FALSE)
-		serialized["job"] = id_card?.get_trim_assignment()
-		serialized["icon"] = id_card?.get_trim_sechud_icon_state()
+		return serialized
 
-	return serialized
+	var/obj/item/card/id/id_card = player.get_idcard(hand_first = FALSE)
+	serialized["job"] = id_card?.get_trim_assignment()
+	serialized["icon"] = id_card?.get_trim_sechud_icon_state()
+
+	var/datum/job/job = player.mind?.assigned_role
+	if (isnull(job))
+		return serialized
 
+	serialized["mind_job"] = job.title
+	var/datum/outfit/outfit = job.get_outfit()
+	if (isnull(outfit))
+		return serialized
+
+	var/datum/id_trim/trim = outfit.id_trim
+	if (!isnull(trim))
+		serialized["mind_icon"] = trim::sechud_icon_state
+	return serialized
 
 /// Gets a list: Misc data and whether it's critical. Handles all snowflakey type cases
 /datum/orbit_menu/proc/get_misc_data(atom/movable/atom_poi) as /list
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 18666a1cbd5f5..84b00249a4972 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -27,14 +27,19 @@
 			to_chat(src, span_notice("'[act]' emote does not exist. Say *help for a list."))
 		return FALSE
 	var/silenced = FALSE
-	for(var/datum/emote/P in key_emotes)
-		if(!P.check_cooldown(src, intentional))
+	for(var/datum/emote/emote in key_emotes)
+		if(!emote.check_cooldown(src, intentional))
 			silenced = TRUE
 			continue
-		if(P.run_emote(src, param, m_type, intentional))
-			SEND_SIGNAL(src, COMSIG_MOB_EMOTE, P, act, m_type, message, intentional)
-			SEND_SIGNAL(src, COMSIG_MOB_EMOTED(P.key))
-			return TRUE
+		if(!emote.can_run_emote(src, TRUE, intentional, param))
+			continue
+		if(SEND_SIGNAL(src, COMSIG_MOB_PRE_EMOTED, emote.key, param, m_type, intentional, emote) & COMPONENT_CANT_EMOTE)
+			silenced = TRUE
+			continue
+		emote.run_emote(src, param, m_type, intentional)
+		SEND_SIGNAL(src, COMSIG_MOB_EMOTE, emote, act, m_type, message, intentional)
+		SEND_SIGNAL(src, COMSIG_MOB_EMOTED(emote.key))
+		return TRUE
 	if(intentional && !silenced && !force_silence)
 		to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list."))
 	return FALSE
@@ -78,15 +83,15 @@
 
 /datum/emote/flip/run_emote(mob/user, params , type_override, intentional)
 	. = ..()
-	if(.)
-		user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1)
+	user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1)
 
 /datum/emote/flip/check_cooldown(mob/user, intentional)
 	var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP)
 	if(slow_flipper)
 		cooldown *= 2
 	. = ..()
-	cooldown *= 0.5
+	if(slow_flipper)
+		cooldown *= 0.5
 	if(.)
 		return
 	if(!can_run_emote(user, intentional=intentional))
@@ -116,8 +121,7 @@
 
 /datum/emote/spin/run_emote(mob/user, params,  type_override, intentional)
 	. = ..()
-	if(.)
-		user.spin(20, 1)
+	user.spin(20, 1)
 
 /datum/emote/spin/check_cooldown(mob/living/carbon/user, intentional)
 	. = ..()
diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm
index 98a771a06a99d..582af27c3161b 100644
--- a/code/modules/mob/living/basic/basic.dm
+++ b/code/modules/mob/living/basic/basic.dm
@@ -318,3 +318,9 @@
 
 /mob/living/basic/get_body_temp_cold_damage_limit()
 	return minimum_survivable_temperature
+
+/mob/living/basic/proc/hop_on_nearby_turf()
+	var/dir = pick(GLOB.cardinals)
+	Move(get_step(src, dir), dir)
+	animate(src, pixel_y = 18, time = 0.4 SECONDS, flags = ANIMATION_RELATIVE, easing = CUBIC_EASING|EASE_OUT)
+	animate(pixel_y = -18, time = 0.4 SECONDS, flags = ANIMATION_RELATIVE, easing = CUBIC_EASING|EASE_IN)
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 86fe0b5cf5704..04b3a7864d21e 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(command_strings, list(
 	var/list/current_pathed_turfs = list()
 
 	///The type of data HUD the bot uses. Diagnostic by default.
-	var/data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+	var/data_hud_type = DATA_HUD_DIAGNOSTIC
 	/// If true we will allow ghosts to control this mob
 	var/can_be_possessed = FALSE
 	/// Message to display upon possession
@@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(command_strings, list(
 	RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_loop_movement))
 	RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(after_attacked))
 	RegisterSignal(src, COMSIG_MOB_TRIED_ACCESS, PROC_REF(attempt_access))
-	ADD_TRAIT(src, TRAIT_NO_GLIDE, INNATE_TRAIT)
+	add_traits(list(TRAIT_NO_GLIDE, TRAIT_SILICON_EMOTES_ALLOWED), INNATE_TRAIT)
 	GLOB.bots_list += src
 
 	// Give bots a fancy new ID card that can hold any access.
@@ -517,7 +517,6 @@ GLOBAL_LIST_INIT(command_strings, list(
 	if(istype(item_to_drop, /obj/item/stock_parts/power_store/cell))
 		var/obj/item/stock_parts/power_store/cell/dropped_cell = item_to_drop
 		dropped_cell.charge = 0
-		dropped_cell.update_appearance()
 		return
 
 	if(istype(item_to_drop, /obj/item/storage))
diff --git a/code/modules/mob/living/basic/bots/bot_hud.dm b/code/modules/mob/living/basic/bots/bot_hud.dm
index cbadab01360e8..61aee9f10b180 100644
--- a/code/modules/mob/living/basic/bots/bot_hud.dm
+++ b/code/modules/mob/living/basic/bots/bot_hud.dm
@@ -52,7 +52,7 @@
 	var/list/path_images = active_hud_list[DIAG_PATH_HUD]
 	LAZYCLEARLIST(path_images)
 
-	var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED])
+	var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH])
 
 	var/atom/move_target = ai_controller.current_movement_target
 	if(move_target != ai_controller.blackboard[BB_BEACON_TARGET])
diff --git a/code/modules/mob/living/basic/bots/dedbot.dm b/code/modules/mob/living/basic/bots/dedbot.dm
new file mode 100644
index 0000000000000..bf48ac93c3b57
--- /dev/null
+++ b/code/modules/mob/living/basic/bots/dedbot.dm
@@ -0,0 +1,118 @@
+///////////////Donk Exenteration Drone - DED////////////
+//A patrolling bot that cuts you up if you get close. Use ranged weapons or avoid it.
+
+#define SPIN_SLASH_ABILITY_TYPEPATH /datum/action/cooldown/mob_cooldown/exenterate
+
+/mob/living/basic/bot/dedbot
+	name = "\improper Donk Exenteration Drone" //Exenteration means ripping entrails out, ouch!
+	desc = "A bladed commercial defence drone, often called an 'Ex-Drone' or 'D.E.D.bot'. It follows a simple programmed patrol route, and slashes at anyone who doesn't have an identity implant."
+	icon_state = "ded_drone0"
+	base_icon_state = "ded_drone"
+	req_one_access = list(ACCESS_SYNDICATE)
+	health = 50
+	maxHealth = 50
+	melee_damage_lower = 15
+	melee_damage_upper = 20
+	light_range = 1
+	light_power = 0.3
+	light_color = "#eb1809"
+	ai_controller = /datum/ai_controller/basic_controller/bot/dedbot
+	faction = list(ROLE_SYNDICATE)
+	sharpness = SHARP_EDGED
+	attack_verb_continuous = "eviscerates"
+	attack_verb_simple = "eviscerate"
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	attack_vis_effect = ATTACK_EFFECT_SLASH
+	gold_core_spawnable = HOSTILE_SPAWN
+	limb_destroyer = TRUE
+	bubble_icon = "machine"
+	pass_flags = PASSMOB | PASSFLAPS
+	maximum_survivable_temperature = 360 //prone to overheating
+	possessed_message = "You are an exenteration drone. Exenterate."
+	additional_access = /datum/id_trim/away/hauntedtradingpost/boss
+	bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL
+	mob_size = MOB_SIZE_SMALL
+	robot_arm = /obj/item/hatchet/cutterblade
+	density = FALSE
+	COOLDOWN_DECLARE(trigger_cooldown)
+	//time between exenteration uses
+	var/exenteration_cooldown_duration = 0.5 SECONDS
+	//aoe slash ability
+	var/datum/action/cooldown/mob_cooldown/bot/exenterate
+
+/mob/living/basic/bot/dedbot/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/death_drops, /obj/effect/gibspawner/robot)
+	var/static/list/innate_actions = list(
+	SPIN_SLASH_ABILITY_TYPEPATH = BB_DEDBOT_SLASH,
+	)
+	grant_actions_by_list(innate_actions)
+
+/datum/ai_controller/basic_controller/bot/dedbot
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+		BB_TARGET_MINIMUM_STAT = DEAD,
+		BB_AGGRO_RANGE = 2,
+	)
+	ai_movement = /datum/ai_movement/jps/bot
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/targeted_mob_ability/exenterate,
+		/datum/ai_planning_subtree/respond_to_summon,
+		/datum/ai_planning_subtree/find_patrol_beacon,
+		/datum/ai_planning_subtree/manage_unreachable_list,
+	)
+	max_target_distance = AI_BOT_PATH_LENGTH
+	///keys to be reset when the bot is reseted
+	reset_keys = list(
+		BB_BEACON_TARGET,
+		BB_PREVIOUS_BEACON_TARGET,
+		BB_BOT_SUMMON_TARGET,
+	)
+
+/datum/ai_planning_subtree/targeted_mob_ability/exenterate
+	ability_key = BB_DEDBOT_SLASH
+	finish_planning = FALSE
+
+/datum/action/cooldown/mob_cooldown/exenterate
+	name = "Exenterate"
+	desc = "Disembowel every living thing in range with your blades."
+	button_icon = 'icons/obj/weapons/stabby.dmi'
+	button_icon_state = "huntingknife"
+	click_to_activate = FALSE
+	background_icon = 'icons/hud/guardian.dmi'
+	background_icon_state = "base"
+	cooldown_time = 0.5 SECONDS
+	// radius in tiles of AOE effect
+	var/ability_range = 1
+	// how much damage this ability does
+	var/damage_dealt = 18
+	// factions we dont attack
+	var/immune_factions = list(ROLE_SYNDICATE)
+	// weighted list of body zones this can hit
+	var/static/list/valid_targets = list(
+		BODY_ZONE_CHEST = 2,
+		BODY_ZONE_R_ARM = 1,
+		BODY_ZONE_L_ARM = 1,
+		BODY_ZONE_R_LEG = 1,
+		BODY_ZONE_L_LEG = 1,
+	)
+
+/datum/action/cooldown/mob_cooldown/exenterate/Activate(atom/caster)
+	if(!COOLDOWN_FINISHED(src, cooldown_time))
+		return FALSE
+	caster.Shake(1.4, 0.8, 0.3 SECONDS)
+	caster.visible_message(span_danger("[caster] shakes violently!"))
+	playsound(caster, 'sound/weapons/drill.ogg', 120 , TRUE)
+	slash_em(caster)
+	StartCooldown(cooldown_time)
+
+/datum/action/cooldown/mob_cooldown/exenterate/proc/slash_em(atom/caster)
+	for(var/mob/living/victim in range(ability_range, caster))
+		if(faction_check(victim.faction, immune_factions) && owner.CanReach(victim))
+			continue
+		to_chat(caster, span_warning("You slice [victim]!"))
+		to_chat(victim, span_warning("You are cut by [caster]'s blades!"))
+		victim.apply_damage(damage = damage_dealt, damagetype = BRUTE, def_zone = pick(valid_targets), sharpness = SHARP_EDGED)
+
+#undef SPIN_SLASH_ABILITY_TYPEPATH
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm
index 31fa969fa5983..e6eeaa2031cc6 100644
--- a/code/modules/mob/living/basic/bots/firebot/firebot.dm
+++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm
@@ -74,15 +74,15 @@
 	internal_ext.refill()
 
 /mob/living/basic/bot/firebot/melee_attack(atom/attacked_atom, list/modifiers, ignore_cooldown = FALSE)
-	use_extinguisher(attacked_atom)
+	use_extinguisher(attacked_atom, modifiers)
 
 /mob/living/basic/bot/firebot/RangedAttack(atom/attacked_atom, list/modifiers)
-	use_extinguisher(attacked_atom)
+	use_extinguisher(attacked_atom, modifiers)
 
-/mob/living/basic/bot/firebot/proc/use_extinguisher(atom/attacked_atom)
+/mob/living/basic/bot/firebot/proc/use_extinguisher(atom/attacked_atom, list/modifiers)
 	if(!(bot_mode_flags & BOT_MODE_ON))
 		return
-	spray_water(attacked_atom)
+	spray_water(attacked_atom, modifiers)
 
 /mob/living/basic/bot/firebot/emag_act(mob/user, obj/item/card/emag/emag_card)
 	. = ..()
@@ -137,12 +137,12 @@
 	foam.start()
 	COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL)
 
-/mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom)
+/mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom, list/modifiers)
 	if(firebot_mode_flags & FIREBOT_STATIONARY_MODE)
 		flick("firebots_use", src)
 	else
 		flick("firebot1_use", src)
-	internal_ext?.melee_attack_chain(src, attacked_atom)
+	internal_ext?.interact_with_atom(attacked_atom, src, modifiers)
 
 /mob/living/basic/bot/firebot/update_icon_state()
 	. = ..()
diff --git a/code/modules/mob/living/basic/bots/vibebot/vibebot.dm b/code/modules/mob/living/basic/bots/vibebot/vibebot.dm
index c872e1ea5959c..c8e2d713623ee 100644
--- a/code/modules/mob/living/basic/bots/vibebot/vibebot.dm
+++ b/code/modules/mob/living/basic/bots/vibebot/vibebot.dm
@@ -14,7 +14,7 @@
 	radio_key = /obj/item/encryptionkey/headset_service
 	radio_channel = RADIO_CHANNEL_SERVICE
 	bot_type = VIBE_BOT
-	data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+	data_hud_type = DATA_HUD_DIAGNOSTIC
 	path_image_color = "#2cac12"
 	possessed_message = "You are a vibebot! Maintain the station's vibes to the best of your ability!"
 
diff --git a/code/modules/mob/living/basic/cult/constructs/_construct.dm b/code/modules/mob/living/basic/cult/constructs/_construct.dm
index 79e6e7487721b..1c5e91b50c263 100644
--- a/code/modules/mob/living/basic/cult/constructs/_construct.dm
+++ b/code/modules/mob/living/basic/cult/constructs/_construct.dm
@@ -35,7 +35,7 @@
 	/// Flavor text shown to players when they spawn as this construct
 	var/playstyle_string = "You are a generic construct. Your job is to not exist, and you should probably adminhelp this."
 	/// The construct's master
-	var/master = null
+	var/mob/construct_master = null
 	/// Whether this construct is currently seeking nar nar
 	var/seeking = FALSE
 	/// Whether this construct can repair other constructs or cult buildings. Gets the healing_touch component if so.
diff --git a/code/modules/mob/living/basic/cult/constructs/harvester.dm b/code/modules/mob/living/basic/cult/constructs/harvester.dm
index 6d41bb43f26a1..b48a26b681937 100644
--- a/code/modules/mob/living/basic/cult/constructs/harvester.dm
+++ b/code/modules/mob/living/basic/cult/constructs/harvester.dm
@@ -80,9 +80,9 @@
 	var/datum/objective/eldergod/summon_objective = locate() in cult_status.cult_team.objectives
 
 	if(summon_objective.check_completion())
-		the_construct.master = cult_status.cult_team.blood_target
+		the_construct.construct_master = cult_status.cult_team.blood_target
 
-	if(!the_construct.master)
+	if(!the_construct.construct_master)
 		to_chat(the_construct, span_cult_italic("You have no master to seek!"))
 		the_construct.seeking = FALSE
 		return
@@ -122,8 +122,8 @@
 		to_chat(the_construct, span_cult_italic("Nar'Sie has completed her harvest!"))
 		return
 
-	the_construct.master = pick(GLOB.cult_narsie.souls_needed)
-	var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
+	the_construct.construct_master = pick(GLOB.cult_narsie.souls_needed)
+	var/mob/living/real_target = the_construct.construct_master //We can typecast this way because Narsie only allows /mob/living into the souls list
 	to_chat(the_construct, span_cult_italic("You are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!"))
 	desc = "Activate to track Nar'Sie!"
 	button_icon_state = "sintouch"
@@ -150,21 +150,26 @@
 	lighting_cutoff_red = 10
 	lighting_cutoff_green = 20
 	lighting_cutoff_blue = 5
-	playstyle_string = "<B>You are a Rusted Harvester, built to serve the Sanguine Apostate, twisted to work the will of the Mansus. You are fragile and weak, but you rend cultists (only) apart on each attack. Follow your Master's orders!<B>"
+	playstyle_string = span_bold("You are a Rusted Harvester, built to serve the Sanguine Apostate, twisted to work the will of the Mansus. You are fragile and weak, but you rend cultists (only) apart on each attack. Follow your Master's orders!")
 	theme = THEME_HERETIC
 
 /mob/living/basic/construct/harvester/heretic/Initialize(mapload)
 	. = ..()
 	ADD_TRAIT(src, TRAIT_MANSUS_TOUCHED, REF(src))
 	add_filter("rusted_harvester", 3, list("type" = "outline", "color" = COLOR_GREEN, "size" = 2, "alpha" = 40))
+	RegisterSignal(src, COMSIG_MIND_TRANSFERRED, TYPE_PROC_REF(/datum/mind, enslave_mind_to_creator))
+	RegisterSignal(src, COMSIG_MOB_ENSLAVED_TO, PROC_REF(link_master))
 
+/mob/living/basic/construct/harvester/heretic/proc/link_master(mob/self, mob/master)
+	src.construct_master = master
+	RegisterSignal(construct_master, COMSIG_LIVING_DEATH, PROC_REF(on_master_death))
+	SIGNAL_HANDLER
 
-/**
- * Somewhat janky proc called when a heretic monster's master dies
- * Used to kill any living Rusted Harvester
- */
-/mob/living/proc/on_master_death()
-	return
+/mob/living/basic/construct/harvester/heretic/proc/on_master_death(mob/self, mob/master)
+	SIGNAL_HANDLER
+	to_chat(src, span_userdanger("Your link to the mansus suddenly snaps as your master [construct_master] perishes! Without [construct_master.p_their()] support, your body crumbles..."))
+	visible_message(span_alert("[src] suddenly crumbles to dust!"))
+	death()
 
 /mob/living/basic/construct/harvester/heretic/attack_animal(mob/living/simple_animal/user, list/modifiers)
 	// They're pretty fragile so this is probably necessary to prevent bullshit deaths.
@@ -172,11 +177,6 @@
 		return
 	return ..()
 
-/mob/living/basic/construct/harvester/heretic/on_master_death()
-	to_chat(src, span_userdanger("Your link to the mansus suddenly snaps as your master perishes! Without its support, your body crumbles..."))
-	visible_message(span_alert("[src] suddenly crumbles to dust!"))
-	death()
-
 /mob/living/basic/construct/harvester/heretic/grant_abilities()
 	AddElement(/datum/element/wall_walker, or_trait = TRAIT_RUSTY)
 	AddElement(/datum/element/leeching_walk)
@@ -233,9 +233,6 @@
 	. = ..()
 	the_construct = Target
 	the_construct.seeking = TRUE
-	var/datum/antagonist/heretic_monster/antag = IS_HERETIC_MONSTER(the_construct)
-	if(antag)
-		the_construct.master = antag.master
 
 // no real reason for most of this weird oldcode
 /datum/action/innate/seek_master/Activate()
diff --git a/code/modules/mob/living/basic/drone/drone_tools.dm b/code/modules/mob/living/basic/drone/drone_tools.dm
index 1fa3aa7884b2a..32ec1bb152848 100644
--- a/code/modules/mob/living/basic/drone/drone_tools.dm
+++ b/code/modules/mob/living/basic/drone/drone_tools.dm
@@ -20,10 +20,11 @@
 		/obj/item/pipe_dispenser,
 		/obj/item/t_scanner,
 		/obj/item/analyzer,
+		/obj/item/soap/drone,
 	)
 	atom_storage.max_total_storage = 40
 	atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
-	atom_storage.max_slots = 9
+	atom_storage.max_slots = 10
 	atom_storage.rustle_sound = FALSE
 	atom_storage.set_holdable(drone_builtins)
 
@@ -39,7 +40,7 @@
 	builtintools += new /obj/item/pipe_dispenser(src)
 	builtintools += new /obj/item/t_scanner(src)
 	builtintools += new /obj/item/analyzer(src)
-
+	builtintools += new /obj/item/soap/drone(src)
 	for(var/obj/item/tool as anything in builtintools)
 		tool.AddComponent(/datum/component/holderloving, src, TRUE)
 
diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
index 7993fe74a3f57..f023215d7dd5c 100644
--- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
+++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
@@ -79,6 +79,10 @@
 	damage_type = BURN
 	pass_flags = PASSTABLE
 
+/obj/projectile/bileworm_acid/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile)
+
 /datum/action/cooldown/mob_cooldown/devour
 	name = "Devour"
 	desc = "Burrow underground, and then move to your target to consume them. Short cooldown, but your target must be unconscious."
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
index ad10e30acecd7..031ec3d45256c 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -28,6 +28,14 @@
 	ai_controller = /datum/ai_controller/basic_controller/lobstrosity
 	/// Charging ability
 	var/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/charge
+	/// The type of charging ability we give this mob
+	var/charge_type = /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster
+	/// The pet command for the charging ability we give this mob
+	var/charge_command = /datum/pet_command/point_targeting/use_ability/lob_charge
+	/// At which speed do we amputate limbs
+	var/snip_speed = 5 SECONDS
+	///Lobstrosities are natural anglers. This rapresent their proficiency at fishing when not mindless
+	var/base_fishing_level = SKILL_LEVEL_APPRENTICE
 	/// Things we will eat if we see them (arms, chiefly)
 	var/static/list/target_foods = list(/obj/item/bodypart/arm, /obj/item/fish/lavaloop)
 
@@ -35,20 +43,17 @@
 	. = ..()
 	var/static/list/food_types = list(/obj/item/fish/lavaloop)
 	ai_controller.set_blackboard_key(BB_BASIC_FOODS, typecacheof(food_types))
-	var/static/list/fishing_preset = list(
-		/turf/open/lava = /datum/fish_source/lavaland,
-		/turf/open/lava/plasma = /datum/fish_source/lavaland/icemoon,
-	)
-	AddComponent(/datum/component/profound_fisher, npc_fishing_preset = fishing_preset)
+	AddComponent(/datum/component/profound_fisher)
 	AddElement(/datum/element/mob_grabber)
 	AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
 	AddElement(/datum/element/basic_eating, food_types = target_foods)
 	AddComponent(\
 		/datum/component/amputating_limbs,\
+		surgery_time = snip_speed, \
 		surgery_verb = "begins snipping",\
 		target_zones = GLOB.arm_zones,\
 	)
-	charge = new(src)
+	charge = new charge_type(src)
 	charge.Grant(src)
 	ai_controller.set_blackboard_key(BB_TARGETED_ACTION, charge)
 
@@ -59,6 +64,35 @@
 /mob/living/basic/mining/lobstrosity/ranged_secondary_attack(atom/atom_target, modifiers)
 	charge.Trigger(target = atom_target)
 
+/mob/living/basic/mining/lobstrosity/tamed(mob/living/tamer, obj/item/food)
+	new /obj/effect/temp_visual/heart(loc)
+	/// Pet commands for this mob, however you'll have to tame juvenile lobstrosities to a trained adult one.
+	var/list/pet_commands = list(
+		/datum/pet_command/idle,
+		/datum/pet_command/free,
+		/datum/pet_command/point_targeting/attack,
+		charge_command,
+		/datum/pet_command/follow,
+		/datum/pet_command/point_targeting/fish,
+	)
+	AddComponent(/datum/component/happiness)
+	AddComponent(/datum/component/obeys_commands, pet_commands)
+	ai_controller.ai_traits = STOP_MOVING_WHEN_PULLED
+	response_help_continuous = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "gently pushes aside"
+	response_disarm_simple = "gently push aside"
+
+/mob/living/basic/mining/lobstrosity/befriend(mob/living/new_friend)
+	. = ..()
+	faction |= new_friend.faction
+	faction -= FACTION_MINING
+
+/mob/living/basic/mining/lobstrosity/mind_initialize()
+	. = ..()
+	if(mind.get_skill_level(/datum/skill/fishing) < base_fishing_level)
+		mind.set_level(/datum/skill/fishing, base_fishing_level, TRUE)
+
 /// Lavaland lobster variant, it basically just looks different
 /mob/living/basic/mining/lobstrosity/lava
 	name = "chasm lobstrosity"
@@ -87,5 +121,145 @@
 	. = ..()
 	if(!isliving(charger))
 		return
-	var/mob/living/living_charger = charger
-	living_charger.apply_status_effect(/datum/status_effect/tired_post_charge)
+	apply_post_charge(charger)
+
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/proc/apply_post_charge(mob/living/charger)
+	charger.apply_status_effect(/datum/status_effect/tired_post_charge)
+
+///A weaker, yet somewhat faster lobstrosity. Sources include aquarium chasm chrabs, chasms, plasma rivers and perhaps xenobio.
+/mob/living/basic/mining/lobstrosity/juvenile
+	name = "juvenile arctic lobstrosity"
+	desc = "A youngling of the behemothic arctic lobstrosity. They usually stay put in the underground lakes they reside in until they're fully grown."
+	icon_state = "arctic_juveline_lobstrosity"
+	icon_living = "arctic_juveline_lobstrosity"
+	icon_dead = "arctic_juveline_lobstrosity_dead"
+	status_flags = parent_type::status_flags | CANPUSH
+	maxHealth = 65
+	health = 65
+	obj_damage = 6
+	melee_damage_lower = 6
+	melee_damage_upper = 9
+	melee_attack_cooldown = 0.9 SECONDS
+	speed = 0.7
+	mob_size = MOB_SIZE_HUMAN
+	butcher_results = list(
+		/obj/item/food/meat/slab/rawcrab = 1,
+		/obj/item/stack/sheet/bone = 1,
+		/obj/item/organ/internal/monster_core/rush_gland = 1,
+	)
+	crusher_loot = null
+	ai_controller = /datum/ai_controller/basic_controller/lobstrosity/juvenile
+	snip_speed = 6.5 SECONDS
+	charge_type = /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/shrimp
+	charge_command = /datum/pet_command/point_targeting/use_ability/lob_charge/shrimp
+	base_fishing_level = SKILL_LEVEL_NOVICE
+	/// What do we become when we grow up?
+	var/mob/living/basic/mining/lobstrosity/grow_type = /mob/living/basic/mining/lobstrosity
+	/// Were we tamed? If yes, tame the mob we become when we grow up too.
+	var/was_tamed = FALSE
+
+/mob/living/basic/mining/lobstrosity/juvenile/Initialize(mapload)
+	. = ..()
+	var/growth_step = 1000/(7 MINUTES) //It should take 7-ish minutes if you keep the happiness above 40% and at most 12
+	AddComponent(\
+		/datum/component/growth_and_differentiation,\
+		growth_path = grow_type,\
+		growth_probability = 58,\
+		lower_growth_value = growth_step,\
+		upper_growth_value = growth_step,\
+		scale_with_happiness = TRUE,\
+		optional_checks = CALLBACK(src, PROC_REF(ready_to_grow)),\
+		optional_grow_behavior = CALLBACK(src, PROC_REF(grow_up))\
+	)
+	AddComponent(/datum/component/tameable, target_foods, tame_chance = 35, bonus_tame_chance = 20)
+	AddComponent(/datum/component/swarming, 16, 11)
+	ADD_TRAIT(src, TRAIT_MOB_HIDE_HAPPINESS, INNATE_TRAIT) //Do not let strangers know it gets happy when poked if stray.
+
+/mob/living/basic/mining/lobstrosity/juvenile/add_ranged_armour(list/vulnerable_projectiles)
+	AddElement(\
+		/datum/element/ranged_armour,\
+		minimum_projectile_force = 30,\
+		below_projectile_multiplier = 0.6,\
+		vulnerable_projectile_types = vulnerable_projectiles,\
+		minimum_thrown_force = 13,\
+		throw_blocked_message = throw_blocked_message,\
+	)
+
+#define MAX_JUVENILES_ALLOWED_ON_TURF 3
+
+///Juvenile lobstrosities can swarm and pass through each other, but only 3 at most can stand the same turf.
+/mob/living/basic/mining/lobstrosity/juvenile/CanAllowThrough(atom/movable/mover, border_dir)
+	if(!istype(mover, /mob/living/basic/mining/lobstrosity/juvenile))
+		return ..()
+	var/juveniles_count = 0
+	for(var/mob/living/basic/mining/lobstrosity/juvenile/lob in loc)
+		juveniles_count++
+		if(juveniles_count > MAX_JUVENILES_ALLOWED_ON_TURF)
+			return ..()
+	return TRUE
+
+#undef MAX_JUVENILES_ALLOWED_ON_TURF
+
+/mob/living/basic/mining/lobstrosity/juvenile/tamed(mob/living/tamer, obj/item/food)
+	. = ..()
+	was_tamed = TRUE
+	// They are more pettable I guess
+	AddElement(/datum/element/pet_bonus, "chitters pleasantly!")
+	REMOVE_TRAIT(src, TRAIT_MOB_HIDE_HAPPINESS, INNATE_TRAIT)
+
+/mob/living/basic/mining/lobstrosity/juvenile/proc/ready_to_grow()
+	return isturf(loc)
+
+/mob/living/basic/mining/lobstrosity/juvenile/proc/grow_up()
+	var/name_to_use = name == initial(name) ? grow_type::name : name
+	var/mob/living/basic/mining/lobstrosity/grown = change_mob_type(grow_type, get_turf(src), name_to_use)
+	if(was_tamed)
+		grown.tamed()
+	for(var/friend in ai_controller?.blackboard?[BB_FRIENDS_LIST])
+		grown.befriend(friend)
+	grown.setBruteLoss(getBruteLoss())
+	grown.setFireLoss(getFireLoss())
+	qdel(src) //We called change_mob_type without 'delete_old_mob = TRUE' since we had to pass down friends and damage
+
+/mob/living/basic/mining/lobstrosity/juvenile/lava
+	name = "juvenile chasm lobstrosity"
+	desc = "A youngling of the behemothic lobstrosity. They usually don't crawl out of the vents they reside in until they're fully grown."
+	icon_state = "juveline_lobstrosity"
+	icon_living = "juveline_lobstrosity"
+	icon_dead = "juveline_lobstrosity_dead"
+	grow_type = /mob/living/basic/mining/lobstrosity/lava
+
+/// Shorter, weaker version of the Lobster Rush
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/shrimp
+	name = "Shrimp Rush"
+	charge_distance = 4
+	knockdown_duration = 1.8 SECONDS
+	charge_delay = 0.2 SECONDS
+	charge_damage = 13
+
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/apply_post_charge(mob/living/charger)
+	charger.apply_status_effect(/datum/status_effect/tired_post_charge/lesser)
+
+///Command the lobster to charge at someone.
+/datum/pet_command/point_targeting/use_ability/lob_charge
+	command_name = "Charge"
+	command_desc = "Command your lobstrosity to charge against someone."
+	radial_icon = 'icons/mob/actions/actions_items.dmi'
+	radial_icon_state = "sniper_zoom"
+	speech_commands = list("charge", "slam", "tackle")
+	command_feedback = "growl"
+	pointed_reaction = "and growls"
+	pet_ability_key = BB_TARGETED_ACTION
+	ability_behavior = /datum/ai_behavior/pet_use_ability/then_attack/long_ranged
+
+/datum/pet_command/point_targeting/use_ability/lob_charge/set_command_target(mob/living/parent, atom/target)
+	if (!target)
+		return
+	var/datum/targeting_strategy/targeter = GET_TARGETING_STRATEGY(parent.ai_controller.blackboard[targeting_strategy_key])
+	if(!targeter?.can_attack(parent, target))
+		parent.balloon_alert_to_viewers("shakes head!")
+		return FALSE
+	return ..()
+
+/datum/pet_command/point_targeting/use_ability/lob_charge/shrimp
+	ability_behavior = /datum/ai_behavior/pet_use_ability/then_attack/short_ranged
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
index fb0ba437bf48c..5ca1ca2cfd5b0 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
@@ -1,9 +1,21 @@
+#define SHRIMP_HARM_RESPONSES list(\
+	"*me stares blankly.",\
+	"*me stares shrimply.",\
+	"*me gives a confused look.",\
+	"*me chitters unpleasantly.",\
+)
+
 /datum/ai_controller/basic_controller/lobstrosity
 	blackboard = list(
 		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
+		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
 		BB_TARGET_MINIMUM_STAT = HARD_CRIT,
 		BB_LOBSTROSITY_EXPLOIT_TRAITS = list(TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT),
-		BB_LOBSTROSITY_FINGER_LUST = 0
+		BB_LOBSTROSITY_FINGER_LUST = 0,
+		BB_LOBSTROSITY_NAIVE_HUNTER = FALSE,
+		BB_BASIC_MOB_FLEE_DISTANCE = 8,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_OWNER_SELF_HARM_RESPONSES = SHRIMP_HARM_RESPONSES,
 	)
 	ai_traits = PAUSE_DURING_DO_AFTER
 
@@ -12,7 +24,8 @@
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/random_speech/insect,
 		/datum/ai_planning_subtree/hoard_fingers,
-		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/pet_planning,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
 		/datum/ai_planning_subtree/targeted_mob_ability/lobster,
 		/datum/ai_planning_subtree/flee_target/lobster,
 		/datum/ai_planning_subtree/attack_obstacle_in_path,
@@ -21,24 +34,85 @@
 		/datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
 		/datum/ai_planning_subtree/find_fingers,
 	)
+///Ensure that juveline lobstrosities witll charge at things they can reach.
+/datum/ai_controller/basic_controller/lobstrosity/juvenile
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
+		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_MINIMUM_STAT = SOFT_CRIT,
+		BB_LOBSTROSITY_EXPLOIT_TRAITS = list(TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT),
+		BB_LOBSTROSITY_FINGER_LUST = 0,
+		BB_LOBSTROSITY_NAIVE_HUNTER = TRUE,
+		BB_BASIC_MOB_FLEE_DISTANCE = 4,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_OWNER_SELF_HARM_RESPONSES = SHRIMP_HARM_RESPONSES,
+	)
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/random_speech/insect,
+		/datum/ai_planning_subtree/hoard_fingers,
+		/datum/ai_planning_subtree/pet_planning,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
+		/datum/ai_planning_subtree/targeted_mob_ability/lobster,
+		/datum/ai_planning_subtree/flee_target/lobster,
+		/datum/ai_planning_subtree/attack_obstacle_in_path,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+		/datum/ai_planning_subtree/find_food,
+		/datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+		/datum/ai_planning_subtree/find_fingers,
+	)
+
+///A subtype of juvenile lobster AI that has the target_retaliate behaviour instead of simple_find_target
+/datum/ai_controller/basic_controller/lobstrosity/juvenile/calm
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/random_speech/insect,
+		/datum/ai_planning_subtree/hoard_fingers,
+		/datum/ai_planning_subtree/pet_planning,
+		/datum/ai_planning_subtree/target_retaliate,
+		/datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile,
+		/datum/ai_planning_subtree/flee_target/lobster,
+		/datum/ai_planning_subtree/attack_obstacle_in_path,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+		/datum/ai_planning_subtree/find_food,
+		/datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+		/datum/ai_planning_subtree/find_fingers,
+	)
+
+///A subtype of juvenile lobster AI that has the capricious_retaliate behaviour instead of simple_find_target
+/datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/random_speech/insect,
+		/datum/ai_planning_subtree/hoard_fingers,
+		/datum/ai_planning_subtree/pet_planning,
+		/datum/ai_planning_subtree/capricious_retaliate,
+		/datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile,
+		/datum/ai_planning_subtree/flee_target/lobster,
+		/datum/ai_planning_subtree/attack_obstacle_in_path,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+		/datum/ai_planning_subtree/find_food,
+		/datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+		/datum/ai_planning_subtree/find_fingers,
+	)
 
 /datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing
 	target_key = BB_FISHING_TARGET
 	hunt_targets = list(/turf/open/lava)
-	hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target
+	hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target_combat_mode
 
 /datum/ai_planning_subtree/basic_melee_attack_subtree/lobster
 	melee_attack_behavior = /datum/ai_behavior/basic_melee_attack/lobster
 
 /datum/ai_planning_subtree/basic_melee_attack_subtree/lobster/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
-	if(!isliving(controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]))
+	var/atom/movable/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+	if(!isliving(target))
 		return ..()
 	if (!controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
 		return
 	if (!isnull(controller.blackboard[BB_LOBSTROSITY_TARGET_LIMB]))
 		return
+	if(controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+		return //juvenile lobstrosities fear me.
 	var/mob/living/living_pawn = controller.pawn
-	if (DOING_INTERACTION_WITH_TARGET(living_pawn, controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]))
+	if (DOING_INTERACTION_WITH_TARGET(living_pawn, target))
 		return
 	return ..()
 
@@ -49,11 +123,19 @@
 	if (isnull(target) || !istype(target))
 		return ..()
 	var/is_vulnerable = FALSE
-	for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
-		if (!HAS_TRAIT(target, trait))
-			continue
-		is_vulnerable = TRUE
-		break
+	if(controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER])
+		if(HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+			//Trigger lobstrosity PTSD. Don't clear the target so we can run away.
+			controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, FALSE)
+			return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_SUCCEEDED
+		if(target.body_position == LYING_DOWN)
+			is_vulnerable = TRUE
+	if(!is_vulnerable)
+		for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
+			if (!HAS_TRAIT(target, trait))
+				continue
+			is_vulnerable = TRUE
+			break
 	if (!is_vulnerable)
 		controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, FALSE)
 	if (!controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
@@ -65,9 +147,12 @@
 	flee_behaviour = /datum/ai_behavior/run_away_from_target/lobster
 
 /datum/ai_planning_subtree/flee_target/lobster/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	var/atom/movable/target = controller.blackboard[target_key]
+	if(!QDELETED(target) && controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+		return ..()
 	var/datum/action/cooldown/using_action = controller.blackboard[BB_TARGETED_ACTION]
 	if (using_action?.IsAvailable())
-		return
+		return FALSE
 	return ..()
 
 /datum/ai_behavior/run_away_from_target/lobster
@@ -75,14 +160,23 @@
 
 /datum/ai_behavior/run_away_from_target/lobster/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hiding_location_key)
 	var/atom/target = controller.blackboard[target_key]
-	if(isnull(target))
+	if(QDELETED(target))
 		return ..()
 
-	for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
-		if (!HAS_TRAIT(target, trait))
-			continue
-		controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, TRUE)
-		return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED
+	var/is_naive = controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER]
+	var/is_scary = HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN)
+
+	if(!is_naive || !is_scary) //the lobstrosity isn't naive/young and the target isn't a scary fisherman.
+		if(isliving(target))
+			var/mob/living/living_target = target
+			if(is_naive && living_target.body_position == LYING_DOWN)
+				controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, TRUE)
+				return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED
+		for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
+			if (!HAS_TRAIT(target, trait))
+				continue
+			controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, TRUE)
+			return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED
 
 	var/mob/living/us = controller.pawn
 	if (us.pulling == target)
@@ -97,9 +191,15 @@
 /datum/ai_planning_subtree/targeted_mob_ability/lobster/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	var/atom/target = controller.blackboard[target_key]
 	if(QDELETED(target) || in_range(controller.pawn, target))
-		return FALSE
+		return
+	if(controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+		return
 	return ..()
 
+
+/datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile
+	use_ability_behaviour = /datum/ai_behavior/targeted_mob_ability/min_range/short
+
 /// Look for loose arms lying around
 /datum/ai_planning_subtree/find_fingers
 	/// Where do we store target limb data?
@@ -226,3 +326,4 @@
 
 #undef FLEE_TO_RANGE
 #undef MAX_LOBSTROSITY_PATIENCE
+#undef SHRIMP_HARM_RESPONSES
diff --git a/code/modules/mob/living/basic/lavaland/mining.dm b/code/modules/mob/living/basic/lavaland/mining.dm
index 38591dfb39c06..37b7dd118f4d9 100644
--- a/code/modules/mob/living/basic/lavaland/mining.dm
+++ b/code/modules/mob/living/basic/lavaland/mining.dm
@@ -27,14 +27,7 @@
 	var/static/list/vulnerable_projectiles
 	if(!vulnerable_projectiles)
 		vulnerable_projectiles = string_list(MINING_MOB_PROJECTILE_VULNERABILITY)
-	AddElement(\
-		/datum/element/ranged_armour,\
-		minimum_projectile_force = 30,\
-		below_projectile_multiplier = 0.3,\
-		vulnerable_projectile_types = vulnerable_projectiles,\
-		minimum_thrown_force = 20,\
-		throw_blocked_message = throw_blocked_message,\
-	)
+	add_ranged_armour(vulnerable_projectiles)
 	if(crusher_loot)
 		AddElement(\
 			/datum/element/crusher_loot,\
@@ -43,6 +36,19 @@
 			drop_immediately = basic_mob_flags & DEL_ON_DEATH,\
 		)
 	RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(check_ashwalker_peace_violation))
+	// We add this to ensure that mobs will actually receive the above signal, as some will lack AI
+	// handling for retaliation and attack special cases
+	AddElement(/datum/element/relay_attackers)
+
+/mob/living/basic/mining/proc/add_ranged_armour(list/vulnerable_projectiles)
+	AddElement(\
+		/datum/element/ranged_armour,\
+		minimum_projectile_force = 30,\
+		below_projectile_multiplier = 0.3,\
+		vulnerable_projectile_types = vulnerable_projectiles,\
+		minimum_thrown_force = 20,\
+		throw_blocked_message = throw_blocked_message,\
+	)
 
 /mob/living/basic/mining/proc/check_ashwalker_peace_violation(datum/source, mob/living/carbon/human/possible_ashwalker)
 	SIGNAL_HANDLER
diff --git a/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm b/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm
index b149c6d09728b..87687c5699963 100644
--- a/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm
+++ b/code/modules/mob/living/basic/lavaland/node_drone/node_drone.dm
@@ -74,6 +74,31 @@
 	if(flying_state == FLY_IN_STATE || flying_state == FLY_OUT_STATE)
 		icon_state = "mining_node_flying"
 
+/mob/living/basic/node_drone/update_overlays()
+	. = ..()
+	if(attached_vent)
+		var/time_remaining = COOLDOWN_TIMELEFT(attached_vent, wave_cooldown)
+		var/wave_timers
+		switch(attached_vent?.boulder_size)
+			if(BOULDER_SIZE_SMALL)
+				wave_timers = WAVE_DURATION_SMALL
+			if(BOULDER_SIZE_MEDIUM)
+				wave_timers = WAVE_DURATION_MEDIUM
+			if(BOULDER_SIZE_LARGE)
+				wave_timers = WAVE_DURATION_LARGE
+		var/remaining_fraction = (time_remaining / wave_timers)
+		if(remaining_fraction <= 0.3)
+			. += "node_progress_4"
+			return
+		if(remaining_fraction <= 0.55)
+			. += "node_progress_3"
+			return
+		if(remaining_fraction <= 0.80)
+			. += "node_progress_2"
+			return
+		. += "node_progress_1"
+		return
+
 /mob/living/basic/node_drone/proc/arrive(obj/structure/ore_vent/parent_vent)
 	attached_vent = parent_vent
 	maxHealth = 300 + ((attached_vent.boulder_size/BOULDER_SIZE_SMALL) * 100)
diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_projectiles.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_projectiles.dm
index 19e718d9fee59..cf7fa3a7e699f 100644
--- a/code/modules/mob/living/basic/lavaland/watcher/watcher_projectiles.dm
+++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_projectiles.dm
@@ -7,6 +7,10 @@
 	armor_flag = ENERGY
 	temperature = -50
 
+/obj/projectile/temp/watcher/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile)
+
 /obj/projectile/temp/watcher/on_hit(mob/living/target, blocked = 0, pierce_hit)
 	. = ..()
 	if (!isliving(target))
diff --git a/code/modules/mob/living/basic/minebots/minebot_ai.dm b/code/modules/mob/living/basic/minebots/minebot_ai.dm
index 62aeaf3aa7923..31fed0ec1f32c 100644
--- a/code/modules/mob/living/basic/minebots/minebot_ai.dm
+++ b/code/modules/mob/living/basic/minebots/minebot_ai.dm
@@ -284,6 +284,10 @@
 	radial_icon = 'icons/obj/mining.dmi'
 	radial_icon_state = "pickaxe"
 	speech_commands = list("mine")
+	callout_type = /datum/callout_option/mine
+
+/datum/pet_command/automate_mining/valid_callout_target(mob/living/caller, datum/callout_option/callout, atom/target)
+	return ismineralturf(target)
 
 /datum/pet_command/automate_mining/execute_action(datum/ai_controller/controller)
 	controller.set_blackboard_key(BB_AUTOMATED_MINING, TRUE)
diff --git a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
index d05622c35dc47..9ac8e10d8f4f9 100644
--- a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
+++ b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
@@ -45,6 +45,40 @@
 	gold_core_spawnable = NO_SPAWN
 	unique_pet = TRUE
 
+/mob/living/basic/pet/dog/bullterrier/guarddog //hostile dog variant for space ruins
+	name = "\improper guard dog"
+	real_name = "guard dog"
+	desc = "A vicious bull terrier. They look aggressive and territorial."
+	collar_icon_state = "spiked"
+	//slightly weaker than a bear, but not as slow
+	health = 60
+	maxHealth = 60
+	obj_damage = 20
+	melee_damage_lower = 10
+	melee_damage_upper = 15
+	wound_bonus = -25
+	bare_wound_bonus = 45
+	sharpness = SHARP_EDGED
+	gold_core_spawnable = HOSTILE_SPAWN
+	faction = list(FACTION_HOSTILE)
+	ai_controller = /datum/ai_controller/basic_controller/guarddog
+
+/datum/ai_controller/basic_controller/guarddog
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_AGGRO_RANGE = 7,
+		BB_TARGET_MINIMUM_STAT = HARD_CRIT,
+	)
+
+	ai_movement = /datum/ai_movement/basic_avoidance
+	idle_behavior = /datum/idle_behavior/idle_random_walk
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/target_retaliate,
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+	)
+
 /mob/living/basic/pet/dog/breaddog //Most of the code originates from Cak
 	name = "Kobun"
 	real_name = "Kobun"
diff --git a/code/modules/mob/living/basic/pets/orbie/orbie.dm b/code/modules/mob/living/basic/pets/orbie/orbie.dm
index 735f63977d362..c0c6dd7b023fc 100644
--- a/code/modules/mob/living/basic/pets/orbie/orbie.dm
+++ b/code/modules/mob/living/basic/pets/orbie/orbie.dm
@@ -50,6 +50,7 @@
 	var/static/list/food_types = list(/obj/item/food/virtual_chocolate)
 	AddComponent(/datum/component/obeys_commands, pet_commands)
 	AddElement(/datum/element/basic_eating, food_types = food_types)
+	ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
 	RegisterSignal(src, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(on_pulled))
 	RegisterSignal(src, COMSIG_VIRTUAL_PET_LEVEL_UP, PROC_REF(on_level_up))
 	RegisterSignal(src, COMSIG_MOB_CLICKON, PROC_REF(on_click))
diff --git a/code/modules/mob/living/basic/ruin_defender/cybersun_aicore.dm b/code/modules/mob/living/basic/ruin_defender/cybersun_aicore.dm
new file mode 100644
index 0000000000000..e9b62f9deaf2e
--- /dev/null
+++ b/code/modules/mob/living/basic/ruin_defender/cybersun_aicore.dm
@@ -0,0 +1,205 @@
+/// Boss for the hauntedtradingpost space ruin
+/// It's a stationary AI core that casts spells
+#define LIGHTNING_ABILITY_TYPEPATH /datum/action/cooldown/spell/pointed/lightning_strike
+#define BARRAGE_ABILITY_TYPEPATH /datum/action/cooldown/spell/pointed/projectile/cybersun_barrage
+
+/mob/living/basic/cybersun_ai_core
+	name = "\improper Cybersun AI Core"
+	desc = "An evil looking computer."
+	icon = 'icons/mob/silicon/ai.dmi'
+	icon_state = "ai-red"
+	icon_living = "ai-red"
+	gender = NEUTER
+	basic_mob_flags = MOB_ROBOTIC
+	mob_size = MOB_SIZE_HUGE
+	basic_mob_flags = DEL_ON_DEATH
+	health = 250
+	maxHealth = 250
+	faction = list(ROLE_SYNDICATE)
+	ai_controller = /datum/ai_controller/basic_controller/cybersun_ai_core
+	unsuitable_atmos_damage = 0
+	combat_mode = TRUE
+	move_resist = INFINITY
+	damage_coeff = list(BRUTE = 1.5, BURN = 1, TOX = 0, STAMINA = 0, OXY = 0)
+	light_system = OVERLAY_LIGHT
+	light_range = 2
+	light_power = 0.6
+	light_color = "#eb1809"
+	/// Ability which fires da lightning bolt
+	var/datum/action/cooldown/mob_cooldown/lightning_strike
+	/// Ability which fires da big laser
+	var/datum/action/cooldown/mob_cooldown/targeted_mob_ability/donk_laser
+	//is this being used as part of the haunted trading post ruin? if true, stuff there will self destruct when this mob dies
+	var/donk_ai_master = FALSE
+// list of stuff tagged to self destruct when this mob dies
+GLOBAL_LIST_EMPTY(selfdestructs_when_boss_dies)
+
+/mob/living/basic/cybersun_ai_core/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_IMMOBILIZED, INNATE_TRAIT)
+	var/static/list/death_loot = list(/obj/effect/temp_visual/cybersun_ai_core_death)
+	AddElement(/datum/element/death_drops, death_loot)
+	AddElement(/datum/element/relay_attackers)
+	var/static/list/innate_actions = list(
+		LIGHTNING_ABILITY_TYPEPATH = BB_CYBERSUN_CORE_LIGHTNING,
+		BARRAGE_ABILITY_TYPEPATH = BB_CYBERSUN_CORE_BARRAGE,
+	)
+	grant_actions_by_list(innate_actions)
+
+/mob/living/basic/cybersun_ai_core/death(gibbed)
+	if(donk_ai_master == TRUE)
+		//disable all the tripwire traps
+		for (var/obj/item/pressure_plate/puzzle/invisible_tripwire as anything in GLOB.selfdestructs_when_boss_dies)
+			qdel(invisible_tripwire)
+		//and the electric overload traps
+		for (var/obj/effect/overloader_trap as anything in GLOB.selfdestructs_when_boss_dies)
+			qdel(overloader_trap)
+		//then disable the AI defence holograms
+		for (var/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield as anything in GLOB.selfdestructs_when_boss_dies)
+			qdel(cybersun_ai_shield)
+		//then the power generator
+		for (var/obj/machinery/power/smes/magical/cybersun as anything in GLOB.selfdestructs_when_boss_dies)
+			qdel(cybersun)
+	do_sparks(number = 5, source = src)
+	return ..()
+
+/obj/effect/temp_visual/cybersun_ai_core_death
+	icon = 'icons/mob/silicon/ai.dmi'
+	icon_state = "ai-red_dead"
+	duration = 2 SECONDS
+
+/obj/effect/temp_visual/cybersun_ai_core_death/Initialize(mapload)
+	. = ..()
+	playsound(src, 'sound/misc/metal_creak.ogg', vol = 100, vary = TRUE, pressure_affected = FALSE)
+	Shake(1, 0, 2 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(gib)), duration - 1, TIMER_DELETE_ME)
+
+/obj/effect/temp_visual/cybersun_ai_core_death/proc/gib()
+///dramatic death animations
+	var/turf/my_turf = get_turf(src)
+	new /obj/effect/gibspawner/robot(my_turf)
+	playsound(loc, 'sound/effects/explosion2.ogg', vol = 75, vary = TRUE, pressure_affected = FALSE)
+	for (var/mob/witness in range(10, src))
+		if (!witness.client || !isliving(witness))
+			continue
+		shake_camera(witness, duration = 1.5 SECONDS - (0.7 * get_dist(src, witness)), strength = 1)
+
+/// how the ai core thinks
+/datum/ai_controller/basic_controller/cybersun_ai_core
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+		BB_TARGETLESS_TIME = 0,
+	)
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/targeted_mob_ability/lightning_strike,
+		/datum/ai_planning_subtree/targeted_mob_ability/cybersun_barrage,
+	)
+
+/// DA SPELLS!
+// spell #1: lightning strike
+/datum/ai_planning_subtree/targeted_mob_ability/lightning_strike
+	ability_key = BB_CYBERSUN_CORE_LIGHTNING
+	finish_planning = FALSE
+
+/datum/action/cooldown/spell/pointed/lightning_strike
+	name = "lightning strike"
+	desc = "Electrocutes a target with a big lightning bolt. Has a small delay."
+	button_icon = 'icons/mob/actions/actions_spells.dmi'
+	button_icon_state = "lightning"
+	cooldown_time = 4 SECONDS
+	click_to_activate = TRUE
+	shared_cooldown = NONE
+	sparks_amt = 1
+	spell_requirements = null
+	aim_assist = FALSE
+	//how long after casting until the lightning strikes and damage is dealt
+	var/lightning_delay = 1 SECONDS
+
+/datum/action/cooldown/spell/pointed/lightning_strike/cast(atom/target)
+	. = ..()
+	//this is where the spell will hit. it will not move even if the target does, allowing the spell to be dodged.
+	new/obj/effect/temp_visual/lightning_strike(get_turf(target))
+	playsound(owner, 'sound/effects/sparks1.ogg', vol = 120, vary = TRUE)
+
+/obj/effect/temp_visual/lightning_strike
+	name = "lightning strike"
+	desc = "A lightning bolt is about to hit this location. There's a handy hologram to warn people so they don't stand here."
+	icon = 'icons/mob/telegraphing/telegraph_holographic.dmi'
+	icon_state = "target_circle"
+	duration = 1 SECONDS
+	//  amount of damage a guy takes if they're on this tile
+	var/zap_damage = 26
+	/// don't hurt these guys capiche?
+	var/list/damage_blacklist_typecache = list(
+		/mob/living/basic/cybersun_ai_core,
+		/mob/living/basic/viscerator,
+		)
+
+/obj/effect/temp_visual/lightning_strike/Initialize(mapload)
+	. = ..()
+	damage_blacklist_typecache = typecacheof(damage_blacklist_typecache)
+	addtimer(CALLBACK(src, PROC_REF(zap)), duration, TIMER_DELETE_ME)
+
+/obj/effect/temp_visual/lightning_strike/proc/zap()
+	new/obj/effect/temp_visual/lightning_strike_zap(loc)
+	playsound(src, 'sound/magic/lightningbolt.ogg', vol = 70, vary = TRUE)
+	if (!isturf(loc))
+		return
+	for(var/mob/living/victim in loc)
+		if (is_type_in_typecache(victim, damage_blacklist_typecache))
+			continue
+		to_chat(victim, span_warning("You are struck by a large bolt of electricity!"))
+		victim.electrocute_act(zap_damage, src, flags = SHOCK_NOGLOVES | SHOCK_NOSTUN)
+
+/obj/effect/temp_visual/lightning_strike_zap
+	name = "lightning bolt"
+	desc = "Lightning bolt! Lightning bolt! Lightning bolt! Lightning bolt! Lightning bolt! Lightning bolt! Lightning bolt! Lightning bolt!"
+	icon = 'icons/effects/32x96.dmi'
+	icon_state = "thunderbolt"
+	duration = 0.4 SECONDS
+
+/obj/effect/temp_visual/lightning_strike_zap/Initialize(mapload)
+	. = ..()
+	do_sparks(number = rand(1,3), source = src)
+
+// spell #2: cybersun laser barrage
+/datum/ai_planning_subtree/targeted_mob_ability/cybersun_barrage
+	ability_key = BB_CYBERSUN_CORE_BARRAGE
+	finish_planning = FALSE
+
+/datum/action/cooldown/spell/pointed/projectile/cybersun_barrage
+	name = "plasma beam barrage"
+	desc = "Charges up a cluster of lasers, then sends it towards a foe after a short delay."
+	button_icon = 'icons/obj/weapons/transforming_energy.dmi'
+	button_icon_state = "e_sword_on_red"
+	cooldown_time = 5.5 SECONDS
+	click_to_activate = TRUE
+	shared_cooldown = NONE
+	spell_requirements = null
+	projectile_type = /obj/projectile/beam/laser/cybersun/weaker
+	cast_range = 6
+	projectiles_per_fire = 3
+	var/barrage_delay = 0.8 SECONDS
+	var/turf/lockon_zone
+
+/datum/action/cooldown/spell/pointed/projectile/cybersun_barrage/cast(atom/target, atom/cast_on)
+	var/turf/my_turf = get_turf(owner)
+	lockon_zone = get_turf(target)
+	if(lockon_zone == my_turf)
+		return
+	my_turf.Beam(lockon_zone, icon_state = "1-full", beam_color = COLOR_MEDIUM_DARK_RED, time = barrage_delay)
+	playsound(lockon_zone, 'sound/machines/terminal_prompt_deny.ogg', vol = 60, vary = TRUE)
+	StartCooldown(cooldown_time)
+	return ..()
+
+/datum/action/cooldown/spell/pointed/projectile/cybersun_barrage/fire_projectile(atom/target)
+	target = lockon_zone
+	if(do_after(owner, barrage_delay))
+		return ..()
+
+/obj/projectile/beam/laser/cybersun/weaker
+	damage = 11
+
+#undef LIGHTNING_ABILITY_TYPEPATH
+#undef BARRAGE_ABILITY_TYPEPATH
diff --git a/code/modules/mob/living/basic/ruin_defender/mad_piano.dm b/code/modules/mob/living/basic/ruin_defender/mad_piano.dm
new file mode 100644
index 0000000000000..d5563564f0e29
--- /dev/null
+++ b/code/modules/mob/living/basic/ruin_defender/mad_piano.dm
@@ -0,0 +1,102 @@
+//the mad piano
+//looks like a regular piano, then if you get close it wakes up and bites you
+
+/mob/living/basic/mad_piano
+	name = "space piano"
+	desc = "This is a space piano, like a regular piano, but always in tune! Even if the musician isn't."
+	icon = 'icons/mob/simple/mad_piano.dmi'
+	icon_state = "calm"
+	mob_size = MOB_SIZE_HUGE
+	move_resist = INFINITY
+	combat_mode = TRUE
+	faction = list(FACTION_HOSTILE, FACTION_TURRET)
+	maxHealth = 120
+	health = 120
+	melee_damage_lower = 24
+	melee_damage_upper = 26
+	melee_attack_cooldown = 1 SECONDS
+	speed = 2
+	gender = NEUTER
+	basic_mob_flags = DEL_ON_DEATH
+	attack_sound = 'sound/effects/piano_hit.ogg'
+	attack_vis_effect = ATTACK_EFFECT_BITE
+	attack_verb_continuous = "bites"
+	attack_verb_simple = "bite"
+	ai_controller = /datum/ai_controller/basic_controller/mad_piano
+	//alternate variables used when aggro
+	var/name_aggro = "mad piano"
+	var/icon_aggro = "aggressive"
+	var/desc_aggro = "This instrument is aggressive! Better stay away from its big chomping teeth!"
+	//and when calm
+	var/name_calm
+	var/icon_calm
+	var/desc_calm
+	COOLDOWN_DECLARE(tantrum_time)
+	//length of aggro state
+	var/tantrum_time_duration = 3.5 SECONDS
+
+/mob/living/basic/mad_piano/Initialize(mapload)
+	. = ..()
+	var/static/list/death_loot = list(/obj/effect/gibspawner/robot)
+	AddElement(/datum/element/death_drops, death_loot)
+	var/static/list/connections = list(COMSIG_ATOM_ENTERED = PROC_REF(aggro_tantrum))
+	AddComponent(/datum/component/connect_range, tracked = src, connections = connections, range = 1, works_in_containers = FALSE)
+	AddElementTrait(TRAIT_WADDLING, INNATE_TRAIT, /datum/element/waddling)
+	ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_GENERIC)
+	ADD_TRAIT(src, TRAIT_PACIFISM, TRAIT_GENERIC)
+	name_calm = name
+	icon_calm = icon_state
+	desc_calm = desc
+
+/mob/living/basic/mad_piano/process(seconds_per_tick)
+
+	if (COOLDOWN_FINISHED(src, tantrum_time))
+		calm_down()
+
+/mob/living/basic/mad_piano/proc/aggro_tantrum(datum/source, mob/living/victim)
+	SIGNAL_HANDLER
+	if(!istype(victim, /mob/living/carbon) || victim.stat == DEAD)
+		return
+	tantrum_time = tantrum_time_duration
+	name = name_aggro
+	icon_state = icon_aggro
+	desc = desc_aggro
+	REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_GENERIC)
+	REMOVE_TRAIT(src, TRAIT_PACIFISM, TRAIT_GENERIC)
+	COOLDOWN_START(src, tantrum_time, tantrum_time_duration)
+	START_PROCESSING(SSprocessing, src)
+
+/mob/living/basic/mad_piano/proc/calm_down(datum/source)
+	if(!COOLDOWN_FINISHED(src, tantrum_time))
+		return
+	icon_state = icon_calm
+	desc = desc_calm
+	name = name_calm
+	ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_GENERIC)
+	ADD_TRAIT(src, TRAIT_PACIFISM, TRAIT_GENERIC)
+	STOP_PROCESSING(SSprocessing, src)
+
+/mob/living/basic/mad_piano/med_hud_set_health() //sneaky sneaky sneaky
+	return
+
+/mob/living/basic/mad_piano/med_hud_set_status()
+	return
+
+/mob/living/basic/mad_piano/Destroy()
+	STOP_PROCESSING(SSprocessing, src)
+	return ..()
+
+/datum/ai_controller/basic_controller/mad_piano
+	idle_behavior = /datum/idle_behavior/idle_random_walk/mad_piano
+	max_target_distance = 2
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+		BB_TARGET_MINIMUM_STAT = HARD_CRIT,
+	)
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+	)
+
+/datum/idle_behavior/idle_random_walk/mad_piano
+	walk_chance = 80
diff --git a/code/modules/mob/living/basic/slime/emote.dm b/code/modules/mob/living/basic/slime/emote.dm
index 93b889a07a4f4..617d33b9809c0 100644
--- a/code/modules/mob/living/basic/slime/emote.dm
+++ b/code/modules/mob/living/basic/slime/emote.dm
@@ -29,8 +29,6 @@
 
 /datum/emote/slime/mood/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/mob/living/basic/slime/slime_user = user
 	slime_user.current_mood = mood_key
 	slime_user.regenerate_icons()
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm
index 71017bd2207a2..810c45603862b 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_actions.dm
@@ -55,6 +55,12 @@
 /// This subtype only exists because if you queue multiple of the same action with different arguments it deletes their stored arguments
 /datum/ai_behavior/find_potential_targets/nearest/magicarp
 
+/datum/ai_behavior/find_potential_targets/nearest/magicarp/pick_final_target(datum/ai_controller/controller, list/enemies_list)
+	for(var/atom/atom as anything in enemies_list)
+		if(HAS_TRAIT(atom, TRAIT_SCARY_FISHERMAN))
+			enemies_list -= atom
+	return ..()
+
 /// Then use it on that target
 /datum/ai_planning_subtree/targeted_mob_ability/magicarp
 	ability_key = BB_MAGICARP_SPELL
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
index 84b96ae3ce405..f104d3566b347 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
@@ -31,6 +31,9 @@
 	finish_planning = TRUE
 
 /datum/ai_planning_subtree/make_carp_rift/panic_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	var/atom/movable/fleeing_from = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+	if(!QDELETED(fleeing_from) && controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(fleeing_from, TRAIT_SCARY_FISHERMAN))
+		return ..()
 	if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
 		return
 	return ..()
@@ -42,6 +45,12 @@
 /datum/ai_planning_subtree/make_carp_rift/aggressive_teleport
 	rift_behaviour = /datum/ai_behavior/make_carp_rift/towards/aggressive
 
+/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+	var/atom/movable/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+	if(!QDELETED(target) && controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
+		return
+	return ..()
+
 /**
  * # Make carp rift
  * Make a carp rift somewhere
@@ -174,7 +183,7 @@
 
 /datum/ai_planning_subtree/shortcut_to_target_through_carp_rift/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	var/mob/living/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
-	if (QDELETED(target))
+	if (QDELETED(target) || (controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN)))
 		return
 
 	var/distance_to_target = get_dist(controller.pawn, target)
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
index 0befb20987c01..4491ef1149137 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
@@ -12,24 +12,48 @@
 		BB_BASIC_MOB_STOP_FLEEING = TRUE,
 		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
 		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_CARPS_FEAR_FISHERMAN = TRUE,
 	)
 
 	ai_movement = /datum/ai_movement/basic_avoidance
 	idle_behavior = /datum/idle_behavior/idle_random_walk
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/pet_planning,
+		/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
+		/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
+		/datum/ai_planning_subtree/find_food,
+		/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
+		/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
+		/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
+		/datum/ai_planning_subtree/carp_migration,
+	)
+
+///Megacarps. The only difference is that they don't flee from scary fishermen and prioritize them.
+/datum/ai_controller/basic_controller/carp/mega
+	blackboard = list(
+		BB_BASIC_MOB_STOP_FLEEING = TRUE,
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
+		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_CARPS_FEAR_FISHERMAN = FALSE,
+	)
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/pet_planning,
 		/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
 		/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
 		/datum/ai_planning_subtree/flee_target,
 		/datum/ai_planning_subtree/find_food,
-		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
 		/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
 		/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
 		/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
 		/datum/ai_planning_subtree/basic_melee_attack_subtree,
 		/datum/ai_planning_subtree/carp_migration,
 	)
-
 /**
  * Carp which bites back, but doesn't look for targets.
  * 'Not hunting targets' includes food (and can rings), because they have been well trained.
@@ -39,18 +63,20 @@
 		BB_BASIC_MOB_STOP_FLEEING = TRUE,
 		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
 		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_CARPS_FEAR_FISHERMAN = TRUE,
 	)
 	ai_traits = STOP_MOVING_WHEN_PULLED
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/pet_planning,
 		/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
 		/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
-		/datum/ai_planning_subtree/flee_target,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
 		/datum/ai_planning_subtree/target_retaliate,
 		/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
 		/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
 		/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
 	)
 
 /**
@@ -61,12 +87,12 @@
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/pet_planning,
 		/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
 		/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
-		/datum/ai_planning_subtree/flee_target,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
 		/datum/ai_planning_subtree/find_food,
 		/datum/ai_planning_subtree/find_nearest_magicarp_spell_target,
 		/datum/ai_planning_subtree/targeted_mob_ability/magicarp,
-		/datum/ai_planning_subtree/simple_find_target,
 		/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
 		/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
 		/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
@@ -83,17 +109,19 @@
 		BB_BASIC_MOB_STOP_FLEEING = TRUE,
 		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
 		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
+		BB_CARPS_FEAR_FISHERMAN = TRUE,
 	)
 	ai_traits = STOP_MOVING_WHEN_PULLED
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/pet_planning,
 		/datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
 		/datum/ai_planning_subtree/make_carp_rift/panic_teleport,
-		/datum/ai_planning_subtree/flee_target,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
 		/datum/ai_planning_subtree/find_food,
 		/datum/ai_planning_subtree/attack_obstacle_in_path/carp,
 		/datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
 		/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
 		/datum/ai_planning_subtree/carp_migration,
 	)
diff --git a/code/modules/mob/living/basic/space_fauna/carp/megacarp.dm b/code/modules/mob/living/basic/space_fauna/carp/megacarp.dm
index deadeaaa540a6..d82120a37e034 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/megacarp.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/megacarp.dm
@@ -24,6 +24,7 @@
 	ridable_data = /datum/component/riding/creature/megacarp
 	greyscale_config = /datum/greyscale_config/carp_mega
 	butcher_results = list(/obj/item/food/fishmeat/carp = 2, /obj/item/stack/sheet/animalhide/carp = 3)
+	ai_controller = /datum/ai_controller/basic_controller/carp/mega
 
 /mob/living/basic/carp/mega/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/mob/living/basic/space_fauna/snake/banded_snake.dm b/code/modules/mob/living/basic/space_fauna/snake/banded_snake.dm
new file mode 100644
index 0000000000000..e73de4104e9a5
--- /dev/null
+++ b/code/modules/mob/living/basic/space_fauna/snake/banded_snake.dm
@@ -0,0 +1,65 @@
+/mob/living/basic/snake/banded
+	name = "banded snake"
+	desc = "A colourful stripy snake. It's either a harmless astroid kingsnake or a highly venomous and aggressive nebula viper. There's a mneumonic to tell them apart, you just need to look at the colours and examine them closely..."
+	icon_state = "bandedsnake"
+	icon_living = "bandedsnake"
+	icon_dead = "bandedsnake_dead"
+	venom_dose = 2
+	var/poison_reagent = /datum/reagent/toxin/cyanide
+	health = 30
+	maxHealth = 30
+	melee_damage_upper = 10
+	gold_core_spawnable = HOSTILE_SPAWN
+
+	ai_controller = /datum/ai_controller/basic_controller/snake/banded
+	var/list/rhymes_dangerous = list(
+		"Yellow on red, it'll kill you dead.",
+		"Black on yellow, nasty little fellow.",
+		"Yellow on black, stay the hell back.",
+		"Yellow on black, it's bound to attack.",
+		)
+	var/list/rhymes_harmless = list(
+		"Red on yellow, friendly old fellow.",
+		"Yellow on red, it's pretty good. Wait, that doesn't rhyme...",
+		"Yellow on black, will not attack.",
+		"Black on yellow, chill and mellow.",
+		)
+
+/mob/living/basic/snake/banded/Initialize(mapload, special_reagent)
+	special_reagent = src.poison_reagent
+	AddComponent(/datum/component/swarming)
+	return ..()
+
+/mob/living/basic/snake/banded/examine_more(mob/user)
+	. = ..()
+	. += span_notice("<i>You examine the bands on the snake very closely...</i>")
+	if(src.poison_reagent == (/datum/reagent/consumable/milk))
+		. += span_info("[pick(src.rhymes_harmless)]")
+		. += span_notice("This snake is not dangerous!")
+	else
+		. += span_info("[pick(src.rhymes_dangerous)]")
+		. += span_notice("This snake is dangerous!")
+	return .
+
+/datum/ai_controller/basic_controller/snake/banded
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+	)
+	ai_movement = /datum/ai_movement/basic_avoidance
+	idle_behavior = /datum/idle_behavior/idle_random_walk
+
+	planning_subtrees = list(
+		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/find_food,
+		/datum/ai_planning_subtree/random_speech/snake,
+	)
+
+
+/mob/living/basic/snake/banded/harmless
+	venom_dose = 0.4
+	poison_reagent = /datum/reagent/consumable/milk
+	melee_damage_lower = 1
+	melee_damage_upper = 1
+	gold_core_spawnable = FRIENDLY_SPAWN
+	ai_controller = /datum/ai_controller/basic_controller/snake
diff --git a/code/modules/mob/living/basic/space_fauna/snake/snake.dm b/code/modules/mob/living/basic/space_fauna/snake/snake.dm
index 7a30d713a4d98..d526189c5626b 100644
--- a/code/modules/mob/living/basic/space_fauna/snake/snake.dm
+++ b/code/modules/mob/living/basic/space_fauna/snake/snake.dm
@@ -13,6 +13,8 @@
 	melee_damage_upper = 6
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
+	//how many units of venom are injected in target per attack
+	var/venom_dose = 4
 
 	attack_verb_continuous = "bites"
 	attack_verb_simple = "bite"
@@ -62,7 +64,7 @@
 	if(isnull(special_reagent))
 		special_reagent = /datum/reagent/toxin
 
-	AddElement(/datum/element/venomous, special_reagent, 4)
+	AddElement(/datum/element/venomous, special_reagent, venom_dose)
 
 /mob/living/basic/snake/befriend(mob/living/new_friend)
 	. = ..()
diff --git a/code/modules/mob/living/basic/vermin/frog.dm b/code/modules/mob/living/basic/vermin/frog.dm
index a674169dbd5ce..3a288918dbdc1 100644
--- a/code/modules/mob/living/basic/vermin/frog.dm
+++ b/code/modules/mob/living/basic/vermin/frog.dm
@@ -109,6 +109,7 @@
 
 /datum/ai_controller/basic_controller/frog
 	blackboard = list(
+		BB_BASIC_MOB_STOP_FLEEING = TRUE, //We only flee from scary fishermen.
 		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
 		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
 		BB_OWNER_SELF_HARM_RESPONSES = list(
@@ -122,7 +123,8 @@
 	planning_subtrees = list(
 		/datum/ai_planning_subtree/target_retaliate,
 		/datum/ai_planning_subtree/random_speech/frog,
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
 		/datum/ai_planning_subtree/go_for_swim,
 	)
 
@@ -131,11 +133,18 @@
 		/datum/ai_planning_subtree/pet_planning,
 		/datum/ai_planning_subtree/random_speech/frog,
 		/datum/ai_planning_subtree/simple_find_target,
-		/datum/ai_planning_subtree/basic_melee_attack_subtree,
+		/datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
+		/datum/ai_planning_subtree/flee_target/from_fisherman,
 	)
 
 /datum/ai_controller/basic_controller/frog/suicide_frog
+	blackboard = list(
+		BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+		BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+		BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN, //No fear, only hatred. It has nothing to lose
+	)
+
 	planning_subtrees = list(
-		/datum/ai_planning_subtree/simple_find_target,
+		/datum/ai_planning_subtree/find_target_prioritize_traits,
 		/datum/ai_planning_subtree/basic_melee_attack_subtree,
 	)
diff --git a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
index 5ef330cdc64f9..5801d18321594 100644
--- a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
+++ b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
@@ -27,9 +27,21 @@
 	SIGNAL_HANDLER
 	set_blackboard_key(BB_MOTHROACH_NEXT_EAT, world.time + MOTHROACH_EAT_TIMER)
 
+/datum/ai_planning_subtree/find_food/mothroach
+	finding_behavior = /datum/ai_behavior/find_and_set/in_list/mothroach_food
+
 /datum/ai_planning_subtree/find_food/mothroach/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
 	if(world.time < controller.blackboard[BB_MOTHROACH_NEXT_EAT])
 		return
 	return ..()
 
+/datum/ai_behavior/find_and_set/in_list/mothroach_food
+
+/datum/ai_behavior/find_and_set/in_list/mothroach_food/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+	var/list/found = typecache_filter_list(oview(search_range, controller.pawn), locate_paths)
+	var/mob/living/living_pawn = controller.pawn
+	found -= living_pawn.loc
+	if(length(found))
+		return pick(found)
+
 #undef MOTHROACH_EAT_TIMER
diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm
index 724833af16f2a..7361e4be7b310 100644
--- a/code/modules/mob/living/basic/vermin/mouse.dm
+++ b/code/modules/mob/living/basic/vermin/mouse.dm
@@ -369,9 +369,7 @@
 	var/trans_amount = reagents.maximum_volume - reagents.total_volume * (4 / 3)
 	if(target_reagents.has_reagent(/datum/reagent/fuel) && target_reagents.trans_to(src, trans_amount))
 		to_chat(user, span_notice("You dip [src] into [interacting_with]."))
-	else
-		to_chat(user, span_warning("That's a terrible idea."))
-	return ITEM_INTERACT_BLOCKING
+		return ITEM_INTERACT_SUCCESS
 
 /obj/item/food/deadmouse/moldy
 	name = "moldy dead mouse"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 5ac120fcee3f3..7d5d6bec936a7 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -25,10 +25,6 @@
 			adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick)
 			blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * seconds_per_tick), BLOOD_VOLUME_NORMAL)
 
-	// Some effects are halved mid-combat.
-	var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0
-
-
 	//Bloodloss from wounds
 	var/temp_bleed = 0
 	for(var/obj/item/bodypart/iter_part as anything in bodyparts)
@@ -45,6 +41,10 @@
 	//Effects of bloodloss
 	if(sigreturn & HANDLE_BLOOD_NO_OXYLOSS)
 		return
+
+	// Some effects are halved mid-combat.
+	var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0
+
 	var/word = pick("dizzy","woozy","faint")
 	switch(blood_volume)
 		if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
@@ -105,11 +105,12 @@
 
 	// Blood ratio! if you have 280 blood, this equals 0.5 as that's half of the current value, 560.
 	var/effective_blood_ratio = blood_volume / BLOOD_VOLUME_NORMAL
+	var/target_oxyloss = max((1 - effective_blood_ratio) * 100, 0)
 
 	// If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage.
 	// This damage accrues faster the less blood you have.
-	// If KO or in hardcrit, the damage accrues even then to prevent being perma-KO.
-	if(((effective_blood_ratio < 1) && (getOxyLoss() < ((1 - effective_blood_ratio) * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT)))
+	// If the damage surpasses the KO threshold for oxyloss, then we'll always tick up so you die eventually
+	if(target_oxyloss > 0 && (getOxyLoss() < target_oxyloss || (target_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && stat >= UNCONSCIOUS)))
 		// At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5
 		var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume), 0.25) * seconds_per_tick
 		adjustOxyLoss(rounded_oxyloss, updating_health = TRUE)
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index 1bacc08a8b6ff..17f5be02a91cf 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -16,6 +16,7 @@
 		forceMove(OB)
 	if(!container?.mecha && (!container || container.immobilize)) //Unless inside a mecha, brains are rather helpless.
 		add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), BRAIN_UNAIDED)
+	ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
 
 /mob/living/brain/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
 	var/obj/item/organ/internal/brain/brain_loc = loc
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 3d380ef6824ca..b4c6f8e682d2d 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -40,6 +40,10 @@
 
 	/// Size modifier for the sprite
 	var/brain_size = 1
+	/// Can this brain become smooth after it gets washed
+	var/can_smoothen_out = TRUE
+	/// We got smooth from being washed
+	var/smooth_brain = FALSE
 
 /obj/item/organ/internal/brain/Initialize(mapload)
 	. = ..()
@@ -48,6 +52,8 @@
 
 /obj/item/organ/internal/brain/examine()
 	. = ..()
+	if (smooth_brain)
+		. += span_notice("All the pesky wrinkles are gone. Now it just needs a good drying...")
 	if(brain_size < 1)
 		. += span_notice("It is a bit on the smaller side...")
 	if(brain_size > 1)
@@ -131,6 +137,10 @@
 		organ_owner.update_body_parts()
 		organ_owner.clear_mood_event("brain_damage")
 
+/obj/item/organ/internal/brain/update_icon_state()
+	icon_state = "[initial(icon_state)][smooth_brain ? "-smooth_brain" : ""]"
+	return ..()
+
 /obj/item/organ/internal/brain/proc/transfer_identity(mob/living/L)
 	name = "[L.name]'s [initial(name)]"
 	if(brainmob)
@@ -373,6 +383,10 @@
 
 /obj/item/organ/internal/brain/machine_wash(obj/machinery/washing_machine/brainwasher)
 	. = ..()
+	if (can_smoothen_out && !smooth_brain)
+		smooth_brain = TRUE
+		update_appearance()
+
 	if(HAS_TRAIT(brainwasher, TRAIT_BRAINWASHING))
 		set_organ_damage(0)
 		cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)
@@ -408,6 +422,7 @@
 	name = "crystalline matrix"
 	desc = "This collection of sparkling gems somehow allows a golem to think."
 	icon_state = "adamantine_resonator"
+	can_smoothen_out = FALSE
 	color = COLOR_GOLEM_GRAY
 	organ_flags = ORGAN_MINERAL
 	organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_CAN_STRIP, TRAIT_ROCK_METAMORPHIC)
@@ -416,6 +431,7 @@
 	name = "lustrous brain"
 	desc = "This is your brain on bluespace dust. Not even once."
 	icon_state = "random_fly_4"
+	can_smoothen_out = FALSE
 	organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_CAN_STRIP)
 
 /obj/item/organ/internal/brain/lustrous/on_mob_remove(mob/living/carbon/organ_owner, special)
@@ -493,6 +509,11 @@
 		arguments = args.Copy(3)
 	. = brain_gain_trauma(trauma, resilience, arguments)
 
+/obj/item/organ/internal/brain/vv_edit_var(var_name, var_value)
+	. = ..()
+	if(var_name == NAMEOF(src, smooth_brain))
+		update_appearance()
+
 //Direct trauma gaining proc. Necessary to assign a trauma to its brain. Avoid using directly.
 /obj/item/organ/internal/brain/proc/brain_gain_trauma(datum/brain_trauma/trauma, resilience, list/arguments)
 	if(!can_gain_trauma(trauma, resilience))
diff --git a/code/modules/mob/living/brain/emote.dm b/code/modules/mob/living/brain/emote.dm
index 75599e892a25d..c93e3acf4b24a 100644
--- a/code/modules/mob/living/brain/emote.dm
+++ b/code/modules/mob/living/brain/emote.dm
@@ -3,7 +3,7 @@
 	mob_type_blacklist_typecache = list()
 	emote_type = EMOTE_AUDIBLE
 
-/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE, intentional, params)
 	. = ..()
 	var/mob/living/brain/B = user
 	if(!istype(B) || (!(B.container && istype(B.container, /obj/item/mmi))))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 35e15cc04537f..95103340bdae9 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -153,7 +153,7 @@
 				if(grab_state >= GRAB_NECK)
 					neckgrab_throw = TRUE
 				stop_pulling()
-				if(HAS_TRAIT(src, TRAIT_PACIFISM))
+				if(HAS_TRAIT(src, TRAIT_PACIFISM) || HAS_TRAIT(src, TRAIT_NO_THROWING))
 					to_chat(src, span_notice("You gently let go of [throwable_mob]."))
 					return FALSE
 	else
@@ -174,6 +174,8 @@
 		power_throw++
 	if(neckgrab_throw)
 		power_throw++
+	if(HAS_TRAIT(src, TRAIT_TOSS_GUN_HARD) && isgun(thrown_thing))
+		power_throw++
 	if(isitem(thrown_thing))
 		var/obj/item/thrown_item = thrown_thing
 		frequency_number = 1-(thrown_item.w_class-3)/8 //At normal weight, the frequency is at 1. For tiny, it is 1.25. For huge, it is 0.75.
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 12f390602d8c5..79af6c802d623 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -396,6 +396,9 @@
 
 	// Shake animation
 	if (incapacitated())
+		shake_up_animation()
+
+/mob/proc/shake_up_animation()
 		var/direction = prob(50) ? -1 : 1
 		animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
 		animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
@@ -545,10 +548,10 @@
 */
 /mob/living/carbon/proc/check_passout()
 	var/mob_oxyloss = getOxyLoss()
-	if(mob_oxyloss >= 50)
+	if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD)
 		if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT))
 			ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
-	else if(mob_oxyloss < 50)
+	else if(mob_oxyloss < OXYLOSS_PASSOUT_THRESHOLD)
 		REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
 
 /mob/living/carbon/get_organic_health()
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index 00e502bad0451..4c98419ef412c 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -306,6 +306,7 @@
 			continue
 		if(isnull(damage_overlay) && (iter_part.brutestate || iter_part.burnstate))
 			damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER, appearance_flags = KEEP_TOGETHER)
+			damage_overlay.color = iter_part.damage_overlay_color
 		if(iter_part.brutestate)
 			damage_overlay.add_overlay("[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0") //we're adding icon_states of the base image as overlays
 		if(iter_part.burnstate)
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 00699196ae9b6..6995defb6dafe 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -43,7 +43,7 @@
 	hands_use_check = TRUE
 	cooldown = 6 SECONDS
 
-/datum/emote/living/carbon/crack/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
+/datum/emote/living/carbon/crack/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional, params)
 	if(!iscarbon(user) || user.usable_hands < 2)
 		return FALSE
 	return ..()
@@ -98,8 +98,6 @@
 
 /datum/emote/living/carbon/noogie/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/obj/item/hand_item/noogie/noogie = new(user)
 	if(user.put_in_hands(noogie))
 		to_chat(user, span_notice("You ready your noogie'ing hand."))
@@ -148,8 +146,6 @@
 
 /datum/emote/living/carbon/slap/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/obj/item/hand_item/slapper/N = new(user)
 	if(user.put_in_hands(N))
 		to_chat(user, span_notice("You ready your slapping hand."))
@@ -166,9 +162,6 @@
 
 /datum/emote/living/carbon/hand/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
-
 	var/obj/item/hand_item/hand/hand = new(user)
 	if(user.put_in_hands(hand))
 		to_chat(user, span_notice("You ready your hand."))
@@ -198,8 +191,6 @@
 
 /datum/emote/living/carbon/shoesteal/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if (!.)
-		return
 	var/obj/item/hand_item/stealer/stealing_hand = new(user)
 	if (user.put_in_hands(stealing_hand))
 		user.balloon_alert(user, "preparing to steal shoes...")
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index dba3b55097a13..49cd616ed502c 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -744,7 +744,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 			sample_overlay = new overlay_path()
 			organs_to_randomize[overlay_path] = sample_overlay
 
-		new_features["[sample_overlay.feature_key]"] = pick(sample_overlay.get_global_feature_list())
+		new_features["[sample_overlay.feature_key]"] = sample_overlay.get_random_appearance().name
 
 	return new_features
 
@@ -1195,9 +1195,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
 
 	// Get the insulation value based on the area's temp
 	var/thermal_protection = humi.get_insulation_protection(area_temp)
+	var/original_bodytemp = humi.bodytemperature
 
 	// Changes to the skin temperature based on the area
-	var/area_skin_diff = area_temp - humi.bodytemperature
+	var/area_skin_diff = area_temp - original_bodytemp
 	if(!humi.on_fire || area_skin_diff > 0)
 		// change rate of 0.05 as area temp has large impact on the surface
 		var/area_skin_change = get_temp_change_amount(area_skin_diff, 0.05 * seconds_per_tick)
@@ -1217,7 +1218,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	// Core to skin temp transfer, when not on fire
 	if(!humi.on_fire)
 		// Get the changes to the skin from the core temp
-		var/core_skin_diff = humi.coretemperature - humi.bodytemperature
+		var/core_skin_diff = humi.coretemperature - original_bodytemp
 		// change rate of 0.045 to reflect temp back to the skin at the slight higher rate then core to skin
 		var/core_skin_change = (1 + thermal_protection) * get_temp_change_amount(core_skin_diff, 0.045 * seconds_per_tick)
 
@@ -1514,6 +1515,14 @@ GLOBAL_LIST_EMPTY(features_by_species)
 /datum/species/proc/get_cry_sound(mob/living/carbon/human/human)
 	return
 
+/// Returns the species' sigh sound.
+/datum/species/proc/get_sigh_sound(mob/living/carbon/human/human)
+	return
+
+/// Returns the species' sniff sound.
+/datum/species/proc/get_sniff_sound(mob/living/carbon/human/human)
+	return
+
 /// Returns the species' cough sound.
 /datum/species/proc/get_cough_sound(mob/living/carbon/human/human)
 	return
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index f5c3ae6b49903..8e3b8c77b567f 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -18,7 +18,7 @@
 	message = "pushes up their glasses."
 	emote_type = EMOTE_VISIBLE
 
-/datum/emote/living/carbon/human/glasses/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/glasses/can_run_emote(mob/user, status_check = TRUE, intentional, params)
 	var/obj/eyes_slot = user.get_item_by_slot(ITEM_SLOT_EYES)
 	if(istype(eyes_slot, /obj/item/clothing/glasses/regular) || istype(eyes_slot, /obj/item/clothing/glasses/sunglasses))
 		return ..()
@@ -66,9 +66,9 @@
 	only_forced_audio = TRUE
 	vary = TRUE
 
-/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
+/datum/emote/living/carbon/human/scream/can_run_emote(mob/user, status_check = TRUE , intentional, params)
 	if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
-		return
+		return FALSE
 	return ..()
 
 /datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
@@ -119,8 +119,6 @@
 
 /datum/emote/living/carbon/human/wag/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/obj/item/organ/external/tail/oranges_accessory = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
 	//I am so sorry my son
 	//We bypass helpers here cause we already have the tail
@@ -133,11 +131,11 @@
 	. = ..()
 	var/obj/item/organ/external/tail/oranges_accessory = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
 	if(oranges_accessory.wag_flags & WAG_WAGGING)
-		. = "stops wagging " + message
+		. = "перестаёт вилять " + message
 	else
-		. = "wags " + message
+		. = "начинает вилять " + message
 
-/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check, intentional)
+/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check, intentional, params)
 	var/obj/item/organ/external/tail/tail = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
 	if(tail?.wag_flags & WAG_ABLE)
 		return ..()
@@ -150,8 +148,6 @@
 
 /datum/emote/living/carbon/human/wing/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/obj/item/organ/external/wings/functional/wings = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
 	if(isnull(wings))
 		CRASH("[type] ran on a mob that has no wings!")
@@ -165,7 +161,7 @@
 	var/emote_verb = wings.wings_open ? "closes" : "opens"
 	return "[emote_verb] [message]"
 
-/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional, params)
 	if(!istype(user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS), /obj/item/organ/external/wings/functional))
 		return FALSE
 	return ..()
@@ -178,7 +174,7 @@
 ///Snowflake emotes only for le epic chimp
 /datum/emote/living/carbon/human/monkey
 
-/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional, params)
 	if(ismonkey(user))
 		return ..()
 	return FALSE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 94df3d3c4333b..9816012218225 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -516,7 +516,7 @@
 #undef CPR_PANIC_SPEED
 
 /mob/living/carbon/human/cuff_resist(obj/item/I)
-	if(dna?.check_mutation(/datum/mutation/human/hulk))
+	if(HAS_TRAIT(src, TRAIT_HULK))
 		say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
 		if(..(I, cuff_break = FAST_CUFFBREAK))
 			dropItemToGround(I)
@@ -980,10 +980,6 @@
 
 /mob/living/carbon/human/updatehealth()
 	. = ..()
-	if(HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
-		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
-		remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
-		return
 	var/health_deficiency = max((maxHealth - health), staminaloss)
 	if(health_deficiency >= 40)
 		add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown, TRUE, multiplicative_slowdown = health_deficiency / 75)
@@ -1099,3 +1095,6 @@
 
 /mob/living/carbon/human/species/zombie/infectious
 	race = /datum/species/zombie/infectious
+
+/mob/living/carbon/human/species/voidwalker
+	race = /datum/species/voidwalker
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index bea66f71112d3..ddde8ab7aef4c 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -567,9 +567,9 @@
 		return
 	var/list/combined_msg = list()
 
-	visible_message(span_notice("[src] examines [p_them()]self."))
+	visible_message(span_notice("[src] осматривает себя."))
 
-	combined_msg += span_notice("<b>You check yourself for injuries.</b>")
+	combined_msg += span_notice("<b>Вы осматриваете себя на предмет ранений.</b>")
 
 	var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
 
@@ -581,7 +581,7 @@
 		body_part.check_for_injuries(src, combined_msg)
 
 	for(var/t in missing)
-		combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!")
+		combined_msg += span_boldannounce("У вас отсутствует [parse_zone(t)]!")
 
 	if(is_bleeding())
 		var/list/obj/item/bodypart/bleeding_limbs = list()
@@ -590,53 +590,53 @@
 				bleeding_limbs += part
 
 		var/num_bleeds = LAZYLEN(bleeding_limbs)
-		var/bleed_text = "<span class='danger'>You are bleeding from your"
+		var/bleed_text = "<span class='danger'>Вы истекаете кровью из: "
 		switch(num_bleeds)
 			if(1 to 2)
-				bleed_text += " [bleeding_limbs[1].name][num_bleeds == 2 ? " and [bleeding_limbs[2].name]" : ""]"
+				bleed_text += " [bleeding_limbs[1].name][num_bleeds == 2 ? " и [bleeding_limbs[2].name]" : ""]"
 			if(3 to INFINITY)
 				for(var/i in 1 to (num_bleeds - 1))
 					var/obj/item/bodypart/BP = bleeding_limbs[i]
 					bleed_text += " [BP.name],"
-				bleed_text += " and [bleeding_limbs[num_bleeds].name]"
+				bleed_text += " и [bleeding_limbs[num_bleeds].name]"
 		bleed_text += "!</span>"
 		combined_msg += bleed_text
 
 	if(getStaminaLoss())
 		if(getStaminaLoss() > 30)
-			combined_msg += span_info("You're completely exhausted.")
+			combined_msg += span_info("Вы абсолютно обессилены.")
 		else
-			combined_msg += span_info("You feel fatigued.")
+			combined_msg += span_info("Вы чувствуете усталость.")
 	if(HAS_TRAIT(src, TRAIT_SELF_AWARE))
 		if(toxloss)
 			if(toxloss > 10)
-				combined_msg += span_danger("You feel sick.")
+				combined_msg += span_danger("Вы чувствуете недомогание.")
 			else if(toxloss > 20)
-				combined_msg += span_danger("You feel nauseated.")
+				combined_msg += span_danger("Вас тошнит.")
 			else if(toxloss > 40)
-				combined_msg += span_danger("You feel very unwell!")
+				combined_msg += span_danger("Вы чувствуете себя очень плохо!")
 		if(oxyloss)
 			if(oxyloss > 10)
-				combined_msg += span_danger("You feel lightheaded.")
+				combined_msg += span_danger("У вас кружится голова.")
 			else if(oxyloss > 20)
-				combined_msg += span_danger("Your thinking is clouded and distant.")
+				combined_msg += span_danger("Ваши мысли затуманены и находятся где-то далеко.")
 			else if(oxyloss > 30)
-				combined_msg += span_danger("You're choking!")
+				combined_msg += span_danger("Вы задыхаетесь!")
 
 	if(!HAS_TRAIT(src, TRAIT_NOHUNGER))
 		switch(nutrition)
 			if(NUTRITION_LEVEL_FULL to INFINITY)
-				combined_msg += span_info("You're completely stuffed!")
+				combined_msg += span_info("Вы наелись до отказа!")
 			if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
-				combined_msg += span_info("You're well fed!")
+				combined_msg += span_info("Вы наелись!")
 			if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
-				combined_msg += span_info("You're not hungry.")
+				combined_msg += span_info("Вы не голодны.")
 			if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
-				combined_msg += span_info("You could use a bite to eat.")
+				combined_msg += span_info("Вам не помешает перекусить.")
 			if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
-				combined_msg += span_info("You feel quite hungry.")
+				combined_msg += span_info("Вы чувствуете сильный голод.")
 			if(0 to NUTRITION_LEVEL_STARVING)
-				combined_msg += span_danger("You're starving!")
+				combined_msg += span_danger("Вы умираете с голоду!")
 
 	//Compiles then shows the list of damaged organs and broken organs
 	var/list/broken = list()
@@ -681,7 +681,7 @@
 		combined_msg += span_info("Your [damaged_message] [damaged_plural ? "are" : "is"] hurt.")
 
 	if(quirks.len)
-		combined_msg += span_notice("You have these quirks: [get_quirk_string(FALSE, CAT_QUIRK_ALL)].")
+		combined_msg += span_notice("У вас имеются следующий черты: [get_quirk_string(FALSE, CAT_QUIRK_ALL)].")
 
 	to_chat(src, examine_block(combined_msg.Join("\n")))
 
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 1fe6555cddf9c..3a9004618470f 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -57,15 +57,27 @@
 	return if_no_id
 
 //repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere
-/mob/living/carbon/human/get_visible_name(add_id_name = TRUE)
-	if(HAS_TRAIT(src, TRAIT_UNKNOWN))
-		return "Unknown"
+/mob/living/carbon/human/get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
 	var/list/identity = list(null, null)
 	SEND_SIGNAL(src, COMSIG_HUMAN_GET_VISIBLE_NAME, identity)
 	var/signal_face = LAZYACCESS(identity, VISIBLE_NAME_FACE)
 	var/signal_id = LAZYACCESS(identity, VISIBLE_NAME_ID)
 	var/face_name = !isnull(signal_face) ? signal_face : get_face_name("")
 	var/id_name = !isnull(signal_id) ? signal_id : get_id_name("")
+	if (force_real_name)
+		var/fake_name
+		if (face_name && face_name != real_name)
+			fake_name = face_name
+		if(add_id_name && id_name && id_name != real_name)
+			if (!isnull(fake_name) && id_name != face_name)
+				fake_name = "[fake_name]/[id_name]"
+			else
+				fake_name = id_name
+		if (HAS_TRAIT(src, TRAIT_UNKNOWN) || (!face_name && !id_name))
+			fake_name = "Unknown"
+		return "[real_name][fake_name ? " (as [fake_name])" : ""]"
+	if(HAS_TRAIT(src, TRAIT_UNKNOWN))
+		return "Unknown"
 	if(face_name)
 		if(add_id_name && id_name && (id_name != face_name))
 			return "[face_name] (as [id_name])"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d8119c6a5279a..6bdbf8322f26e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -207,7 +207,7 @@
 		if(thermal_protection_flags & HAND_RIGHT)
 			thermal_protection += THERMAL_PROTECTION_HAND_RIGHT
 
-	return min(1, thermal_protection)
+	return min(1, round(thermal_protection, 0.001))
 
 //See proc/get_heat_protection_flags(temperature) for the description of this proc.
 /mob/living/carbon/human/proc/get_cold_protection_flags(temperature)
@@ -268,7 +268,7 @@
 		if(thermal_protection_flags & HAND_RIGHT)
 			thermal_protection += THERMAL_PROTECTION_HAND_RIGHT
 
-	return min(1, thermal_protection)
+	return min(1, round(thermal_protection, 0.001))
 
 /mob/living/carbon/human/has_smoke_protection()
 	if(isclothing(wear_mask))
diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
index e4411b45bf6ef..963df2ac8f4de 100644
--- a/code/modules/mob/living/carbon/human/species_types/felinid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -21,6 +21,8 @@
 	family_heirlooms = list(/obj/item/toy/cattoy)
 	/// When false, this is a felinid created by mass-purrbation
 	var/original_felinid = TRUE
+	/// Yummy!
+	species_cookie = /obj/item/food/nugget
 
 // Prevents felinids from taking toxin damage from carpotoxin
 /datum/species/human/felinid/handle_chemical(datum/reagent/chem, mob/living/carbon/human/affected, seconds_per_tick, times_fired)
@@ -97,6 +99,17 @@
 		return 'sound/voice/human/female_sneeze1.ogg'
 	return 'sound/voice/human/male_sneeze1.ogg'
 
+/datum/species/human/felinid/get_sigh_sound(mob/living/carbon/human/felinid)
+	if(felinid.physique == FEMALE)
+		return 'sound/voice/human/female_sigh.ogg'
+	return 'sound/voice/human/male_sigh.ogg'
+
+/datum/species/human/felinid/get_sniff_sound(mob/living/carbon/human/felinid)
+	if(felinid.physique == FEMALE)
+		return 'sound/voice/human/female_sniff.ogg'
+	return 'sound/voice/human/male_sniff.ogg'
+
+
 
 /proc/mass_purrbation()
 	for(var/mob in GLOB.human_list)
diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm
index 146ce615ca98d..6d558c9d72fb9 100644
--- a/code/modules/mob/living/carbon/human/species_types/humans.dm
+++ b/code/modules/mob/living/carbon/human/species_types/humans.dm
@@ -79,6 +79,16 @@
 		'sound/voice/human/manlaugh2.ogg',
 	)
 
+/datum/species/human/get_sigh_sound(mob/living/carbon/human/human)
+	if(human.physique == FEMALE)
+		return 'sound/voice/human/female_sigh.ogg'
+	return 'sound/voice/human/male_sigh.ogg'
+
+/datum/species/human/get_sniff_sound(mob/living/carbon/human/human)
+	if(human.physique == FEMALE)
+		return 'sound/voice/human/female_sniff.ogg'
+	return 'sound/voice/human/male_sniff.ogg'
+
 /datum/species/human/get_species_description()
 	return "Humans are the dominant species in the known galaxy. \
 		Their kind extend from old Earth to the edges of known space."
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 8ae2e0b1bffd6..2a37aafc1608b 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -101,6 +101,16 @@
 /datum/species/lizard/get_laugh_sound(mob/living/carbon/human/lizard)
 	return 'sound/voice/lizard/lizard_laugh1.ogg'
 
+/datum/species/lizard/get_sigh_sound(mob/living/carbon/human/lizard)
+	if(lizard.physique == FEMALE)
+		return 'sound/voice/human/female_sigh.ogg'
+	return 'sound/voice/human/male_sigh.ogg'
+
+/datum/species/lizard/get_sniff_sound(mob/living/carbon/human/lizard)
+	if(lizard.physique == FEMALE)
+		return 'sound/voice/human/female_sniff.ogg'
+	return 'sound/voice/human/male_sniff.ogg'
+
 /datum/species/lizard/get_physical_attributes()
 	return "Lizardpeople can withstand slightly higher temperatures than most species, but they are very vulnerable to the cold \
 		and can't regulate their body-temperature internally, making the vacuum of space extremely deadly to them."
diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
index e1163f1387d5c..449f2d775a301 100644
--- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm
+++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
@@ -1,7 +1,7 @@
 #define MONKEY_SPEC_ATTACK_BITE_MISS_CHANCE 25
 
 /datum/species/monkey
-	name = "Monkey"
+	name = "\improper Monkey"
 	id = SPECIES_MONKEY
 	external_organs = list(
 		/obj/item/organ/external/tail/monkey = "Monkey",
@@ -22,6 +22,7 @@
 	)
 	no_equip_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_SUITSTORE
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT
+	species_cookie = /obj/item/food/grown/banana
 	inherent_factions = list(FACTION_MONKEY)
 	sexes = FALSE
 	species_language_holder = /datum/language_holder/monkey
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 5f0fd647439e1..fa1726dbb059f 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -13,6 +13,7 @@
 	mutanttongue = /obj/item/organ/internal/tongue/moth
 	mutanteyes = /obj/item/organ/internal/eyes/moth
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+	species_cookie = /obj/item/food/muffin/moffin
 	species_language_holder = /datum/language_holder/moth
 	death_sound = 'sound/voice/moth/moth_death.ogg'
 	payday_modifier = 1.0
@@ -97,6 +98,16 @@
 /datum/species/moth/get_laugh_sound(mob/living/carbon/human/moth)
 	return 'sound/voice/moth/moth_laugh1.ogg'
 
+/datum/species/moth/get_sigh_sound(mob/living/carbon/human/moth)
+	if(moth.physique == FEMALE)
+		return 'sound/voice/human/female_sigh.ogg'
+	return 'sound/voice/human/male_sigh.ogg'
+
+/datum/species/moth/get_sniff_sound(mob/living/carbon/human/moth)
+	if(moth.physique == FEMALE)
+		return 'sound/voice/human/female_sniff.ogg'
+	return 'sound/voice/human/male_sniff.ogg'
+
 /datum/species/moth/get_physical_attributes()
 	return "Moths have large and fluffy wings, which help them navigate the station if gravity is offline by pushing the air around them. \
 		Due to that, it isn't of much use out in space. Their eyes are very sensitive."
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index b2027b9e1a654..7f1173841effd 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -116,30 +116,3 @@
 		owner.apply_status_effect(applied_status)
 	if (!owner.has_status_effect(applied_status))
 		owner.take_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC)
-
-/// Heal in darkness and potentially trigger other effects, persists for a short duration after leaving
-/datum/status_effect/shadow_regeneration
-	id = "shadow_regeneration"
-	duration = 2 SECONDS
-	status_type = STATUS_EFFECT_REFRESH
-	alert_type = /atom/movable/screen/alert/status_effect/shadow_regeneration
-
-/datum/status_effect/shadow_regeneration/on_apply()
-	. = ..()
-	if (!.)
-		return FALSE
-	heal_owner()
-	return TRUE
-
-/datum/status_effect/shadow_regeneration/refresh(effect)
-	. = ..()
-	heal_owner()
-
-/// Regenerate health whenever this status effect is applied or reapplied
-/datum/status_effect/shadow_regeneration/proc/heal_owner()
-	owner.heal_overall_damage(brute = 1, burn = 1, required_bodytype = BODYTYPE_ORGANIC)
-
-/atom/movable/screen/alert/status_effect/shadow_regeneration
-	name = "Shadow Regeneration"
-	desc = "Bathed in soothing darkness, you will slowly heal yourself."
-	icon_state = "lightless"
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index e59a6328aa72e..5b43bf980c4a1 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -11,6 +11,8 @@
 		obscured |= ITEM_SLOT_NECK
 	if(hidden_slots & HIDEMASK)
 		obscured |= ITEM_SLOT_MASK
+	if(hidden_slots & HIDEBELT)
+		obscured |= ITEM_SLOT_BELT
 	if(hidden_slots & HIDEEYES)
 		obscured |= ITEM_SLOT_EYES
 	if(hidden_slots & HIDEEARS)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 67358fa912a3b..62030cf1eba59 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -63,9 +63,9 @@
 
 /datum/emote/living/collapse/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(. && isliving(user))
-		var/mob/living/L = user
-		L.Unconscious(40)
+	if(isliving(user))
+		var/mob/living/living = user
+		living.Unconscious(4 SECONDS)
 
 /datum/emote/living/dance
 	key = "dance"
@@ -95,7 +95,7 @@
 		message_animal_or_basic = custom_message
 	. = ..()
 	message_animal_or_basic = initial(message_animal_or_basic)
-	if(!. && !user.can_speak() || user.getOxyLoss() >= 50)
+	if(!user.can_speak() || user.getOxyLoss() >= 50)
 		return //stop the sound if oxyloss too high/cant speak
 	var/mob/living/carbon/carbon_user = user
 	// For masks that give unique death sounds
@@ -117,9 +117,9 @@
 
 /datum/emote/living/faint/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(. && isliving(user))
-		var/mob/living/L = user
-		L.SetSleeping(200)
+	if(isliving(user))
+		var/mob/living/living = user
+		living.SetSleeping(20 SECONDS)
 
 /datum/emote/living/flap
 	key = "flap"
@@ -130,7 +130,7 @@
 
 /datum/emote/living/flap/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(. && ishuman(user))
+	if(ishuman(user))
 		var/mob/living/carbon/human/human_user = user
 		var/open = FALSE
 		var/obj/item/organ/external/wings/functional/wings = human_user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
@@ -233,8 +233,6 @@
 
 /datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
 	animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
 
@@ -248,8 +246,6 @@
 
 /datum/emote/living/kiss/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
 	var/kiss_type = /obj/item/hand_item/kisser
 
 	if(HAS_TRAIT(user, TRAIT_KISS_OF_DEATH))
@@ -271,7 +267,7 @@
 	audio_cooldown = 5 SECONDS
 	vary = TRUE
 
-/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE , intentional)
+/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE , intentional, params)
 	return ..() && user.can_speak(allow_mimes = TRUE)
 
 /datum/emote/living/laugh/get_sound(mob/living/carbon/human/user)
@@ -334,7 +330,7 @@
 	audio_cooldown = 5 SECONDS
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE | EMOTE_RUNECHAT
 
-/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional)
+/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional, params)
 	return !HAS_TRAIT(user, TRAIT_SOOTHED_THROAT) && ..()
 
 /datum/emote/living/cough/get_sound(mob/living/carbon/human/user)
@@ -355,6 +351,8 @@
 	message = "screams!"
 	message_mime = "acts out a scream!"
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	mob_type_blacklist_typecache = list(/mob/living/brain, /mob/living/carbon/human)
+	sound_wall_ignore = TRUE
 
 /datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
 	if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
@@ -384,8 +382,6 @@
 #define SHIVER_LOOP_DURATION (1 SECONDS)
 /datum/emote/living/shiver/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
 	for(var/i in 1 to SHIVER_LOOP_DURATION / (0.2 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
 		animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
@@ -399,6 +395,7 @@
 	message = "sighs."
 	message_mime = "acts out an exaggerated silent sigh."
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	vary = TRUE
 
 /datum/emote/living/sigh/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
@@ -407,6 +404,11 @@
 	var/image/emote_animation = image('icons/mob/human/emote_visuals.dmi', user, "sigh")
 	flick_overlay_global(emote_animation, GLOB.clients, 2.0 SECONDS)
 
+/datum/emote/living/sigh/get_sound(mob/living/carbon/human/user)
+	if(!istype(user))
+		return
+	return user.dna.species.get_sigh_sound(user)
+
 /datum/emote/living/sit
 	key = "sit"
 	key_third_person = "sits"
@@ -428,6 +430,13 @@
 	message = "sniffs."
 	message_mime = "sniffs silently."
 	emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+	vary = TRUE
+
+/datum/emote/living/sniff/get_sound(mob/living/carbon/human/user)
+	if(!istype(user))
+		return
+	return user.dna.species.get_sniff_sound(user)
+
 
 /datum/emote/living/snore
 	key = "snore"
@@ -461,10 +470,10 @@
 
 /datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(. && isliving(user))
-		var/mob/living/L = user
-		L.Paralyze(200)
-		L.remove_status_effect(/datum/status_effect/grouped/surrender)
+	if(isliving(user))
+		var/mob/living/living = user
+		living.Paralyze(20 SECONDS)
+		living.remove_status_effect(/datum/status_effect/grouped/surrender)
 
 /datum/emote/living/sway
 	key = "sway"
@@ -473,8 +482,6 @@
 
 /datum/emote/living/sway/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_x = user.pixel_x + 2, time = 0.5 SECONDS)
 	for(var/i in 1 to 2)
 		animate(pixel_x = user.pixel_x - 4, time = 1.0 SECONDS)
@@ -494,8 +501,6 @@
 #define TREMBLE_LOOP_DURATION (4.4 SECONDS)
 /datum/emote/living/tremble/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
 	for(var/i in 1 to TREMBLE_LOOP_DURATION / (0.4 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
 		animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
@@ -510,8 +515,6 @@
 
 /datum/emote/living/twitch/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
 	animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
 	animate(time = 0.1 SECONDS)
@@ -525,8 +528,6 @@
 
 /datum/emote/living/twitch_s/run_emote(mob/living/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return FALSE
 	animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
 	animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
 
@@ -616,8 +617,36 @@
 	key_third_person = "custom"
 	message = null
 
-/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional)
-	. = ..() && intentional
+/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional, params)
+	. = ..()
+	if(!. || !intentional)
+		return FALSE
+
+	if(!isnull(user.ckey) && is_banned_from(user.ckey, "Emote"))
+		to_chat(user, span_boldwarning("You cannot send custom emotes (banned)."))
+		return FALSE
+
+	if(QDELETED(user))
+		return FALSE
+
+	if(user.client && user.client.prefs.muted & MUTE_IC)
+		to_chat(user, span_boldwarning("You cannot send IC messages (muted)."))
+		return FALSE
+
+	var/our_message = params ? params : get_custom_emote_from_user()
+
+	if(!emote_is_valid(user, our_message))
+		return FALSE
+
+	if(!params)
+		var/user_emote_type = get_custom_emote_type_from_user()
+
+		if(!user_emote_type)
+			return FALSE
+
+		emote_type = user_emote_type
+
+	message = our_message
 
 /datum/emote/living/custom/proc/emote_is_valid(mob/user, input)
 	// We're assuming clientless mobs custom emoting is something codebase-driven and not player-driven.
@@ -676,53 +705,16 @@
 			return FALSE
 
 /datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE)
-	if(!can_run_emote(user, TRUE, intentional))
-		return FALSE
-
-	if(!isnull(user.ckey) && is_banned_from(user.ckey, "Emote"))
-		to_chat(user, span_boldwarning("You cannot send custom emotes (banned)."))
-		return FALSE
-
-	if(QDELETED(user))
-		return FALSE
-
-	if(user.client && user.client.prefs.muted & MUTE_IC)
-		to_chat(user, span_boldwarning("You cannot send IC messages (muted)."))
-		return FALSE
-
-	message = params ? params : get_custom_emote_from_user()
-
-	if(!emote_is_valid(user, message))
-		message = null
-		return FALSE
-
-	if(!params)
-		var/user_emote_type = get_custom_emote_type_from_user()
-
-		if(!user_emote_type)
-			return FALSE
-
-		emote_type = user_emote_type
-	else if(type_override)
+	if(params && type_override)
 		emote_type = type_override
-
 	. = ..()
-
+	///Reset the message and emote type after it's run.
 	message = null
 	emote_type = EMOTE_VISIBLE
 
 /datum/emote/living/custom/replace_pronoun(mob/user, message)
 	return message
 
-/datum/emote/living/beep
-	key = "beep"
-	key_third_person = "beeps"
-	message = "beeps."
-	message_param = "beeps at %t."
-	sound = 'sound/machines/twobeep.ogg'
-	mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/basic/orbie)
-	emote_type = EMOTE_AUDIBLE
-
 /datum/emote/living/inhale
 	key = "inhale"
 	key_third_person = "inhales"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 2873dab1a71bc..70f268c2a454a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -169,13 +169,8 @@
 	if(now_pushing)
 		return TRUE
 
-	var/they_can_move = TRUE
-	var/their_combat_mode = FALSE
-
 	if(isliving(M))
 		var/mob/living/L = M
-		their_combat_mode = L.combat_mode
-		they_can_move = L.mobility_flags & MOBILITY_MOVE
 		//Also spread diseases
 		for(var/thing in diseases)
 			var/datum/disease/D = thing
@@ -205,22 +200,7 @@
 		return TRUE
 
 	if(!M.buckled && !M.has_buckled_mobs())
-		var/mob_swap = FALSE
-		var/too_strong = (M.move_resist > move_force) //can't swap with immovable objects unless they help us
-		if(!they_can_move) //we have to physically move them
-			if(!too_strong)
-				mob_swap = TRUE
-		else
-			//You can swap with the person you are dragging on grab intent, and restrained people in most cases
-			if(M.pulledby == src && !too_strong)
-				mob_swap = TRUE
-			else if(
-				!(HAS_TRAIT(M, TRAIT_NOMOBSWAP) || HAS_TRAIT(src, TRAIT_NOMOBSWAP)) &&\
-				((HAS_TRAIT(M, TRAIT_RESTRAINED) && !too_strong) || !their_combat_mode) &&\
-				(HAS_TRAIT(src, TRAIT_RESTRAINED) || !combat_mode)
-			)
-				mob_swap = TRUE
-		if(mob_swap)
+		if(can_mobswap_with(M))
 			//switch our position with M
 			if(loc && !loc.Adjacent(M.loc))
 				return TRUE
@@ -273,6 +253,46 @@
 			if(prob(I.block_chance*2))
 				return
 
+/mob/living/proc/can_mobswap_with(mob/other)
+	if (HAS_TRAIT(other, TRAIT_NOMOBSWAP) || HAS_TRAIT(src, TRAIT_NOMOBSWAP))
+		return FALSE
+
+	var/they_can_move = TRUE
+	var/their_combat_mode = FALSE
+
+	if(isliving(other))
+		var/mob/living/other_living = other
+		their_combat_mode = other_living.combat_mode
+		they_can_move = other_living.mobility_flags & MOBILITY_MOVE
+
+	var/too_strong = other.move_resist > move_force
+
+	// They cannot move, see if we can push through them
+	if (!they_can_move)
+		return !too_strong
+
+	// We are pulling them and can move through
+	if (other.pulledby == src && !too_strong)
+		return TRUE
+
+	// If we're in combat mode and not restrained we don't try to pass through people
+	if (combat_mode && !HAS_TRAIT(src, TRAIT_RESTRAINED))
+		return FALSE
+
+	// Nor can we pass through non-restrained people in combat mode (or if they're restrained but still too strong for us)
+	if (their_combat_mode && (!HAS_TRAIT(other, TRAIT_RESTRAINED) || too_strong))
+		return FALSE
+
+	if (isnull(other.client) || isnull(client))
+		return TRUE
+
+	// If both of us are trying to move in the same direction, let the fastest one through first
+	if (client.intended_direction == other.client.intended_direction)
+		return cached_multiplicative_slowdown < other.cached_multiplicative_slowdown
+
+	// Else, sure, let us pass
+	return TRUE
+
 /mob/living/get_photo_description(obj/item/camera/camera)
 	var/list/holding = list()
 	var/len = length(held_items)
@@ -2663,7 +2683,7 @@ GLOBAL_LIST_EMPTY(fire_appearances)
 
 	///The price should be high enough that the contractor can't just buy 'em back with their cut alone.
 	var/datum/market_item/hostage/market_item = new(src, black_market_price || ransom_price)
-	SSblackmarket.markets[/datum/market/blackmarket].add_item(market_item)
+	SSmarket.markets[/datum/market/blackmarket].add_item(market_item)
 
 	if(mind)
 		ADD_TRAIT(mind, TRAIT_HAS_BEEN_KIDNAPPED, TRAIT_GENERIC)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index d3dfa7e55f605..a06a71262490a 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -137,12 +137,12 @@
 	return 0
 
 /obj/item/proc/get_volume_by_throwforce_and_or_w_class()
-		if(throwforce && w_class)
-				return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
-		else if(w_class)
-				return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
-		else
-				return 0
+	if(throwforce && w_class)
+		return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
+	else if(w_class)
+		return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
+	else
+		return 0
 
 /mob/living/proc/set_combat_mode(new_mode, silent = TRUE)
 	if(combat_mode == new_mode)
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 58e13951ebc4f..459410d0a026a 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 	if(pressure < SOUND_MINIMUM_PRESSURE && !HAS_TRAIT(src, TRAIT_SIGN_LANG))
 		message_range = 1
 
-	if(pressure < ONE_ATMOSPHERE*0.4) //Thin air, let's italicise the message
+	if(pressure < ONE_ATMOSPHERE * (HAS_TRAIT(src, TRAIT_SPEECH_BOOSTER) ? 0.1 : 0.4)) //Thin air, let's italicise the message unless we have a loud low pressure speech trait and not in vacuum
 		spans |= SPAN_ITALICS
 
 	send_speech(message, message_range, src, bubble_type, spans, language, message_mods, tts_message = tts_message, tts_filter = tts_filter)//roughly 58% of living/say()'s total cost
@@ -401,27 +401,13 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 
 		var/list/filter = list()
 		var/list/special_filter = list()
-		var/voice_to_use = voice
-		var/use_radio = FALSE
 		if(length(voice_filter) > 0)
 			filter += voice_filter
 
 		if(length(tts_filter) > 0)
 			filter += tts_filter.Join(",")
-		if(ishuman(src))
-			var/mob/living/carbon/human/human_speaker = src
-			if(istype(human_speaker.wear_mask, /obj/item/clothing/mask))
-				var/obj/item/clothing/mask/worn_mask = human_speaker.wear_mask
-				if(!worn_mask.up)
-					if(worn_mask.voice_override)
-						voice_to_use = worn_mask.voice_override
-					if(worn_mask.voice_filter)
-						filter += worn_mask.voice_filter
-					use_radio = worn_mask.use_radio_beeps_tts
-		if(use_radio)
-			special_filter += TTS_FILTER_RADIO
-		if(issilicon(src))
-			special_filter += TTS_FILTER_SILICON
+
+		var/voice_to_use = get_tts_voice(filter, special_filter)
 
 		INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), src, html_decode(tts_message_to_use), message_language, voice_to_use, filter.Join(","), listened, message_range = message_range, pitch = pitch, special_filters = special_filter.Join("|"))
 
@@ -432,6 +418,22 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
 	LAZYADD(update_on_z, say_popup)
 	addtimer(CALLBACK(src, PROC_REF(clear_saypopup), say_popup), 3.5 SECONDS)
 
+/mob/living/proc/get_tts_voice(list/filter, list/special_filter)
+	. = voice
+	var/obj/item/clothing/mask/mask = get_item_by_slot(ITEM_SLOT_MASK)
+	if(!istype(mask) || mask.up)
+		return
+	if(mask.voice_override)
+		. = mask.voice_override
+	if(mask.voice_filter)
+		filter += mask.voice_filter
+	if(mask.use_radio_beeps_tts)
+		special_filter |= TTS_FILTER_RADIO
+
+/mob/living/silicon/get_tts_voice(list/filter, list/special_filter)
+	. = ..()
+	special_filter |= TTS_FILTER_SILICON
+
 /mob/living/proc/clear_saypopup(image/say_popup)
 	LAZYREMOVE(update_on_z, say_popup)
 
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 382692f03788a..6975acc7d80e2 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -11,9 +11,7 @@
 	combat_mode = TRUE //so we always get pushed instead of trying to swap
 	sight = SEE_TURFS | SEE_MOBS | SEE_OBJS
 	hud_type = /datum/hud/ai
-	med_hud = DATA_HUD_MEDICAL_BASIC
-	sec_hud = DATA_HUD_SECURITY_BASIC
-	d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
+	silicon_huds = list(DATA_HUD_MEDICAL_BASIC, DATA_HUD_SECURITY_BASIC, DATA_HUD_DIAGNOSTIC, DATA_HUD_BOT_PATH)
 	mob_size = MOB_SIZE_LARGE
 	radio = /obj/item/radio/headset/silicon/ai
 	can_buckle_to = FALSE
diff --git a/code/modules/mob/living/silicon/ai/emote.dm b/code/modules/mob/living/silicon/ai/emote.dm
index 8050ff1d0a0d9..c4ec04e0899ec 100644
--- a/code/modules/mob/living/silicon/ai/emote.dm
+++ b/code/modules/mob/living/silicon/ai/emote.dm
@@ -9,12 +9,6 @@
 
 /datum/emote/ai/emotion_display/run_emote(mob/living/silicon/ai/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
-
-	if(!istype(user))
-		return
-
 	user.apply_emote_display(emotion)
 
 /datum/emote/ai/emotion_display/very_happy
@@ -72,9 +66,6 @@
 
 /datum/emote/ai/emotion_display/friend_computer/run_emote(mob/user, params, type_override, intentional)
 	. = ..()
-	if(!.)
-		return
-
 	var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
 
 	if(!frequency)
diff --git a/code/modules/mob/living/silicon/ai/freelook/README.txt b/code/modules/mob/living/silicon/ai/freelook/README.txt
index 78dc3b52f5cf2..818087f995982 100644
--- a/code/modules/mob/living/silicon/ai/freelook/README.txt
+++ b/code/modules/mob/living/silicon/ai/freelook/README.txt
@@ -32,7 +32,7 @@ HOW IT UPDATES
 The camera network uses a streaming method in order to effeciently update chunks. Since the server will have doors opening, doors closing,
 turf being destroyed and other lag inducing stuff, we want to update it under certain conditions and not every tick.
 
-The chunks are not created straight away, only when an AI eye moves into it's area is when it gets created.
+The chunks are not created straight away, only when an AI eye moves into its area is when it gets created.
 One a chunk is created, when a non glass door opens/closes or an opacity turf is destroyed, we check to see if an AI Eye is looking in the area.
 We do this with the "seenby" list, which updates everytime an AI is near a chunk. If there is an AI eye inside the area, we update the chunk
 that the changed atom is inside and all surrounding chunks, since a camera's vision could leak onto another chunk. If there is no AI Eye, we instead
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index a9ad9884045d6..2c5e809e5d921 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -56,7 +56,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
 	if(!.)
 		chunks[key] = . = new /datum/camerachunk(x, y, lowest.z)
 
-/// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
+/// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or its location is set.
 /datum/cameranet/proc/visibility(list/moved_eyes, client/C, list/other_eyes, use_static = TRUE)
 	if(!islist(moved_eyes))
 		moved_eyes = moved_eyes ? list(moved_eyes) : list()
@@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
 
 	for(var/mob/camera/ai_eye/eye as anything in moved_eyes)
 		var/list/visibleChunks = list()
-		//Get the eye's turf in case it's located in an object like a mecha
+		//Get the eye's turf in case its located in an object like a mecha
 		var/turf/eye_turf = get_turf(eye)
 		if(eye.loc)
 			var/static_range = eye.static_visibility_range
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index fb7857d458541..2215864782325 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -1,5 +1,5 @@
 /datum/emote/silicon
-	mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/simple_animal/bot, /mob/living/basic/bot)
+	trait_required = TRAIT_SILICON_EMOTES_ALLOWED
 	emote_type = EMOTE_AUDIBLE
 
 /datum/emote/silicon/boop
@@ -7,6 +7,14 @@
 	key_third_person = "boops"
 	message = "boops."
 
+/datum/emote/silicon/beep
+	key = "beep"
+	key_third_person = "beeps"
+	message = "beeps."
+	message_param = "beeps at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/machines/twobeep.ogg'
+
 /datum/emote/silicon/buzz
 	key = "buzz"
 	key_third_person = "buzzes"
@@ -15,7 +23,6 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'sound/machines/buzz-sigh.ogg'
 
-
 /datum/emote/silicon/buzz2
 	key = "buzz2"
 	message = "buzzes twice."
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 0c26e7c57e278..3fcf652cc6abb 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -11,7 +11,7 @@
 		post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \
 		post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \
 		roleplay_friendly = TRUE, \
-		roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/living/beep), \
+		roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep), \
 		roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay)))
 
 	set_wires(new /datum/wires/robot(src))
@@ -125,9 +125,9 @@
 		GLOB.available_ai_shells -= src
 
 	QDEL_NULL(modularInterface)
-	QDEL_NULL(wires)
 	QDEL_NULL(model)
 	QDEL_NULL(eye_lights)
+	QDEL_NULL(hat_overlay)
 	QDEL_NULL(inv1)
 	QDEL_NULL(inv2)
 	QDEL_NULL(inv3)
@@ -312,12 +312,34 @@
 			add_overlay("ov-opencover +c")
 		else
 			add_overlay("ov-opencover -c")
+
 	if(hat)
-		var/mutable_appearance/head_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head/default.dmi')
-		head_overlay.pixel_z += hat_offset
-		add_overlay(head_overlay)
+		hat_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head/default.dmi')
+		update_worn_icons()
+	else if(hat_overlay)
+		QDEL_NULL(hat_overlay)
+
 	update_appearance(UPDATE_OVERLAYS)
 
+/mob/living/silicon/robot/proc/update_worn_icons()
+	if(!hat_overlay)
+		return
+	cut_overlay(hat_overlay)
+
+	if(islist(hat_offset))
+		var/list/offset = hat_offset[ISDIAGONALDIR(dir) ? dir2text(dir & (WEST|EAST)) : dir2text(dir)]
+		if(offset)
+			hat_overlay.pixel_w = offset[1]
+			hat_overlay.pixel_z = offset[2]
+
+	add_overlay(hat_overlay)
+
+/mob/living/silicon/robot/setDir(newdir)
+	var/old_dir = dir
+	. = ..()
+	if(. != old_dir)
+		update_worn_icons()
+
 /mob/living/silicon/robot/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
 	if(same_z_layer || QDELING(src))
 		return ..()
@@ -351,7 +373,7 @@
 	set_lockcharge(FALSE)
 	scrambledcodes = TRUE
 	log_silicon("CYBORG: [key_name(src)] has been unlinked from an AI.")
-	//Disconnect it's camera so it's not so easily tracked.
+	//Disconnect its camera so it's not so easily tracked.
 	if(!QDELETED(builtInCamera))
 		QDEL_NULL(builtInCamera)
 		// I'm trying to get the Cyborg to not be listed in the camera list
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 2346c36ba5c03..549762fd7a943 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -214,7 +214,6 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 	if(!wiresexposed && !issilicon(user))
 		if(!cell)
 			return
-		cell.update_appearance()
 		cell.add_fingerprint(user)
 		to_chat(user, span_notice("You remove \the [cell]."))
 		user.put_in_active_hand(cell)
@@ -242,7 +241,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
 	if (!getBruteLoss())
 		to_chat(user, span_warning("[src] is already in good condition!"))
 		return
-	if (!tool.tool_start_check(user, amount=1)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away.
+	if (!tool.tool_start_check(user, amount=1)) //The welder has 1u of fuel consumed by its afterattack, so we don't need to worry about taking any away.
 		return
 	if(src == user)
 		to_chat(user, span_notice("You start fixing yourself..."))
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 48995a1582e66..33026d70921fb 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -55,7 +55,10 @@
 	////Power consumption of the light per lamp_intensity.
 	var/lamp_power_consumption = BORG_LAMP_POWER_CONSUMPTION
 
+	// Overlay for borg eye lights
 	var/mutable_appearance/eye_lights
+	// Overlay for borg hat
+	var/mutable_appearance/hat_overlay
 
 
 	// Hud
@@ -129,7 +132,7 @@
 
 	var/hasExpanded = FALSE
 	var/obj/item/hat
-	var/hat_offset = -3
+	var/hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(4, -3), "west" = list(-4, -3))
 
 	///What types of mobs are allowed to ride/buckle to this mob
 	var/static/list/can_ride_typecache = typecacheof(/mob/living/carbon/human)
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index 030161f8da9e1..015f23182dca3 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -45,8 +45,8 @@
 	var/allow_riding = TRUE
 	///Whether the borg can stuff itself into disposals
 	var/canDispose = FALSE
-	///The y offset of  the hat put on
-	var/hat_offset = -3
+	///The pixel offset of the hat. List of "north" "south" "east" "west" x, y offsets
+	var/hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(4, -3), "west" = list(-4, -3))
 	///The x offsets of a person riding the borg
 	var/list/ride_offset_x = list("north" = 0, "south" = 0, "east" = -6, "west" = 6)
 	///The y offsets of a person riding the borg
@@ -233,6 +233,7 @@
 	if(!new_model.be_transformed_to(src, forced))
 		qdel(new_model)
 		return
+	cyborg.drop_all_held_items()
 	cyborg.model = new_model
 	cyborg.update_module_innate()
 	new_model.rebuild_modules()
@@ -359,7 +360,7 @@
 	)
 	model_select_icon = "service"
 	cyborg_base_icon = "clown"
-	hat_offset = -2
+	hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(4, -2), "west" = list(-4, -2))
 
 /obj/item/robot_model/clown/respawn_consumable(mob/living/silicon/robot/cyborg, coeff = 1)
 	. = ..()
@@ -400,7 +401,7 @@
 	cyborg_base_icon = "engineer"
 	model_select_icon = "engineer"
 	model_traits = list(TRAIT_NEGATES_GRAVITY)
-	hat_offset = -4
+	hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4))
 
 /obj/item/robot_model/janitor
 	name = "Janitor"
@@ -427,7 +428,7 @@
 	)
 	cyborg_base_icon = "janitor"
 	model_select_icon = "janitor"
-	hat_offset = -5
+	hat_offset = list("north" = list(0, -5), "south" = list(0, -5), "east" = list(4, -5), "west" = list(-4, -5))
 	/// Weakref to the wash toggle action we own
 	var/datum/weakref/wash_toggle_ref
 
@@ -697,10 +698,9 @@
 	cyborg_base_icon = "medical"
 	model_select_icon = "medical"
 	model_traits = list(TRAIT_PUSHIMMUNE)
-	hat_offset = 3
 	borg_skins = list(
-		"Machinified Doctor" = list(SKIN_ICON_STATE = "medical"),
-		"Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor"),
+		"Machinified Doctor" = list(SKIN_ICON_STATE = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))),
+		"Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(1, 3), "west" = list(-1, 3))),
 	)
 
 /obj/item/robot_model/miner
@@ -726,10 +726,10 @@
 	)
 	cyborg_base_icon = "miner"
 	model_select_icon = "miner"
-	hat_offset = 0
+	hat_offset = list("north" = list(0, 0), "south" = list(0, 0), "east" = list(0, 0), "west" = list(0, 0))
 	borg_skins = list(
 		"Asteroid Miner" = list(SKIN_ICON_STATE = "minerOLD"),
-		"Spider Miner" = list(SKIN_ICON_STATE = "spidermin"),
+		"Spider Miner" = list(SKIN_ICON_STATE = "spidermin", SKIN_HAT_OFFSET = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(-2, -2), "west" = list(2, -2))),
 		"Lavaland Miner" = list(SKIN_ICON_STATE = "miner"),
 	)
 
@@ -751,7 +751,7 @@
 	cyborg_base_icon = "peace"
 	model_select_icon = "standard"
 	model_traits = list(TRAIT_PUSHIMMUNE)
-	hat_offset = -2
+	hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(1, -2), "west" = list(-1, -2))
 
 /obj/item/robot_model/peacekeeper/do_transform_animation()
 	..()
@@ -775,7 +775,7 @@
 	cyborg_base_icon = "sec"
 	model_select_icon = "security"
 	model_traits = list(TRAIT_PUSHIMMUNE)
-	hat_offset = 3
+	hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(1, 3), "west" = list(-1, 3))
 
 /obj/item/robot_model/security/do_transform_animation()
 	..()
@@ -826,11 +826,11 @@
 	cyborg_base_icon = "service_m" // display as butlerborg for radial model selection
 	model_select_icon = "service"
 	special_light_key = "service"
-	hat_offset = 0
+	hat_offset = list("north" = list(0, 0), "south" = list(0, 0), "east" = list(0, 0), "west" = list(0, 0))
 	borg_skins = list(
 		"Bro" = list(SKIN_ICON_STATE = "brobot"),
 		"Butler" = list(SKIN_ICON_STATE = "service_m"),
-		"Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = 3),
+		"Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))),
 		"Tophat" = list(SKIN_ICON_STATE = "tophat", SKIN_LIGHT_KEY = NONE, SKIN_HAT_OFFSET = INFINITY),
 		"Waitress" = list(SKIN_ICON_STATE = "service_f"),
 	)
@@ -859,7 +859,7 @@
 	cyborg_base_icon = "synd_sec"
 	model_select_icon = "malf"
 	model_traits = list(TRAIT_PUSHIMMUNE)
-	hat_offset = 3
+	hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(4, 3), "west" = list(-4, 3))
 
 /obj/item/robot_model/syndicate/rebuild_modules()
 	..()
@@ -894,7 +894,7 @@
 	cyborg_base_icon = "synd_medical"
 	model_select_icon = "malf"
 	model_traits = list(TRAIT_PUSHIMMUNE)
-	hat_offset = 3
+	hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))
 
 /obj/item/robot_model/saboteur
 	name = "Syndicate Saboteur"
@@ -923,7 +923,7 @@
 	cyborg_base_icon = "synd_engi"
 	model_select_icon = "malf"
 	model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NEGATES_GRAVITY)
-	hat_offset = -4
+	hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4))
 	canDispose = TRUE
 
 /obj/item/robot_model/syndicate/kiltborg
@@ -934,7 +934,7 @@
 	)
 	model_select_icon = "kilt"
 	cyborg_base_icon = "kilt"
-	hat_offset = -2
+	hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(4, -2), "west" = list(-4, -2))
 	breakable_modules = FALSE
 	locked_transform = FALSE //GO GO QUICKLY AND SLAUGHTER THEM ALL
 
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 9ca655740cd08..e41cd2157080f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -38,9 +38,7 @@
 
 	///Are our siliconHUDs on? TRUE for yes, FALSE for no.
 	var/sensors_on = TRUE
-	var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
-	var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
-	var/d_hud = DATA_HUD_DIAGNOSTIC_BASIC //Determines the diag hud to use
+	var/list/silicon_huds = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_SECURITY_ADVANCED, DATA_HUD_DIAGNOSTIC)
 
 	var/law_change_counter = 0
 	var/obj/machinery/camera/builtInCamera = null
@@ -80,6 +78,7 @@
 	)
 
 	add_traits(traits_to_apply, ROUNDSTART_TRAIT)
+	ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
 	RegisterSignal(src, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_silicon_shocked))
 
 /mob/living/silicon/Destroy()
@@ -391,20 +390,14 @@
 	return -10
 
 /mob/living/silicon/proc/remove_sensors()
-	var/datum/atom_hud/secsensor = GLOB.huds[sec_hud]
-	var/datum/atom_hud/medsensor = GLOB.huds[med_hud]
-	var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
-	secsensor.hide_from(src)
-	medsensor.hide_from(src)
-	diagsensor.hide_from(src)
+	for (var/hud_type in silicon_huds)
+		var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+		silicon_hud.hide_from(src)
 
 /mob/living/silicon/proc/add_sensors()
-	var/datum/atom_hud/secsensor = GLOB.huds[sec_hud]
-	var/datum/atom_hud/medsensor = GLOB.huds[med_hud]
-	var/datum/atom_hud/diagsensor = GLOB.huds[d_hud]
-	secsensor.show_to(src)
-	medsensor.show_to(src)
-	diagsensor.show_to(src)
+	for (var/hud_type in silicon_huds)
+		var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+		silicon_hud.show_to(src)
 
 /mob/living/silicon/proc/toggle_sensors()
 	if(incapacitated())
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 49b44122ac0e7..e2bb112e1565e 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -95,8 +95,8 @@
 	var/turf/nearest_beacon_loc
 
 	///The type of data HUD the bot uses. Diagnostic by default.
-	var/data_hud_type = DATA_HUD_DIAGNOSTIC_BASIC
-	var/datum/atom_hud/data/bot_path/path_hud
+	var/data_hud_type = DATA_HUD_DIAGNOSTIC
+	var/datum/atom_hud/data/bot_path/private/path_hud
 	var/path_image_icon = 'icons/mob/silicon/aibots.dmi'
 	var/path_image_icon_state = "path_indicator"
 	var/path_image_color = COLOR_WHITE
@@ -165,7 +165,7 @@
 	. = ..()
 	GLOB.bots_list += src
 
-	path_hud = new /datum/atom_hud/data/bot_path()
+	path_hud = new /datum/atom_hud/data/bot_path/private()
 	for(var/hud in path_hud.hud_icons) // You get to see your own path
 		set_hud_image_active(hud, exclusive_hud = path_hud)
 
@@ -202,6 +202,7 @@
 	pa_system = new(src, automated_announcements = automated_announcements)
 	pa_system.Grant(src)
 	RegisterSignal(src, COMSIG_MOB_TRIED_ACCESS, PROC_REF(attempt_access))
+	ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
 
 /mob/living/simple_animal/bot/Destroy()
 	GLOB.bots_list -= src
@@ -555,7 +556,6 @@
 	if(istype(item_to_drop, /obj/item/stock_parts/power_store/cell))
 		var/obj/item/stock_parts/power_store/cell/dropped_cell = item_to_drop
 		dropped_cell.charge = 0
-		dropped_cell.update_appearance()
 
 	else if(istype(item_to_drop, /obj/item/storage))
 		var/obj/item/storage/storage_to_drop = item_to_drop
@@ -1147,7 +1147,7 @@ Pass a positive integer as an argument to override a bot's default speed.
 	path = newpath ? newpath : list()
 	if(!path_hud)
 		return
-	var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED])
+	var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH])
 	if(path_hud)
 		path_huds_watching_me += path_hud
 	for(var/datum/atom_hud/hud as anything in path_huds_watching_me)
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index ae1c52d1652da..4bedf0d3d621b 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -218,52 +218,54 @@
 
 	target = scan(tiles_scanned)
 
-	if(!target && bot_mode_flags & BOT_MODE_AUTOPATROL)
-		switch(mode)
-			if(BOT_IDLE, BOT_START_PATROL)
-				start_patrol()
-			if(BOT_PATROL)
-				bot_patrol()
-
-	if(target)
-		if(loc == target || loc == get_turf(target))
-			if(check_bot(target)) //Target is not defined at the parent
-				if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach
-					target = null
-					path = list()
-					return
-			if(isturf(target) && !(bot_cover_flags & BOT_COVER_EMAGGED))
-				repair(target)
-			else if(bot_cover_flags & BOT_COVER_EMAGGED && isfloorturf(target))
-				var/turf/open/floor/F = target
-				toggle_magnet()
-				mode = BOT_REPAIRING
-				if(isplatingturf(F))
-					F.attempt_lattice_replacement()
-				else
-					F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
-				audible_message(span_danger("[src] makes an excited booping sound."))
-				addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS)
-			path = list()
-			return
-		if(!length(path))
-			if(!isturf(target))
-				var/turf/TL = get_turf(target)
-				path = get_path_to(src, TL, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
-			else
-				path = get_path_to(src, target, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+	if (!target)
+		if(bot_mode_flags & BOT_MODE_AUTOPATROL)
+			switch(mode)
+				if(BOT_IDLE, BOT_START_PATROL)
+					start_patrol()
+				if(BOT_PATROL)
+					bot_patrol()
+		return
 
-			if(!bot_move(target))
-				add_to_ignore(target)
+	if(loc == target || loc == get_turf(target))
+		if(check_bot(target)) //Target is not defined at the parent
+			if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach
 				target = null
-				mode = BOT_IDLE
+				path = list()
 				return
-		else if( !bot_move(target) )
+		if(isturf(target) && !(bot_cover_flags & BOT_COVER_EMAGGED))
+			repair(target)
+		else if(bot_cover_flags & BOT_COVER_EMAGGED && isfloorturf(target))
+			var/turf/open/floor/floor = target
+			toggle_magnet()
+			mode = BOT_REPAIRING
+			if(isplatingturf(floor))
+				floor.attempt_lattice_replacement()
+			else
+				floor.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+			audible_message(span_danger("[src] makes an excited booping sound."))
+			addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS)
+		path = list()
+		return
+
+	if(!length(path))
+		if(!isturf(target))
+			var/turf/TL = get_turf(target)
+			path = get_path_to(src, TL, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+		else
+			path = get_path_to(src, target, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+
+		if(!bot_move(target))
+			add_to_ignore(target)
 			target = null
 			mode = BOT_IDLE
-			return
+	else if(!bot_move(target))
+		target = null
+		mode = BOT_IDLE
 
 /mob/living/simple_animal/bot/floorbot/proc/go_idle()
+	if (QDELETED(src))
+		return
 	toggle_magnet(FALSE)
 	mode = BOT_IDLE
 	target = null
@@ -278,7 +280,7 @@
 //Floorbots, having several functions, need sort out special conditions here.
 /mob/living/simple_animal/bot/floorbot/process_scan(scan_target)
 	var/result
-	var/turf/open/floor/F
+	var/turf/open/floor/floor
 	move_resist = initial(move_resist)
 	switch(process_type)
 		if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
@@ -290,21 +292,21 @@
 				result = scan_target
 				move_resist = INFINITY
 		if(PLACE_TILE)
-			F = scan_target
-			if(isplatingturf(F)) //The floor must not already have a tile.
-				result = F
+			floor = scan_target
+			if(isplatingturf(floor)) //The floor must not already have a tile.
+				result = floor
 		if(REPLACE_TILE)
-			F = scan_target
-			if(isfloorturf(F) && !isplatingturf(F)) //The floor must already have a tile.
-				result = F
+			floor = scan_target
+			if(isfloorturf(floor) && !isplatingturf(floor)) //The floor must already have a tile.
+				result = floor
 		if(FIX_TILE) //Selects only damaged floors.
-			F = scan_target
-			if(istype(F) && (F.broken || F.burnt))
-				result = F
+			floor = scan_target
+			if(istype(floor) && (floor.broken || floor.burnt))
+				result = floor
 		if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
-			F = scan_target
-			if(!isplatingturf(F))
-				result = F
+			floor = scan_target
+			if(!isplatingturf(floor))
+				result = floor
 		else //If no special processing is needed, simply return the result.
 			result = scan_target
 	return result
@@ -326,57 +328,69 @@
 		toggle_magnet()
 		visible_message(span_notice("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] "))
 		mode = BOT_REPAIRING
-		if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING)
-			if(autotile) //Build the floor and include a tile.
-				if(replacetiles && tilestack)
-					target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)	//make sure a hull is actually below the floor tile
-					tilestack.place_tile(target_turf, src)
-					if(!tilestack)
-						speak("Requesting refill of custom floor tiles to continue replacing.")
-				else
-					target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)	//make sure a hull is actually below the floor tile
-					target_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
-			else //Build a hull plating without a floor tile.
-				target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+		if(!do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING)
+			go_idle()
+			return
 
-	else
-		var/turf/open/floor/F = target_turf
-		var/success = FALSE
-		var/was_replacing = replacetiles
+		if(!autotile)
+			target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+			go_idle()
+			return
 
-		if(F.broken || F.burnt || isplatingturf(F))
-			toggle_magnet()
-			mode = BOT_REPAIRING
-			visible_message(span_notice("[src] begins [(F.broken || F.burnt) ? "repairing the floor" : "placing a floor tile"]."))
-			if(do_after(src, 5 SECONDS, target = F) && mode == BOT_REPAIRING)
-				success = TRUE
+		if(replacetiles && tilestack)
+			target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)	//make sure a hull is actually below the floor tile
+			tilestack.place_tile(target_turf, src)
+			if(!tilestack)
+				speak("Requesting refill of custom floor tiles to continue replacing.")
+		else
+			target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)	//make sure a hull is actually below the floor tile
+			target_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
+		go_idle()
+		return
 
-		else if(replacetiles && tilestack && F.type != tilestack.turf_type)
-			toggle_magnet()
-			mode = BOT_REPAIRING
-			visible_message(span_notice("[src] begins replacing the floor tiles."))
-			if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING && tilestack)
-				success = TRUE
-
-		if(success)
-			var/area/is_this_maints = get_area(F)
-			if(was_replacing && tilestack)	//turn the tile into plating (if needed), then replace it
-				F = F.make_plating(TRUE) || F
-				tilestack.place_tile(F, src)
-				if(!tilestack)
-					speak("Requesting refill of custom floor tiles to continue replacing.")
-			else if(F.broken || F.burnt)	//repair the tile and reset it to be undamaged (rather than replacing it)
-				F.broken = FALSE
-				F.burnt = FALSE
-				F.update_appearance()
-			else if(istype(is_this_maints, /area/station/maintenance))	//place catwalk if it's plating and we're in maints
-				F.place_on_top(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
-			else	//place normal tile if it's plating anywhere else
-				F = F.make_plating(TRUE) || F
-				F.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
-
-	if(!QDELETED(src))
+	var/turf/open/floor/floor = target_turf
+	var/was_replacing = replacetiles
+
+	if(floor.broken || floor.burnt || isplatingturf(floor))
+		toggle_magnet()
+		mode = BOT_REPAIRING
+		visible_message(span_notice("[src] begins [(floor.broken || floor.burnt) ? "repairing the floor" : "placing a floor tile"]."))
+		if(!do_after(src, 5 SECONDS, target = floor) && mode == BOT_REPAIRING)
+			go_idle()
+			return
+	else if(replacetiles && tilestack && floor.type != tilestack.turf_type)
+		toggle_magnet()
+		mode = BOT_REPAIRING
+		visible_message(span_notice("[src] begins replacing the floor tiles."))
+		if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING && tilestack)
+			go_idle()
+			return
+
+	var/area/is_this_maints = get_area(floor)
+	if(was_replacing && tilestack)	//turn the tile into plating (if needed), then replace it
+		floor = floor.make_plating(TRUE) || floor
+		tilestack.place_tile(floor, src)
+		if(!tilestack)
+			speak("Requesting refill of custom floor tiles to continue replacing.")
 		go_idle()
+		return
+
+	if(floor.broken || floor.burnt)	//repair the tile and reset it to be undamaged (rather than replacing it)
+		floor.broken = FALSE
+		floor.burnt = FALSE
+		floor.update_appearance()
+		go_idle()
+		return
+
+	if(istype(is_this_maints, /area/station/maintenance))	//place catwalk if it's plating and we're in maints
+		floor.place_on_top(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
+		go_idle()
+		return
+
+	//place normal tile if it's plating anywhere else
+	floor = floor.make_plating(TRUE) || floor
+	floor.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
+	go_idle()
 
 /mob/living/simple_animal/bot/floorbot/update_icon_state()
 	. = ..()
@@ -396,13 +410,23 @@
 	new /obj/item/stack/tile/iron/base(Tsec, 1)
 	return ..()
 
-/mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
+/mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/target, proximity_flag, list/modifiers)
 	if(!can_unarmed_attack())
 		return
-	if(isturf(A))
-		repair(A)
+
+	if (!isturf(target))
+		return ..()
+
+	if(!(bot_cover_flags & BOT_COVER_EMAGGED) || !isfloorturf(target))
+		repair(target)
+		return
+
+	var/turf/open/floor/floor = target
+	if(isplatingturf(floor))
+		floor.attempt_lattice_replacement()
 	else
-		..()
+		floor.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+	audible_message(span_danger("[src] makes an excited booping sound."))
 
 /**
  * Checks a given turf to see if another floorbot is there, working as well.
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 39db78fdffb1d..f3194e88b1862 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -48,9 +48,8 @@
 	///Number of times retried a blocked path
 	var/blockcount = 0
 
-	var/auto_return = TRUE /// true if auto return to home beacon after unload
-	var/auto_pickup = TRUE /// true if auto-pickup at beacon
-	var/report_delivery = TRUE /// true if bot will announce an arrival to a location.
+	///flags of mulebot mode
+	var/mulebot_delivery_flags = MULEBOT_RETURN_MODE | MULEBOT_AUTO_PICKUP_MODE | MULEBOT_REPORT_DELIVERY_MODE
 
 	var/obj/item/stock_parts/power_store/cell /// Internal Powercell
 	var/cell_move_power_usage = 1///How much power we use when we move.
@@ -113,7 +112,6 @@
 /mob/living/simple_animal/bot/mulebot/Destroy()
 	UnregisterSignal(src, list(COMSIG_MOB_BOT_PRE_STEP, COMSIG_MOB_CLIENT_PRE_MOVE, COMSIG_MOB_BOT_STEP, COMSIG_MOB_CLIENT_MOVED))
 	unload(0)
-	QDEL_NULL(wires)
 	QDEL_NULL(cell)
 	return ..()
 
@@ -262,7 +260,7 @@
 
 /mob/living/simple_animal/bot/mulebot/ui_data(mob/user)
 	var/list/data = list()
-	data["on"] = bot_mode_flags & BOT_MODE_ON
+	data["powerStatus"] = bot_mode_flags & BOT_MODE_ON
 	data["locked"] = bot_cover_flags & BOT_COVER_LOCKED
 	data["siliconUser"] = HAS_SILICON_ACCESS(user)
 	data["mode"] = mode ? "[mode]" : "Ready"
@@ -275,18 +273,17 @@
 		if(BOT_NO_ROUTE)
 			data["modeStatus"] = "bad"
 	data["load"] = get_load_name()
-	data["destination"] = destination ? destination : null
-	data["home"] = home_destination
-	data["destinations"] = GLOB.deliverybeacontags
-	data["cell"] = cell ? TRUE : FALSE
-	data["cellPercent"] = cell ? cell.percent() : null
-	data["autoReturn"] = auto_return
-	data["autoPickup"] = auto_pickup
-	data["reportDelivery"] = report_delivery
-	data["id"] = id
-	data["allow_possession"] = bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT
-	data["possession_enabled"] = can_be_possessed
-	data["pai_inserted"] = !!paicard
+	data["destination"] = destination
+	data["homeDestination"] = home_destination
+	data["destinationsList"] = GLOB.deliverybeacontags
+	data["cellPercent"] = cell?.percent()
+	data["autoReturn"] = mulebot_delivery_flags & MULEBOT_RETURN_MODE
+	data["autoPickup"] = mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE
+	data["reportDelivery"] = mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE
+	data["botId"] = id
+	data["allowPossession"] = bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT
+	data["possessionEnabled"] = can_be_possessed
+	data["paiInserted"] = !!paicard
 	return data
 
 /mob/living/simple_animal/bot/mulebot/ui_act(action, params)
@@ -352,11 +349,11 @@
 				else
 					unload(0)
 		if("autoret")
-			auto_return = !auto_return
+			mulebot_delivery_flags ^= MULEBOT_RETURN_MODE
 		if("autopick")
-			auto_pickup = !auto_pickup
+			mulebot_delivery_flags ^= MULEBOT_AUTO_PICKUP_MODE
 		if("report")
-			report_delivery = !report_delivery
+			mulebot_delivery_flags ^= MULEBOT_REPORT_DELIVERY_MODE
 
 /mob/living/simple_animal/bot/mulebot/proc/buzz(type)
 	switch(type)
@@ -433,8 +430,8 @@
 		return TRUE
 
 /mob/living/simple_animal/bot/mulebot/post_unbuckle_mob(mob/living/M)
-		load = null
-		return ..()
+	load = null
+	return ..()
 
 // called to unload the bot
 // argument is optional direction to unload
@@ -637,12 +634,12 @@
 				radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us.
 
 		if(load) // if loaded, unload at target
-			if(report_delivery)
+			if(mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE)
 				speak("Destination [RUNECHAT_BOLD("[destination]")] reached. Unloading [load].",radio_channel)
 			unload(loaddir)
 		else
 			// not loaded
-			if(auto_pickup) // find a crate
+			if(mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE) // find a crate
 				var/atom/movable/AM
 				if(wires.is_cut(WIRE_LOADCHECK)) // if hacked, load first unanchored thing we find
 					for(var/atom/movable/A in get_step(loc, loaddir))
@@ -653,11 +650,11 @@
 					AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir)
 				if(AM?.Adjacent(src))
 					load(AM)
-					if(report_delivery)
+					if(mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE)
 						speak("Now loading [load] at [RUNECHAT_BOLD("[get_area_name(src)]")].", radio_channel)
 		// whatever happened, check to see if we return home
 
-		if(auto_return && home_destination && destination != home_destination)
+		if((mulebot_delivery_flags & MULEBOT_RETURN_MODE) && home_destination && destination != home_destination)
 			// auto return set and not at home already
 			start_home()
 			mode = BOT_BLOCKED
@@ -757,7 +754,6 @@
 	new /obj/item/stack/cable_coil/cut(Tsec)
 	if(cell)
 		cell.forceMove(Tsec)
-		cell.update_appearance()
 		cell = null
 
 	new /obj/effect/decal/cleanable/oil(loc)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index a71b9f76af399..d51a586224603 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -188,6 +188,10 @@
 	plane = GAME_PLANE
 	var/explode_hit_objects = TRUE
 
+/obj/projectile/colossus/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile)
+
 /obj/projectile/colossus/can_hit_target(atom/target, direct_target = FALSE, ignore_loc = FALSE, cross_failed = FALSE)
 	if(isliving(target))
 		direct_target = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index e8a6cbfe51d5e..2d16cc169202a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -12,7 +12,7 @@
  *
  *It acts as a melee creature, chasing down and attacking its target while also using different attacks to augment its power that increase as it takes damage.
  *
- *Whenever possible, the drake will breathe fire directly at it's target, igniting and heavily damaging anything caught in the blast.
+ *Whenever possible, the drake will breathe fire directly at its target, igniting and heavily damaging anything caught in the blast.
  *It also often causes lava to pool from the ground around you - many nearby turfs will temporarily turn into lava, dealing damage to anything on the turfs.
  *The drake also utilizes its wings to fly into the sky, flying after its target and attempting to slam down on them. Anything near when it slams down takes huge damage.
  *Sometimes it will chain these swooping attacks over and over, making swiftness a necessity.
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index 464636cbb204d..8b3a6b253e6dc 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -8,7 +8,7 @@ Difficulty: Hard
 
 /mob/living/simple_animal/hostile/megafauna/wendigo
 	name = "wendigo"
-	desc = "A mythological man-eating legendary creature, the sockets of it's eyes track you with an unsatiated hunger."
+	desc = "A mythological man-eating legendary creature, the sockets of its eyes track you with an unsatiated hunger."
 	health = 2500
 	maxHealth = 2500
 	icon_state = "wendigo"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
index f7d86c350deef..bb3b6874f043c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
@@ -7,8 +7,8 @@
  * # Goliath Broodmother
  *
  * A stronger, faster variation of the goliath.  Has the ability to spawn baby goliaths, which it can later detonate at will.
- * When it's health is below half, tendrils will spawn randomly around it.  When it is below a quarter of health, this effect is doubled.
- * It's attacks are as follows:
+ * When its health is below half, tendrils will spawn randomly around it.  When it is below a quarter of health, this effect is doubled.
+ * Its attacks are as follows:
  * - Spawns a 3x3/plus shape of tentacles on the target location
  * - Spawns 2 baby goliaths on its tile, up to a max of 8.  Children blow up when they die.
  * - The broodmother lets out a noise, and is able to move faster for 6.5 seconds.
@@ -167,7 +167,7 @@
 //The goliath's children.  Pretty weak, simple mobs which are able to put a single tentacle under their target when at range.
 /mob/living/simple_animal/hostile/asteroid/elite/broodmother_child
 	name = "baby goliath"
-	desc = "A young goliath recently born from it's mother.  While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
+	desc = "A young goliath recently born from its mother.  While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
 	icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi'
 	icon_state = "goliath_baby"
 	icon_living = "goliath_baby"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
index 9f162e0cfdc77..0a01777fb1fd7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
@@ -6,9 +6,9 @@
 /**
  * # Herald
  *
- * A slow-moving projectile user with a few tricks up it's sleeve.  Less unga-bunga than Colossus, with more cleverness in it's fighting style.
- * As it's health gets lower, the amount of projectiles fired per-attack increases.
- * It's attacks are as follows:
+ * A slow-moving projectile user with a few tricks up its sleeve.  Less unga-bunga than Colossus, with more cleverness in its fighting style.
+ * As its health gets lower, the amount of projectiles fired per-attack increases.
+ * Its attacks are as follows:
  * - Fires three projectiles in a given direction.
  * - Fires a spread in every cardinal and diagonal direction at once, then does it again after a bit.
  * - Shoots a single, golden bolt.  Wherever it lands, the herald will be teleported to the location.
@@ -232,6 +232,10 @@
 	damage_type = BRUTE
 	pass_flags = PASSTABLE
 
+/obj/projectile/herald/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile)
+
 /obj/projectile/herald/on_hit(atom/target, blocked = 0, pierce_hit)
 	if(ismob(target) && ismob(firer))
 		var/mob/living/mob_target = target
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
index 1ec573dbd6c56..ba9e8daa99621 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
@@ -7,12 +7,12 @@
  * # Legionnaire
  *
  * A towering skeleton, embodying the power of Legion.
- * As it's health gets lower, the head does more damage.
- * It's attacks are as follows:
+ * As its health gets lower, the head does more damage.
+ * Its attacks are as follows:
  * - Charges at the target after a telegraph, throwing them across the arena should it connect.
- * - Legionnaire's head detaches, attacking as it's own entity.  Has abilities of it's own later into the fight.  Once dead, regenerates after a brief period.  If the skill is used while the head is off, it will be killed.
+ * - Legionnaire's head detaches, attacking as its own entity.  Has abilities of its own later into the fight.  Once dead, regenerates after a brief period.  If the skill is used while the head is off, it will be killed.
  * - Leaves a pile of bones at your location.  Upon using this skill again, you'll swap locations with the bone pile.
- * - Spews a cloud of smoke from it's maw, wherever said maw is.
+ * - Spews a cloud of smoke from its maw, wherever said maw is.
  * A unique fight incorporating the head mechanic of legion into a whole new beast.  Combatants will need to make sure the tag-team of head and body don't lure them into a deadly trap.
  */
 
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index a9babf2eccafa..33bcb4dc9d704 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -7,8 +7,8 @@
  * # Pandora
  *
  * A box with a similar design to the Hierophant which trades large, single attacks for more frequent smaller ones.
- * As it's health gets lower, the time between it's attacks decrease.
- * It's attacks are as follows:
+ * As its health gets lower, the time between its attacks decrease.
+ * Its attacks are as follows:
  * - Fires hierophant blasts in a straight line.  Can only fire in a straight line in 8 directions, being the diagonals and cardinals.
  * - Creates a box of hierophant blasts around the target.  If they try to run away to avoid it, they'll very likely get hit.
  * - Teleports the pandora from one location to another, almost identical to Hierophant.
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
index 0b163124a8e7c..57b49047436ee 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
@@ -1,6 +1,6 @@
 /mob/living/simple_animal/hostile/asteroid/polarbear
 	name = "polar bear"
-	desc = "An aggressive animal that defends it's territory with incredible power. These beasts don't run from their enemies."
+	desc = "An aggressive animal that defends its territory with incredible power. These beasts don't run from their enemies."
 	icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi'
 	icon_state = "polarbear"
 	icon_living = "polarbear"
diff --git a/code/modules/mob/living/sneeze.dm b/code/modules/mob/living/sneeze.dm
index b2cf76c25a6b0..4c38027fda0d8 100644
--- a/code/modules/mob/living/sneeze.dm
+++ b/code/modules/mob/living/sneeze.dm
@@ -57,6 +57,7 @@
 	spread = 40
 	damage_type = BRUTE
 	damage = 0
+	hitsound = null
 
 	/// Call this when we hit something
 	var/datum/callback/sneezie_callback
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index a4964add6c865..d017a2acca1be 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -8,7 +8,7 @@
  * * sets lastKnownIP
  * * sets computer_id
  * * logs the login
- * * tells the world to update it's status (for player count)
+ * * tells the world to update its status (for player count)
  * * create mob huds for the mob if needed
  * * reset next_move to 1
  * * Set statobj to our mob
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index dd651085d91fe..c90c81b6ce43d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -92,6 +92,7 @@
 		AA.onNewMob(src)
 	set_nutrition(rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX))
 	. = ..()
+	setup_hud_traits()
 	update_config_movespeed()
 	initialize_actionspeed()
 	update_movespeed(TRUE)
@@ -1598,3 +1599,18 @@
 /mob/key_down(key, client/client, full_key)
 	..()
 	SEND_SIGNAL(src, COMSIG_MOB_KEYDOWN, key, client, full_key)
+
+/mob/proc/setup_hud_traits()
+	for(var/hud_trait in GLOB.trait_to_hud)
+		RegisterSignal(src, SIGNAL_ADDTRAIT(hud_trait), PROC_REF(hud_trait_enabled))
+		RegisterSignal(src, SIGNAL_REMOVETRAIT(hud_trait), PROC_REF(hud_trait_disabled))
+
+/mob/proc/hud_trait_enabled(datum/source, new_trait)
+	SIGNAL_HANDLER
+	var/datum/atom_hud/datahud = GLOB.huds[GLOB.trait_to_hud[new_trait]]
+	datahud.show_to(src)
+
+/mob/proc/hud_trait_disabled(datum/source, new_trait)
+	SIGNAL_HANDLER
+	var/datum/atom_hud/datahud = GLOB.huds[GLOB.trait_to_hud[new_trait]]
+	datahud.hide_from(src)
diff --git a/code/modules/mob/mob_update_icons.dm b/code/modules/mob/mob_update_icons.dm
index a355a385d9faa..b14da72e83061 100644
--- a/code/modules/mob/mob_update_icons.dm
+++ b/code/modules/mob/mob_update_icons.dm
@@ -54,6 +54,8 @@
 		update_worn_shoes(update_obscured = FALSE)
 	if(obscured_flags & HIDEMASK)
 		update_worn_mask(update_obscured = FALSE)
+	if(obscured_flags & HIDEBELT)
+		update_worn_belt(update_obscured = FALSE)
 	if(obscured_flags & HIDEEARS)
 		update_worn_ears(update_obscured = FALSE)
 	if(obscured_flags & HIDEEYES)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 5d46f3c0dc06a..28de95ff94dd5 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -17,7 +17,7 @@
 
 	//Make mob invisible and spawn animation
 	ADD_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
-	Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
+	Stun(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
 	icon = null
 	cut_overlays()
 
@@ -29,12 +29,12 @@
 
 /mob/living/carbon/proc/finish_monkeyize()
 	transformation_timer = null
-	to_chat(src, span_boldnotice("You are now a monkey."))
 	REMOVE_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
 	icon = initial(icon)
 	RemoveInvisibility(type)
 	set_species(/datum/species/monkey)
-	name = "monkey"
+	to_chat(src, span_boldnotice("You are now \a [dna.species.name]."))
+	name = LOWER_TEXT(dna.species.name)
 	regenerate_icons()
 	set_name()
 	SEND_SIGNAL(src, COMSIG_HUMAN_MONKEYIZE)
@@ -57,7 +57,7 @@
 
 	//Make mob invisible and spawn animation
 	ADD_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
-	Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
+	Stun(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
 	icon = null
 	cut_overlays()
 
@@ -70,15 +70,15 @@
 
 /mob/living/carbon/proc/finish_humanize(species = /datum/species/human)
 	transformation_timer = null
-	to_chat(src, span_boldnotice("You are now a human."))
 	REMOVE_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
 	icon = initial(icon)
 	RemoveInvisibility(type)
 	set_species(species)
+	to_chat(src, span_boldnotice("You are now \a [dna.species.name]."))
 	SEND_SIGNAL(src, COMSIG_MONKEY_HUMANIZE)
 	return src
 
-/mob/living/carbon/human/finish_humanize(species = /datum/species/human, instant = FALSE)
+/mob/living/carbon/human/finish_humanize(species = /datum/species/human)
 	underwear = "Nude"
 	undershirt = "Nude"
 	socks = "Nude"
diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm
index ca7be41ec426f..16ce70df94563 100644
--- a/code/modules/mod/mod_construction.dm
+++ b/code/modules/mod/mod_construction.dm
@@ -92,6 +92,9 @@
 	desc = "[desc] [used_theme.desc]"
 	icon_state = "[used_theme.default_skin]-plating"
 
+/obj/item/mod/construction/plating/civilian
+	theme = /datum/mod_theme/civilian
+
 /obj/item/mod/construction/plating/engineering
 	theme = /datum/mod_theme/engineering
 
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 3b47453ef374f..78ff7e9952bd1 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -116,7 +116,6 @@
 		uninstall(module, deleting = TRUE)
 	if(core)
 		QDEL_NULL(core)
-	QDEL_NULL(wires)
 	QDEL_NULL(mod_link)
 	for(var/datum/mod_part/part_datum as anything in get_part_datums(all = TRUE))
 		part_datum.part_item = null
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index 0c13efa1b950c..5f93427f53277 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -173,7 +173,6 @@
 /obj/item/mod/core/standard/proc/uninstall_cell()
 	if(!cell)
 		return
-	cell.update_appearance()
 	cell = null
 	mod.update_charge_alert()
 
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 8978a4113719d..394ddea0ecdea 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -83,37 +83,6 @@
 				SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
 			),
 		),
-		"civilian" = list(
-			/obj/item/clothing/head/mod = list(
-				UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
-				UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
-				UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
-				UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
-				SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
-			),
-			/obj/item/clothing/suit/mod = list(
-				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
-				SEALED_INVISIBILITY = HIDEJUMPSUIT,
-				UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
-				SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
-			),
-			/obj/item/clothing/gloves/mod = list(
-				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
-				CAN_OVERSLOT = TRUE,
-				UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
-				SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
-			),
-			/obj/item/clothing/shoes/mod = list(
-				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
-				CAN_OVERSLOT = TRUE,
-				UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
-				SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
-			),
-		),
 	)
 
 #ifdef UNIT_TESTS
@@ -210,6 +179,58 @@
 	acid = 25
 	wound = 5
 
+/datum/mod_theme/civilian
+	name = "civilian"
+	desc = "A light-weight civilian suit that offers unmatched ease of movement but no protection from the vacuum of space."
+	extended_desc = "An experimental design by Nakamura Engineering, intended to be marketed towards planet-bound customers. \
+		This model sacrifices the protection from biological and chemical threats and the vacuum of space in exchange for \
+		vastly improved mobility. Due to the slimmed-down profile, it also has less capacity for modifications compared to \
+		mainline models."
+	default_skin = "civilian"
+	armor_type = /datum/armor/mod_theme_civilian
+	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+	complexity_max = DEFAULT_MAX_COMPLEXITY - 3
+	slowdown_inactive = 0.5
+	slowdown_active = 0
+	variants = list(
+		"civilian" = list(
+			/obj/item/clothing/head/mod = list(
+				UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+				UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
+				SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
+			),
+			/obj/item/clothing/suit/mod = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT,
+				UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
+				SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
+			),
+			/obj/item/clothing/gloves/mod = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				CAN_OVERSLOT = TRUE,
+				UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
+				SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
+			),
+			/obj/item/clothing/shoes/mod = list(
+				UNSEALED_CLOTHING = THICKMATERIAL,
+				CAN_OVERSLOT = TRUE,
+				UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
+				SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
+			),
+		),
+	)
+
+/datum/armor/mod_theme_civilian
+	melee = 5
+	bullet = 5
+	laser = 5
+	energy = 5
+	bio = 50
+	fire = 25
+	acid = 25
+	wound = 5
+
 /datum/mod_theme/engineering
 	name = "engineering"
 	desc = "An engineer-fit suit with heat and shock resistance. Nakamura Engineering's classic."
@@ -458,21 +479,21 @@
 			),
 			/obj/item/clothing/suit/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
-				SEALED_INVISIBILITY = HIDEJUMPSUIT,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT|HIDEBELT,
 				UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
 			),
 			/obj/item/clothing/gloves/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
 				CAN_OVERSLOT = TRUE,
 				UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
 			),
 			/obj/item/clothing/shoes/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
 				CAN_OVERSLOT = TRUE,
 				UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
@@ -481,7 +502,7 @@
 		"asteroid" = list(
 			/obj/item/clothing/head/mod = list(
 				UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|HEADINTERNALS,
 				UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
 				SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
 				SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
@@ -490,21 +511,21 @@
 			),
 			/obj/item/clothing/suit/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
-				SEALED_INVISIBILITY = HIDEJUMPSUIT,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
+				SEALED_INVISIBILITY = HIDEJUMPSUIT|HIDEBELT,
 				UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
 			),
 			/obj/item/clothing/gloves/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
 				CAN_OVERSLOT = TRUE,
 				UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
 			),
 			/obj/item/clothing/shoes/mod = list(
 				UNSEALED_CLOTHING = THICKMATERIAL,
-				SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
+				SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE,
 				CAN_OVERSLOT = TRUE,
 				UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
 				SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
@@ -512,7 +533,7 @@
 		),
 	)
 
-/datum/mod_theme/loader/New()
+/datum/mod_theme/mining/New()
 	.=..()
 	allowed_suit_storage = GLOB.mining_suit_allowed
 
@@ -1866,7 +1887,7 @@
 	extended_desc = "A bulky and only legal by technicality suit, this ominous black and red MODsuit is only worn by \
 		Nanotrasen Black Ops teams. If you can see this suit, you fucked up. A collaborative joint effort between \
 		Apadyne and Nanotrasen the construction and modules gives the user robust protection against \
-		anything that can be thrown at it, along with acute combat awareness tools for it's wearer. \
+		anything that can be thrown at it, along with acute combat awareness tools for its wearer. \
 		Whether the wearer uses it or not is up to them. \
 		There seems to be a little inscription on the wrist that reads; \'squiddie', d'aww."
 	default_skin = "apocryphal"
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index b74f05408a0a1..db9d150f3438a 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -46,6 +46,14 @@
 		/obj/item/mod/module/flashlight,
 	)
 
+/obj/item/mod/control/pre_equipped/civilian
+	theme = /datum/mod_theme/civilian
+	applied_modules = list(
+		/obj/item/mod/module/storage,
+		/obj/item/mod/module/welding,
+		/obj/item/mod/module/flashlight,
+	)
+
 /obj/item/mod/control/pre_equipped/engineering
 	theme = /datum/mod_theme/engineering
 	applied_modules = list(
@@ -115,7 +123,7 @@
 	theme = /datum/mod_theme/mining
 	applied_core = /obj/item/mod/core/plasma
 	applied_modules = list(
-		/obj/item/mod/module/storage,
+		/obj/item/mod/module/storage/large_capacity,
 		/obj/item/mod/module/gps,
 		/obj/item/mod/module/orebag,
 		/obj/item/mod/module/clamp,
@@ -171,6 +179,9 @@
 		/obj/item/mod/module/quick_cuff,
 		/obj/item/mod/module/headprotector,
 	)
+	default_pins = list(
+		/obj/item/mod/module/jetpack,
+	)
 
 /obj/item/mod/control/pre_equipped/safeguard
 	theme = /datum/mod_theme/safeguard
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 81a266f8ff41a..9048701f1d017 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -180,6 +180,7 @@
 	if(playsound)
 		playsound(grabbed_atom, 'sound/effects/empulse.ogg', 75, TRUE)
 	STOP_PROCESSING(SSfastprocess, src)
+	UnregisterSignal(grabbed_atom, list(COMSIG_MOB_STATCHANGE, COMSIG_MOVABLE_SET_ANCHORED))
 	kinesis_catcher = null
 	mod.wearer.clear_fullscreen("kinesis")
 	grabbed_atom.cut_overlay(kinesis_icon)
@@ -265,7 +266,7 @@
 	name = "MOD kinesis+ module"
 	desc = "A modular plug-in to the forearm, this module was recently redeveloped in secret. \
 		The bane of all ne'er-do-wells, the kinesis+ module is a powerful tool that allows the user \
-		to manipulate the world around them. Like it's older counterpart, it's capable of manipulating \
+		to manipulate the world around them. Like its older counterpart, it's capable of manipulating \
 		structures, machinery, vehicles, and, thanks to the fruitful efforts of its creators - living beings."
 	complexity = 0
 	prebuilt = TRUE
diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm
index 64790eacb3bec..f0a92e3a05153 100644
--- a/code/modules/mod/modules/module_pathfinder.dm
+++ b/code/modules/mod/modules/module_pathfinder.dm
@@ -11,6 +11,7 @@
 		Nakamura Engineering swears up and down there's airbrakes."
 	icon_state = "pathfinder"
 	complexity = 1
+	module_type = MODULE_USABLE
 	use_energy_cost = DEFAULT_CHARGE_DRAIN * 10
 	incompatible_modules = list(/obj/item/mod/module/pathfinder)
 	required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT)
@@ -56,6 +57,21 @@
 	else
 		target.visible_message(span_notice("[user] implants [target]."), span_notice("[user] implants you with [implant]."))
 	playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
+	module_type = MODULE_PASSIVE
+
+/obj/item/mod/module/pathfinder/on_use()
+	. = ..()
+	if (!ishuman(mod.wearer) || !implant)
+		return
+	if(!implant.implant(mod.wearer, mod.wearer))
+		balloon_alert(mod.wearer, "can't implant!")
+		return
+	balloon_alert(mod.wearer, "implanted")
+	playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
+	module_type = MODULE_PASSIVE
+	var/datum/action/item_action/mod/pinnable/module/existing_action = pinned_to[REF(mod.wearer)]
+	if(existing_action)
+		mod.remove_item_action(existing_action)
 
 /obj/item/mod/module/pathfinder/proc/attach(mob/living/user)
 	if(!ishuman(user))
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 815cfb0a144bc..8db88e16ba312 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -174,9 +174,6 @@
 	required_slots = list(ITEM_SLOT_BACK)
 
 /obj/item/mod/module/jump_jet/on_use()
-	. = ..()
-	if (!.)
-		return FALSE
 	if (DOING_INTERACTION(mod.wearer, mod.wearer))
 		balloon_alert(mod.wearer, "busy!")
 		return
@@ -289,7 +286,6 @@
 	icon_state = "apparatus"
 	complexity = 1
 	incompatible_modules = list(/obj/item/mod/module/mouthhole)
-	overlay_state_inactive = "module_apparatus"
 	required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_MASK)
 	/// Former flags of the helmet.
 	var/former_helmet_flags = NONE
@@ -715,6 +711,7 @@
 		attached_hat = hat
 		var/obj/item/clothing/helmet = mod.get_part_from_slot(ITEM_SLOT_HEAD)
 		if(istype(helmet))
+			helmet.attach_clothing_traits(attached_hat.clothing_traits)
 			former_flags = helmet.flags_cover
 			former_visor_flags = helmet.visor_flags_cover
 			helmet.flags_cover |= attached_hat.flags_cover
@@ -737,11 +734,12 @@
 		balloon_alert(user, "hat removed")
 	else
 		balloon_alert_to_viewers("the hat falls to the floor!")
-	attached_hat = null
 	var/obj/item/clothing/helmet = mod.get_part_from_slot(ITEM_SLOT_HEAD)
 	if(istype(helmet))
+		helmet.detach_clothing_traits(attached_hat)
 		helmet.flags_cover = former_flags
 		helmet.visor_flags_cover = former_visor_flags
+	attached_hat = null
 	mod.wearer.update_clothing(mod.slot_flags)
 
 /obj/item/mod/module/hat_stabilizer/syndicate
@@ -863,16 +861,10 @@
 	return ..()
 
 /obj/item/mod/module/recycler/on_activation()
-	. = ..()
-	if(!.)
-		return
 	connector = AddComponent(/datum/component/connect_loc_behalf, mod.wearer, loc_connections)
 	RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved))
 
 /obj/item/mod/module/recycler/on_deactivation(display_message, deleting = FALSE)
-	. = ..()
-	if(!.)
-		return
 	QDEL_NULL(connector)
 	UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved))
 
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index 936c261dd2047..7a802cf0f6cda 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -212,15 +212,20 @@
 				continue
 			succeed = TRUE
 			break
-	if(succeed)
-		var/list/organs_to_boot_out = organ_receiver.get_organ_slot(organ.slot)
-		for(var/obj/item/organ/organ_evacced as anything in organs_to_boot_out)
-			if(organ_evacced.organ_flags & ORGAN_UNREMOVABLE)
-				continue
-			organ_evacced.Remove(target)
-			organ_evacced.forceMove(get_turf(target))
-		organ.Insert(target)
-	else
+
+	if(!succeed)
+		organ.forceMove(drop_location())
+		organ = null
+		return
+
+	var/list/organs_to_boot_out = organ_receiver.get_organ_slot(organ.slot)
+	for(var/obj/item/organ/organ_evacced as anything in organs_to_boot_out)
+		if(organ_evacced.organ_flags & ORGAN_UNREMOVABLE)
+			continue
+		organ_evacced.Remove(target, special = TRUE)
+		organ_evacced.forceMove(get_turf(target))
+
+	if (!organ.Insert(target))
 		organ.forceMove(drop_location())
 	organ = null
 
@@ -406,12 +411,21 @@
 		/datum/surgery/advanced/pacify,
 		/datum/surgery/healing/combo/upgraded/femto,
 		/datum/surgery/advanced/brainwashing,
+		/datum/surgery/advanced/brainwashing/mechanic,
 		/datum/surgery/advanced/bioware/nerve_splicing,
+		/datum/surgery/advanced/bioware/nerve_splicing/mechanic,
 		/datum/surgery/advanced/bioware/nerve_grounding,
+		/datum/surgery/advanced/bioware/nerve_grounding/mechanic,
 		/datum/surgery/advanced/bioware/vein_threading,
+		/datum/surgery/advanced/bioware/vein_threading/mechanic,
 		/datum/surgery/advanced/bioware/muscled_veins,
+		/datum/surgery/advanced/bioware/muscled_veins/mechanic,
 		/datum/surgery/advanced/bioware/ligament_hook,
+		/datum/surgery/advanced/bioware/ligament_hook/mechanic,
 		/datum/surgery/advanced/bioware/ligament_reinforcement,
+		/datum/surgery/advanced/bioware/ligament_reinforcement/mechanic,
 		/datum/surgery/advanced/bioware/cortex_imprint,
+		/datum/surgery/advanced/bioware/cortex_imprint/mechanic,
 		/datum/surgery/advanced/bioware/cortex_folding,
+		/datum/surgery/advanced/bioware/cortex_folding/mechanic,
 	)
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 0e0de691e030b..16f26a3052e65 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -37,7 +37,7 @@
 /obj/item/mod/module/stealth/proc/unstealth(datum/source)
 	SIGNAL_HANDLER
 
-	to_chat(mod.wearer, span_warning("[src] gets discharged from contact!"))
+	to_chat(mod.wearer, span_warning("[capitalize(src.name)] отключается от контакта!"))
 	do_sparks(2, TRUE, src)
 	drain_power(use_energy_cost)
 	deactivate()
@@ -72,15 +72,9 @@
 	cooldown_time = 3 SECONDS
 
 /obj/item/mod/module/stealth/ninja/on_activation()
-	. = ..()
-	if(!.)
-		return
 	ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT)
 
 /obj/item/mod/module/stealth/ninja/on_deactivation(display_message = TRUE, deleting = FALSE)
-	. = ..()
-	if(!.)
-		return
 	REMOVE_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT)
 
 ///Camera Vision - Prevents flashes, blocks tracking.
@@ -151,9 +145,9 @@
 
 /obj/item/mod/module/hacker/proc/charge_message(atom/drained_atom, drain_amount)
 	if(drain_amount)
-		to_chat(mod.wearer, span_notice("Gained <B>[drain_amount]</B> units of energy from [drained_atom]."))
+		to_chat(mod.wearer, span_notice("Получено <B>[drain_amount]</B> единиц энергии из [drained_atom.name]."))
 	else
-		to_chat(mod.wearer, span_warning("[drained_atom] has run dry of energy, you must find another source!"))
+		to_chat(mod.wearer, span_warning("У [drained_atom.name] закончилась энергия, вы должны найти другой источник!"))
 
 ///Weapon Recall - Teleports your katana to you, prevents gun use.
 /obj/item/mod/module/weapon_recall
@@ -177,32 +171,32 @@
 	var/accepted_type = /obj/item/energy_katana
 
 /obj/item/mod/module/weapon_recall/on_suit_activation()
-	ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+	mod.wearer.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
 
 /obj/item/mod/module/weapon_recall/on_suit_deactivation(deleting = FALSE)
-	REMOVE_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+	mod.wearer.remove_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
 
 /obj/item/mod/module/weapon_recall/on_use()
 	if(!linked_weapon)
 		var/obj/item/weapon_to_link = mod.wearer.is_holding_item_of_type(accepted_type)
 		if(!weapon_to_link)
-			balloon_alert(mod.wearer, "can't locate weapon!")
+			balloon_alert(mod.wearer, "не удается найти оружие!")
 			return
 		set_weapon(weapon_to_link)
-		balloon_alert(mod.wearer, "[linked_weapon.name] linked")
+		balloon_alert(mod.wearer, "[linked_weapon.name] связано")
 		return
 	if(linked_weapon in mod.wearer.get_all_contents())
-		balloon_alert(mod.wearer, "already on self!")
+		balloon_alert(mod.wearer, "уже у вас!")
 		return
 	var/distance = get_dist(mod.wearer, linked_weapon)
 	var/in_view = (linked_weapon in view(mod.wearer))
 	if(!in_view && !drain_power(use_energy_cost * distance))
-		balloon_alert(mod.wearer, "not enough charge!")
+		balloon_alert(mod.wearer, "недостаточно заряда!")
 		return
 	linked_weapon.forceMove(linked_weapon.drop_location())
 	if(in_view)
 		do_sparks(5, FALSE, linked_weapon)
-		mod.wearer.visible_message(span_danger("[linked_weapon] flies towards [mod.wearer]!"),span_warning("You hold out your hand and [linked_weapon] flies towards you!"))
+		mod.wearer.visible_message(span_danger("[capitalize(linked_weapon.name)] летит в сторону [mod.wearer]!"),span_warning("Вы протягиваете руку и [linked_weapon.name] летит к вам!"))
 		linked_weapon.throw_at(mod.wearer, distance+1, linked_weapon.throw_speed, mod.wearer)
 	else
 		recall_weapon()
@@ -216,16 +210,16 @@
 	linked_weapon.forceMove(get_turf(src))
 	var/alert = ""
 	if(mod.wearer.put_in_hands(linked_weapon))
-		alert = "[linked_weapon.name] teleports to your hand"
+		alert = "[linked_weapon.name] телепортируется в вашу руку"
 	else if(mod.wearer.equip_to_slot_if_possible(linked_weapon, ITEM_SLOT_BELT, disable_warning = TRUE))
-		alert = "[linked_weapon.name] sheathes itself in your belt"
+		alert = "[linked_weapon.name] закрепляется на вашем поясе"
 	else
-		alert = "[linked_weapon.name] teleports under you"
+		alert = "[linked_weapon.name] телепортируется под вас"
 	if(caught)
 		if(mod.wearer.is_holding(linked_weapon))
-			alert = "you catch [linked_weapon.name]"
+			alert = "вы ловите [linked_weapon.name]"
 		else
-			alert = "[linked_weapon.name] lands under you"
+			alert = "[linked_weapon.name] приземляется под вами"
 	else
 		do_sparks(5, FALSE, linked_weapon)
 	if(alert)
@@ -261,10 +255,10 @@
 	if(. != MOD_CANCEL_ACTIVATE || !isliving(user))
 		return
 	if(mod.ai_assistant == user)
-		to_chat(mod.ai_assistant, span_danger("<B>fATaL EERRoR</B>: 381200-*#00CODE <B>BLUE</B>\nAI INTErFERenCE DEtECted\nACTi0N DISrEGArdED"))
+		to_chat(mod.ai_assistant, span_danger("<B>фАТальНая ОШибкА</B>: 381200-*#00КОД <B>СИНИЙ</B>\nВМЕшАТЕльСТВО ИИ оБНаРуЖЕнно\nДЕЙСтВИе ОТМенЕно"))
 		return
 	var/mob/living/living_user = user
-	to_chat(living_user, span_danger("<B>fATaL EERRoR</B>: 382200-*#00CODE <B>RED</B>\nUNAUTHORIZED USE DETECteD\nCoMMENCING SUB-R0UTIN3 13...\nTERMInATING U-U-USER..."))
+	to_chat(living_user, span_danger("<B>фАТальНая ОШибкА</B>: 382200-*#00КОД <B>КРАСНЫЙ</B>\nОБНАруЖЕно НЕАВТОРИЗИРОВАННОЕ ИСпОЛЬзоВанИе\nНаЧАЛО ПОДР0СиСТЕМы3 13...\nУНИчТОЖЕНИЕ П-П-ПОЛЬЗОВАТЕЛЯ..."))
 	living_user.investigate_log("has been gibbed by using a MODsuit equipped with [src].", INVESTIGATE_DEATHS)
 	living_user.gib(DROP_ALL_REMAINS)
 
@@ -373,7 +367,7 @@
 	var/obj/item/mod/module/energy_net/module = net_module?.resolve()
 	if(module)
 		module.add_net(net)
-	firer?.visible_message(span_danger("[firer] caught [target] with an energy net!"), span_notice("You caught [target] with an energy net!"))
+	firer?.visible_message(span_danger("[firer] поймал [target] с помощью энергосетки!"), span_notice("Вы поймали [target] с помощью энергосетки!"))
 	if(target.buckled)
 		target.buckled.unbuckle_mob(target, force = TRUE)
 	net.buckle_mob(target, force = TRUE)
@@ -410,14 +404,14 @@
 
 /obj/item/mod/module/adrenaline_boost/used()
 	if(!reagents.has_reagent(reagent_required, reagent_required_amount))
-		balloon_alert(mod.wearer, "no charge!")
+		balloon_alert(mod.wearer, "нет заряда!")
 		return FALSE
 	return ..()
 
 /obj/item/mod/module/adrenaline_boost/on_use()
 	if(IS_SPACE_NINJA(mod.wearer))
 		mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
-	to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
+	to_chat(mod.wearer, span_notice("Вы использовали адреналиновый заряд."))
 	mod.wearer.SetAllImmobility(0)
 	mod.wearer.adjustStaminaLoss(-200)
 	mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter)
@@ -441,15 +435,15 @@
 	if(!attacking_item.is_open_container())
 		return FALSE
 	if(reagents.has_reagent(reagent_required, reagent_required_amount))
-		balloon_alert(mod.wearer, "already charged!")
+		balloon_alert(mod.wearer, "уже заряжен!")
 		return FALSE
 	if(!attacking_item.reagents.trans_to(src, reagent_required_amount, target_id = reagent_required))
 		return FALSE
-	balloon_alert(mod.wearer, "charge [reagents.has_reagent(reagent_required, reagent_required_amount) ? "fully" : "partially"] reloaded")
+	balloon_alert(mod.wearer, "заряд [reagents.has_reagent(reagent_required, reagent_required_amount) ? "полностью" : "частично"] перезаряжен")
 	return TRUE
 
 /obj/item/mod/module/adrenaline_boost/proc/boost_aftereffects(mob/affected_mob)
 	if(!affected_mob)
 		return
 	reagents.trans_to(affected_mob, reagents.total_volume)
-	to_chat(affected_mob, span_danger("You are beginning to feel the after-effect of the injection."))
+	to_chat(affected_mob, span_danger("Вы начинаете ощущать последствия инъекции."))
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 19150b8a4cd67..752273fa0748c 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -269,7 +269,7 @@
 	dispense_type = /obj/item/grenade/mirage
 
 /obj/item/mod/module/dispenser/mirage/on_use()
-	var/obj/item/grenade/mirage/grenade = .
+	var/obj/item/grenade/mirage/grenade = ..()
 	grenade.arm_grenade(mod.wearer)
 
 /obj/item/grenade/mirage
@@ -331,9 +331,6 @@
 	RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, PROC_REF(release_projectile))
 
 /obj/item/mod/module/projectile_dampener/on_deactivation(display_message, deleting = FALSE)
-	. = ..()
-	if(!.)
-		return
 	QDEL_NULL(dampening_field)
 
 /obj/item/mod/module/projectile_dampener/proc/dampen_projectile(datum/source, obj/projectile/projectile)
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index 0e2bffd0aa6a7..18c1ac6926763 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -499,6 +499,7 @@
 	mod.wearer.add_traits(user_traits, MOD_TRAIT)
 	mod.wearer.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
 	mod.wearer.AddElement(/datum/element/footstep, FOOTSTEP_OBJ_ROBOT, 1, -6, sound_vary = TRUE)
+	mod.wearer.add_movespeed_mod_immunities(MOD_TRAIT, /datum/movespeed_modifier/damage_slowdown)
 	mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere)
 	RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange))
 
@@ -560,6 +561,7 @@
 	light_power = 1
 	light_color = COLOR_LIGHT_ORANGE
 	embed_type = null
+	can_hit_turfs = TRUE
 
 /obj/projectile/bullet/mining_bomb/Initialize(mapload)
 	. = ..()
diff --git a/code/modules/mod/modules/modules_visor.dm b/code/modules/mod/modules/modules_visor.dm
index 4527fa631a65c..6a1d61ea7ef0d 100644
--- a/code/modules/mod/modules/modules_visor.dm
+++ b/code/modules/mod/modules/modules_visor.dm
@@ -10,23 +10,15 @@
 	incompatible_modules = list(/obj/item/mod/module/visor)
 	cooldown_time = 0.5 SECONDS
 	required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_EYES|ITEM_SLOT_MASK)
-	/// The HUD type given by the visor.
-	var/hud_type
 	/// The traits given by the visor.
 	var/list/visor_traits = list()
 
 /obj/item/mod/module/visor/on_activation()
-	if(hud_type)
-		var/datum/atom_hud/hud = GLOB.huds[hud_type]
-		hud.show_to(mod.wearer)
 	if(length(visor_traits))
 		mod.wearer.add_traits(visor_traits, MOD_TRAIT)
 	mod.wearer.update_sight()
 
 /obj/item/mod/module/visor/on_deactivation(display_message = TRUE, deleting = FALSE)
-	if(hud_type)
-		var/datum/atom_hud/hud = GLOB.huds[hud_type]
-		hud.hide_from(mod.wearer)
 	if(length(visor_traits))
 		mod.wearer.remove_traits(visor_traits, MOD_TRAIT)
 	mod.wearer.update_sight()
@@ -38,7 +30,6 @@
 		biological scanning suite, allowing the user to visualize the current health of organic lifeforms, as well as \
 		access data such as patient files in a convenient readout. They say these also let you see behind you."
 	icon_state = "medhud_visor"
-	hud_type = DATA_HUD_MEDICAL_ADVANCED
 	visor_traits = list(TRAIT_MEDICAL_HUD)
 
 //Diagnostic Visor - Gives you a diagnostic HUD.
@@ -48,8 +39,7 @@
 		from advanced machinery, exosuits, and other devices, allowing the user to visualize current power levels \
 		and integrity of such. They say these also let you see behind you."
 	icon_state = "diaghud_visor"
-	hud_type = DATA_HUD_DIAGNOSTIC_ADVANCED
-	visor_traits = list(TRAIT_DIAGNOSTIC_HUD)
+	visor_traits = list(TRAIT_DIAGNOSTIC_HUD, TRAIT_BOT_PATH_HUD)
 
 //Security Visor - Gives you a security HUD.
 /obj/item/mod/module/visor/sechud
@@ -58,7 +48,6 @@
 		plugged into various criminal databases to be able to view arrest records, command simple security-oriented robots, \
 		and generally know who to shoot. They say these also let you see behind you."
 	icon_state = "sechud_visor"
-	hud_type = DATA_HUD_SECURITY_ADVANCED
 	visor_traits = list(TRAIT_SECURITY_HUD)
 
 //Meson Visor - Gives you meson vision.
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 1ece8577d3c6b..08bd61945ef47 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -80,8 +80,8 @@
 	var/base_idle_power_usage = 1 WATTS
 
 	// Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet)
-	// must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
-	// If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
+	// must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently
+	// If you create a program which is limited to Laptops and Consoles you don't have to add its icon_state overlay for Tablets too, for example.
 
 	///If set, what the icon_state will be if the computer is unpowered.
 	var/icon_state_unpowered
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index f1fced454e4d3..b40ae45f27f91 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -140,6 +140,11 @@
 
 	return . || NONE
 
+/obj/item/modular_computer/pda/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+	if(iscash(interacting_with))
+		return money_act(user,interacting_with)
+	return NONE
+
 /obj/item/modular_computer/pda/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
 	. = ..()
 	if(.)
diff --git a/code/modules/modular_computers/file_system/programs/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm
index ddd962ec0e335..97f7e252e583c 100644
--- a/code/modules/modular_computers/file_system/programs/atmosscan.dm
+++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm
@@ -27,7 +27,7 @@
 	on_analyze(source=source, target=get_turf(computer))
 	return COMPONENT_CANCEL_ATTACK_CHAIN
 
-/// Keep this in sync with it's tool based counterpart [/obj/proc/analyzer_act] and [/atom/proc/tool_act]
+/// Keep this in sync with its tool based counterpart [/obj/proc/analyzer_act] and [/atom/proc/tool_act]
 /datum/computer_file/program/atmosscan/tap(atom/A, mob/living/user, params)
 	if(atmozphere_mode != ATMOZPHERE_SCAN_CLICK)
 		return FALSE
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
index 540880c335505..16e643d4d38bd 100644
--- a/code/modules/modular_computers/file_system/programs/powermonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -42,7 +42,7 @@
 	attached_wire_ref = WEAKREF(locate(/obj/structure/cable) in T)
 	if(attached_wire_ref)
 		return
-	var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+	var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull its powernet instead
 	if(!A)
 		return
 	var/obj/machinery/power/apc/local_apc = A.apc
diff --git a/code/modules/modular_computers/file_system/programs/robocontrol.dm b/code/modules/modular_computers/file_system/programs/robocontrol.dm
index 1f4538274df1d..7ca907d844ab0 100644
--- a/code/modules/modular_computers/file_system/programs/robocontrol.dm
+++ b/code/modules/modular_computers/file_system/programs/robocontrol.dm
@@ -53,9 +53,9 @@
 				"dest" = simple_mulebot.destination,
 				"power" = simple_mulebot.cell ? simple_mulebot.cell.percent() : 0,
 				"home" = simple_mulebot.home_destination,
-				"autoReturn" = simple_mulebot.auto_return,
-				"autoPickup" = simple_mulebot.auto_pickup,
-				"reportDelivery" = simple_mulebot.report_delivery,
+				"autoReturn" = simple_mulebot.mulebot_delivery_flags & MULEBOT_RETURN_MODE,
+				"autoPickup" = simple_mulebot.mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE,
+				"reportDelivery" = simple_mulebot.mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE,
 				"mule_ref" = REF(simple_mulebot),
 				"load" = simple_mulebot.get_load_name(),
 			))
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index f37bf683ceb8d..7aa35351dcf48 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -209,7 +209,7 @@
 
 	var/list/visible_turfs = list()
 
-	// Get the camera's turf to correctly gather what's visible from it's turf, in case it's located in a moving object (borgs / mechs)
+	// Get the camera's turf to correctly gather what's visible from its turf, in case it's located in a moving object (borgs / mechs)
 	var/new_cam_turf = get_turf(active_camera)
 
 	// If we're not forcing an update for some reason and the cameras are in the same location,
diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm
index 55281648ed55e..f59d8f08a2799 100644
--- a/code/modules/modular_computers/file_system/programs/techweb.dm
+++ b/code/modules/modular_computers/file_system/programs/techweb.dm
@@ -50,6 +50,7 @@
 		return data
 	data += list(
 		"nodes" = list(),
+		"queue_nodes" = stored_research.research_queue_nodes,
 		"experiments" = list(),
 		"researched_designs" = stored_research.researched_designs,
 		"points" = stored_research.research_points,
@@ -64,6 +65,10 @@
 	// Serialize all nodes to display
 	for(var/tier in stored_research.tiers)
 		var/datum/techweb_node/node = SSresearch.techweb_node_by_id(tier)
+		var/enqueued_by_user = FALSE
+
+		if((tier in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[tier] == user)
+			enqueued_by_user = TRUE
 
 		// Ensure node is supposed to be visible
 		if (stored_research.hidden_nodes[tier])
@@ -71,8 +76,11 @@
 
 		data["nodes"] += list(list(
 			"id" = node.id,
+			"is_free" = node.is_free(stored_research),
 			"can_unlock" = stored_research.can_unlock_node(node),
-			"tier" = stored_research.tiers[node.id]
+			"have_experiments_done" = stored_research.have_experiments_for_node(node),
+			"tier" = stored_research.tiers[node.id],
+			"enqueued_by_user" = enqueued_by_user
 		))
 
 	// Get experiments and serialize them
@@ -111,6 +119,12 @@
 		if ("researchNode")
 			research_node(params["node_id"], usr)
 			return TRUE
+		if ("enqueueNode")
+			enqueue_node(params["node_id"], usr)
+			return TRUE
+		if ("dequeueNode")
+			dequeue_node(params["node_id"], usr)
+			return TRUE
 
 /datum/computer_file/program/science/ui_static_data(mob/user)
 	. = list(
@@ -188,6 +202,20 @@
 		id_cache_seq += 1
 	return id_cache[id]
 
+/datum/computer_file/program/science/proc/enqueue_node(id, mob/user)
+	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+		computer.say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!")
+		return FALSE
+	stored_research.enqueue_node(id, user)
+	return TRUE
+
+/datum/computer_file/program/science/proc/dequeue_node(id, mob/user)
+	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+		computer.say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!")
+		return FALSE
+	stored_research.dequeue_node(id, user)
+	return TRUE
+
 /datum/computer_file/program/science/proc/research_node(id, mob/user)
 	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
 		computer.say("Node unlock failed: Either no techweb is found, node is already researched or is not available!")
diff --git a/code/modules/modular_computers/file_system/programs/virtual_pet.dm b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
index 1ee2dae9ac93c..694ad8db5ac13 100644
--- a/code/modules/modular_computers/file_system/programs/virtual_pet.dm
+++ b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
@@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
 		/datum/emote/living/jump,
 		/datum/emote/living/shiver,
 		/datum/emote/spin,
-		/datum/emote/living/beep,
+		/datum/emote/silicon/beep,
 	)
 	data["possible_emotes"] = list("none")
 	for(var/datum/emote/target_emote as anything in possible_emotes)
diff --git a/code/modules/movespeed/modifiers/innate.dm b/code/modules/movespeed/modifiers/innate.dm
index 83d8b3fb78d98..545d92d26b57b 100644
--- a/code/modules/movespeed/modifiers/innate.dm
+++ b/code/modules/movespeed/modifiers/innate.dm
@@ -18,3 +18,8 @@
 /datum/movespeed_modifier/dna_vault_speedup
 	blacklisted_movetypes = (FLYING|FLOATING)
 	multiplicative_slowdown = -0.4
+
+/// The movespeed modifier from the heavy fish trait when applied to mobs.
+/datum/movespeed_modifier/heavy_fish
+	multiplicative_slowdown = 0.4
+	flags = IGNORE_NOSLOW
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 1624ce37bf6d9..aa8c8153e97f5 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -172,3 +172,6 @@
 
 /datum/movespeed_modifier/basilisk_overheat
 	multiplicative_slowdown = -18
+
+/datum/movespeed_modifier/magic_ties
+	multiplicative_slowdown = 0.5
diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm
index 4768f66a544f4..8f4e59d65557b 100644
--- a/code/modules/movespeed/modifiers/status_effects.dm
+++ b/code/modules/movespeed/modifiers/status_effects.dm
@@ -38,6 +38,9 @@
 /datum/movespeed_modifier/status_effect/tired_post_charge
 	multiplicative_slowdown = 3
 
+/datum/movespeed_modifier/status_effect/tired_post_charge/lesser
+	multiplicative_slowdown = 2
+
 /// Get slower the more gold is in your system.
 /datum/movespeed_modifier/status_effect/midas_blight
 	id = MOVESPEED_ID_MIDAS_BLIGHT
diff --git a/code/modules/pai/software.dm b/code/modules/pai/software.dm
index ab69e69388ccd..59db371610797 100644
--- a/code/modules/pai/software.dm
+++ b/code/modules/pai/software.dm
@@ -230,11 +230,11 @@
 	var/datum/atom_hud/hud
 	var/hud_on
 	if(mode == PAI_TOGGLE_MEDICAL_HUD)
-		hud = GLOB.huds[med_hud]
+		hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 		medHUD = !medHUD
 		hud_on = medHUD
 	if(mode == PAI_TOGGLE_SECURITY_HUD)
-		hud = GLOB.huds[sec_hud]
+		hud = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
 		secHUD = !secHUD
 		hud_on = secHUD
 	if(hud_on)
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index 0be6375ed1742..e652b92e97805 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -78,7 +78,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
 
 /obj/machinery/fax/Destroy()
 	QDEL_NULL(loaded_item_ref)
-	QDEL_NULL(wires)
 	return ..()
 
 /obj/machinery/fax/update_overlays()
@@ -233,7 +232,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
 	var/list/data = list()
 	//Record a list of all existing faxes.
 	for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
-		if(FAX.fax_id == fax_id) //skip yourself
+		if(FAX.fax_id == fax_id || is_centcom_level(FAX.z)) //skip yourself and the centcom fax machine.
 			continue
 		var/list/fax_data = list()
 		fax_data["fax_name"] = FAX.fax_name
@@ -301,7 +300,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
 			history_add("Send", params["name"])
 
 			GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper)
-			to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]<b><font color=green>FAX REQUEST: </font>[ADMIN_FULLMONTY(usr)]:</b> [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)]"), confidential = TRUE)
+			to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]<b><font color=green>FAX REQUEST: </font>[ADMIN_FULLMONTY(usr)]:</b> [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name)]"), confidential = TRUE)
 			for(var/client/staff as anything in GLOB.admins)
 				if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification))
 					SEND_SOUND(staff, sound('sound/misc/server-ready.ogg'))
diff --git a/code/modules/paperwork/paperwork.dm b/code/modules/paperwork/paperwork.dm
index 03f22177f9e71..cd26482bf6c8a 100644
--- a/code/modules/paperwork/paperwork.dm
+++ b/code/modules/paperwork/paperwork.dm
@@ -166,7 +166,7 @@
 
 	detailed_desc += span_info(" The stack of documents appear to be a medical report from a nearby station, detailing the autopsy of an unknown xenofauna.")
 	detailed_desc += span_info(" Skipping to the end of the report reveals that the specimen was the station bartender's pet monkey.")
-	detailed_desc += span_info(" The specimen had been exposed to radiation during an 'unrelated incident with the engine', leading to it's mutated form.")
+	detailed_desc += span_info(" The specimen had been exposed to radiation during an 'unrelated incident with the engine', leading to its mutated form.")
 	detailed_desc += span_info(" Regardless, the autopsy results look like they could be useful. You should probably stamp this.")
 
 
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index d37d97c167792..7be0e3548ad2b 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -363,8 +363,8 @@
 	var/datum/component/transforming/transform_comp = GetComponent(/datum/component/transforming)
 	.["damage"] = max(5, transform_comp.throwforce_on)
 	.["speed"] = max(0, transform_comp.throw_speed_on - 3)
-	var/list/embed_params = .["embedding"]
-	embed_params["embed_chance"] = 100
+	var/datum/embed_data/data = .["embedding"]
+	.["embedding"] = data.generate_with_values(embed_chance = 100)
 
 /obj/item/pen/edagger/proc/on_containing_dart_fired(obj/projectile/source)
 	SIGNAL_HANDLER
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 72d3ecd85ba03..b72a232017029 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -78,8 +78,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
 	var/color_mode = PHOTO_COLOR
 	/// Indicates whether the printer is currently busy copying or not.
 	var/busy = FALSE
-	/// Variable needed to determine the selected category of forms on Photocopier.js
-	var/category
 	/// Variable that holds a reference to any object supported for photocopying inside the photocopier
 	var/obj/object_copy
 	/// Variable for the UI telling us how many copies are in the queue.
@@ -149,6 +147,8 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
 
 	static_data["blanks"] = blank_infos
 	static_data["categories"] = category_names
+	static_data["max_paper_count"] = MAX_PAPER_CAPACITY
+	static_data["max_copies"] = MAX_COPIES_AT_ONCE
 
 	return static_data
 
@@ -156,8 +156,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
 	var/list/data = list()
 	data["has_item"] = !copier_empty()
 	data["num_copies"] = num_copies
-
-	data["category"] = category
 	data["copies_left"] = copies_left
 
 	if(istype(object_copy, /obj/item/photo))
@@ -265,10 +263,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
 		if("set_copies")
 			num_copies = clamp(text2num(params["num_copies"]), 1, MAX_COPIES_AT_ONCE)
 			return TRUE
-		// Changes the forms displayed on Photocopier.js when you switch categories
-		if("choose_category")
-			category = params["category"]
-			return TRUE
 		// Called when you press print blank
 		if("print_blank")
 			if(check_busy(usr))
@@ -276,7 +270,7 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
 			if(!(params["code"] in GLOB.paper_blanks))
 				return FALSE
 			var/list/blank = GLOB.paper_blanks[params["code"]]
-			do_copies(CALLBACK(src, PROC_REF(make_blank_print), blank), usr, PAPER_PAPER_USE, PAPER_TONER_USE, 1)
+			do_copies(CALLBACK(src, PROC_REF(make_blank_print), blank), usr, PAPER_PAPER_USE, PAPER_TONER_USE, num_copies)
 			return TRUE
 
 /// Returns the color used for the printing operation. If the color is below TONER_LOW_PERCENTAGE, it returns a gray color.
diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm
index de4a900579219..a7045567fa80d 100644
--- a/code/modules/plumbing/ducts.dm
+++ b/code/modules/plumbing/ducts.dm
@@ -100,7 +100,7 @@ All the important duct code:
 
 		other.add_connects(opposite_dir)
 		other.update_appearance()
-		return TRUE //tell the current pipe to also update it's sprite
+		return TRUE //tell the current pipe to also update its sprite
 	if(!(other in neighbours)) //we cool
 		if((duct_color != other.duct_color) && !(ignore_colors || other.ignore_colors))
 			return
@@ -339,7 +339,7 @@ All the important duct code:
 
 /obj/item/stack/ducts/examine(mob/user)
 	. = ..()
-	. += span_notice("It's current color and layer are [duct_color] and [duct_layer]. Use in-hand to change.")
+	. += span_notice("Its current color and layer are [duct_color] and [duct_layer]. Use in-hand to change.")
 
 /obj/item/stack/ducts/attack_self(mob/user)
 	var/new_layer = tgui_input_list(user, "Select a layer", "Layer", GLOB.plumbing_layers, duct_layer)
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index c8564b15f1215..33c063bbfed20 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -190,6 +190,8 @@
 				transfer_amount = reagent.volume * part
 
 		if(reagent.intercept_reagents_transfer(target_holder, amount))
+			update_total()
+			target_holder.update_total()
 			continue
 
 		transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount, copy_data(reagent), chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred.
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 945908342a6a6..2f2528a1765c1 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -61,7 +61,7 @@
 	. = ..()
 	. += span_notice("The [name] currently has [stored_products.len] stored. There needs to be less than [MAX_FLOOR_PRODUCTS] on the floor to continue dispensing.")
 
-/// decode product category from it's type path and returns the decoded typepath
+/// decode product category from its type path and returns the decoded typepath
 /obj/machinery/plumbing/pill_press/proc/decode_category()
 	var/obj/item/reagent_containers/container = locate(packaging_type)
 	if(ispath(container, /obj/item/reagent_containers/pill/patch))
diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm
index 59fcfaf7caf91..9828c9e697f85 100644
--- a/code/modules/plumbing/plumbers/reaction_chamber.dm
+++ b/code/modules/plumbing/plumbers/reaction_chamber.dm
@@ -180,8 +180,8 @@
 
 		/**
 		 * figure out which buffer to transfer to restore balance
-		 * if solution is getting too basic(high ph) add some acid to lower it's value
-		 * else if solution is getting too acidic(low ph) add some base to increase it's value
+		 * if solution is getting too basic(high ph) add some acid to lower its value
+		 * else if solution is getting too acidic(low ph) add some base to increase its value
 		 */
 		var/datum/reagents/buffer = reagents.ph > alkaline_limit ? acidic_beaker.reagents : alkaline_beaker.reagents
 		if(!buffer.total_volume)
diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index 329f77ab7186d..481ccde663b72 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -7,6 +7,12 @@
 
 ///Cap for how fast cells charge, as a percentage per second (.01 means cellcharge is capped to 1% per second)
 #define CHARGELEVEL 0.01
+///Charge percentage at which the lights channel stops working
+#define APC_CHANNEL_LIGHT_TRESHOLD 15
+///Charge percentage at which the equipment channel stops working
+#define APC_CHANNEL_EQUIP_TRESHOLD 30
+///Charge percentage at which the APC icon indicates discharging
+#define APC_CHANNEL_ALARM_TRESHOLD 75
 
 /obj/machinery/power/apc
 	name = "area power controller"
@@ -49,6 +55,8 @@
 	var/operating = TRUE
 	///State of the apc charging (not charging, charging, fully charged)
 	var/charging = APC_NOT_CHARGING
+	///Previous state of charging, to detect the change
+	var/last_charging
 	///Can the APC charge?
 	var/chargemode = TRUE
 	///Is the apc interface locked?
@@ -67,6 +75,8 @@
 	var/lastused_environ = 0
 	///Total amount of power used by the three channels
 	var/lastused_total = 0
+	///Total amount of power put into the battery
+	var/lastused_charge = 0
 	///State of the apc external power (no power, low power, has power)
 	var/main_status = APC_NO_POWER
 	powernet = FALSE // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :(
@@ -146,8 +156,7 @@
 	//APCs get added to their own processing tasks for the machines subsystem.
 	if (!(datum_flags & DF_ISPROCESSING))
 		datum_flags |= DF_ISPROCESSING
-		SSmachines.apc_early_processing += src
-		SSmachines.apc_late_processing += src
+		SSmachines.processing_apcs += src
 
 	//Pixel offset its appearance based on its direction
 	dir = ndir
@@ -240,8 +249,6 @@
 	QDEL_NULL(alarm_manager)
 	if(occupier)
 		malfvacate(TRUE)
-	if(wires)
-		QDEL_NULL(wires)
 	if(cell)
 		QDEL_NULL(cell)
 	if(terminal)
@@ -301,7 +308,6 @@
 /obj/machinery/power/apc/Exited(atom/movable/gone, direction)
 	. = ..()
 	if(gone == cell)
-		cell.update_appearance()
 		cell = null
 		charging = APC_NOT_CHARGING
 		update_appearance()
@@ -362,7 +368,7 @@
 		"powerCellStatus" = cell ? cell.percent() : null,
 		"chargeMode" = chargemode,
 		"chargingStatus" = charging,
-		"chargingPowerDisplay" = display_power(area.energy_usage[AREA_USAGE_APC_CHARGE]),
+		"chargingPowerDisplay" = display_power(lastused_charge),
 		"totalLoad" = display_power(lastused_total),
 		"coverLocked" = coverlocked,
 		"remoteAccess" = (user == remote_control_user),
@@ -516,15 +522,22 @@
 		disconnect_remote_access()
 
 /**
- * APC early processing. This gets processed before any other machine does.
+ * APC early processing. This gets processed after any other machine on the powernet does.
  * This adds up the total static power usage for the apc's area, then draw that power usage from the grid or APC cell.
- * This is done early so machines that use dynamic power get a more truthful surplus when accessing available energy.
  */
 /obj/machinery/power/apc/proc/early_process()
+	if(cell && cell.charge < cell.maxcharge)
+		last_charging = charging
+		charging = APC_NOT_CHARGING
+	if(isnull(area))
+		return
+
 	var/total_static_energy_usage = 0
 	total_static_energy_usage += APC_CHANNEL_IS_ON(lighting) * area.energy_usage[AREA_USAGE_STATIC_LIGHT]
 	total_static_energy_usage += APC_CHANNEL_IS_ON(equipment) * area.energy_usage[AREA_USAGE_STATIC_EQUIP]
 	total_static_energy_usage += APC_CHANNEL_IS_ON(environ) * area.energy_usage[AREA_USAGE_STATIC_ENVIRON]
+	area.clear_usage()
+
 	if(total_static_energy_usage) //Use power from static power users.
 		draw_energy(total_static_energy_usage)
 
@@ -549,17 +562,14 @@
 	lastused_light = APC_CHANNEL_IS_ON(lighting) ? area.energy_usage[AREA_USAGE_LIGHT] + area.energy_usage[AREA_USAGE_STATIC_LIGHT] : 0
 	lastused_equip = APC_CHANNEL_IS_ON(equipment) ? area.energy_usage[AREA_USAGE_EQUIP] + area.energy_usage[AREA_USAGE_STATIC_EQUIP] : 0
 	lastused_environ = APC_CHANNEL_IS_ON(environ) ? area.energy_usage[AREA_USAGE_ENVIRON] + area.energy_usage[AREA_USAGE_STATIC_ENVIRON] : 0
-	area.clear_usage()
-
-	lastused_total = lastused_light + lastused_equip + lastused_environ
+	lastused_charge = charging == APC_CHARGING ? area.energy_usage[AREA_USAGE_APC_CHARGE] : 0
 
+	lastused_total = lastused_light + lastused_equip + lastused_environ + lastused_charge
 
 	//store states to update icon if any change
 	var/last_lt = lighting
 	var/last_eq = equipment
 	var/last_en = environ
-	var/last_ch = charging
-
 	var/excess = surplus()
 
 	if(!avail())
@@ -579,7 +589,7 @@
 			if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights))
 				low_power_nightshift_lights = TRUE
 				INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE)
-		else if(cell.percent() < 15) // <15%, turn off lighting & equipment
+		else if(cell.percent() < APC_CHANNEL_LIGHT_TRESHOLD) // turn off lighting & equipment
 			equipment = autoset(equipment, AUTOSET_OFF)
 			lighting = autoset(lighting, AUTOSET_OFF)
 			environ = autoset(environ, AUTOSET_ON)
@@ -587,7 +597,7 @@
 			if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights))
 				low_power_nightshift_lights = TRUE
 				INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE)
-		else if(cell.percent() < 30) // <30%, turn off equipment
+		else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD) // turn off equipment
 			equipment = autoset(equipment, AUTOSET_OFF)
 			lighting = autoset(lighting, AUTOSET_ON)
 			environ = autoset(environ, AUTOSET_ON)
@@ -603,21 +613,9 @@
 				low_power_nightshift_lights = FALSE
 				if(!SSnightshift.nightshift_active)
 					INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE)
-			if(cell.percent() > 75)
+			if(cell.percent() > APC_CHANNEL_ALARM_TRESHOLD)
 				alarm_manager.clear_alarm(ALARM_POWER)
 
-		charging = APC_NOT_CHARGING
-		// now trickle-charge the cell
-		if(chargemode && operating && excess && cell.used_charge())
-			// Max charge is capped to % per second constant.
-			lastused_total += charge_cell(min(cell.chargerate, cell.maxcharge * CHARGELEVEL) * seconds_per_tick, cell = cell, grid_only = TRUE, channel = AREA_USAGE_APC_CHARGE)
-			charging = APC_CHARGING
-
-		// show cell as fully charged if so
-		if(cell.charge >= cell.maxcharge)
-			cell.charge = cell.maxcharge
-			charging = APC_FULLY_CHARGED
-
 	else // no cell, switch everything off
 		charging = APC_NOT_CHARGING
 		equipment = autoset(equipment, AUTOSET_FORCE_OFF)
@@ -626,14 +624,46 @@
 		alarm_manager.send_alarm(ALARM_POWER)
 
 	// update icon & area power if anything changed
-
 	if(last_lt != lighting || last_eq != equipment || last_en != environ || force_update)
 		force_update = FALSE
 		queue_icon_update()
 		update()
-	else if(last_ch != charging)
+	else if(charging != last_charging)
 		queue_icon_update()
 
+// charge until the battery is full or to the treshold of the provided channel
+/obj/machinery/power/apc/proc/charge_channel(channel = null, seconds_per_tick)
+	if(!cell || shorted || !operating || !chargemode || !surplus() || !cell.used_charge())
+		return
+
+	// no overcharge past the next treshold
+	var/need_charge_for_channel
+	switch(channel)
+		if(SSMACHINES_APCS_ENVIRONMENT)
+			need_charge_for_channel = (cell.maxcharge * 0.05) - cell.charge
+		if(SSMACHINES_APCS_LIGHTS)
+			need_charge_for_channel = (cell.maxcharge * (APC_CHANNEL_LIGHT_TRESHOLD + 5) * 0.01) - cell.charge
+		if(SSMACHINES_APCS_EQUIPMENT)
+			need_charge_for_channel = (cell.maxcharge * (APC_CHANNEL_EQUIP_TRESHOLD + 5) * 0.01) - cell.charge
+		else
+			need_charge_for_channel = cell.used_charge()
+
+	var/charging_used = area ? area.energy_usage[AREA_USAGE_APC_CHARGE] : 0
+	var/remaining_charge_rate = min(cell.chargerate, cell.maxcharge * CHARGELEVEL) - charging_used
+	var/need_charge = min(need_charge_for_channel, remaining_charge_rate) * seconds_per_tick
+	//check if we can charge the battery
+	if(need_charge < 0)
+		return
+
+	charge_cell(need_charge, cell = cell, grid_only = TRUE, channel = AREA_USAGE_APC_CHARGE)
+
+	// show cell as fully charged if so
+	if(cell.charge >= cell.maxcharge)
+		cell.charge = cell.maxcharge
+		charging = APC_FULLY_CHARGED
+	else
+		charging = APC_CHARGING
+
 /obj/machinery/power/apc/proc/reset(wire)
 	switch(wire)
 		if(WIRE_IDSCAN)
@@ -752,3 +782,6 @@
 	return null
 
 #undef CHARGELEVEL
+#undef APC_CHANNEL_LIGHT_TRESHOLD
+#undef APC_CHANNEL_EQUIP_TRESHOLD
+#undef APC_CHANNEL_ALARM_TRESHOLD
diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm
index 2072ab145614d..8e4d51a703da6 100644
--- a/code/modules/power/apc/apc_tool_act.dm
+++ b/code/modules/power/apc/apc_tool_act.dm
@@ -320,7 +320,6 @@
 		balloon_alert(user, "cell removed")
 		var/turf/user_turf = get_turf(user)
 		cell.forceMove(user_turf)
-		cell.update_appearance()
 		cell = null
 		charging = APC_NOT_CHARGING
 		update_appearance()
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 1e561c6030792..ecab6e4eee9a1 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -78,6 +78,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
 /obj/machinery/gravity_generator/part/Destroy()
 	atom_break()
 	if(main_part)
+		main_part.generator_parts -= src
 		UnregisterSignal(main_part, COMSIG_ATOM_UPDATED_ICON)
 		main_part = null
 	return ..()
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 013140e399099..889ca7244e8f7 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -118,6 +118,7 @@
 	RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
 	RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur))
 	AddElement(/datum/element/atmos_sensitive, mapload)
+	AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Remove bulb")
 	if(break_if_moved)
 		find_and_hang_on_wall(custom_drop_callback = CALLBACK(src, PROC_REF(knock_down)))
 
@@ -331,15 +332,15 @@
 	. = ..()
 	switch(status)
 		if(LIGHT_OK)
-			. += "It is turned [on? "on" : "off"]."
+			. += span_notice("It is turned [on? "on" : "off"].")
 		if(LIGHT_EMPTY)
-			. += "The [fitting] has been removed."
+			. +=  span_notice("The [fitting] has been removed.")
 		if(LIGHT_BURNED)
-			. += "The [fitting] is burnt out."
+			. +=  span_danger("The [fitting] is burnt out.")
 		if(LIGHT_BROKEN)
-			. += "The [fitting] has been smashed."
+			. += span_danger("The [fitting] has been smashed.")
 	if(cell || has_mock_cell)
-		. += "Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%."
+		. +=  span_notice("Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%.")
 
 
 
@@ -527,9 +528,9 @@
 // attack with hand - remove tube/bulb
 // if hands aren't protected and the light is on, burn the player
 
-/obj/machinery/light/attack_hand(mob/living/carbon/human/user, list/modifiers)
+/obj/machinery/light/attack_hand_secondary(mob/living/carbon/human/user, list/modifiers)
 	. = ..()
-	if(.)
+	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
 		return
 	user.changeNext_move(CLICK_CD_MELEE)
 	add_fingerprint(user)
@@ -704,7 +705,10 @@
  * All the effects that occur when a light falls off a wall that it was hung onto.
  */
 /obj/machinery/light/proc/knock_down()
-	new /obj/item/wallframe/light_fixture(drop_location())
+	if (fitting == "bulb")
+		new /obj/item/wallframe/light_fixture/small(drop_location())
+	else
+		new /obj/item/wallframe/light_fixture(drop_location())
 	new /obj/item/stack/cable_coil(drop_location(), 1, "red")
 	if(status != LIGHT_BROKEN)
 		break_light_tube(FALSE)
diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm
index 2bca5e3b3f157..902ca9fb0eb3d 100644
--- a/code/modules/power/lighting/light_construct.dm
+++ b/code/modules/power/lighting/light_construct.dm
@@ -45,16 +45,16 @@
 	. = ..()
 	switch(stage)
 		if(LIGHT_CONSTRUCT_EMPTY)
-			. += "It's an empty frame."
+			. += span_notice("It's an empty frame with no wires.")
 		if(LIGHT_CONSTRUCT_WIRED)
-			. += "It's wired."
+			. += span_notice("It is wired, but the bolts are not screwed in.")
 		if(LIGHT_CONSTRUCT_CLOSED)
-			. += "The casing is closed."
+			. += span_notice("The casing is closed.")
 	if(cell_connectors)
 		if(cell)
-			. += "You see [cell] inside the casing."
+			. += span_notice("You see [cell] inside the casing.")
 		else
-			. += "The casing has no power cell for backup power."
+			. += span_notice("The casing has no power cell for backup power.")
 	else
 		. += span_danger("This casing doesn't support power cells for backup power.")
 
@@ -63,7 +63,6 @@
 		return
 	user.visible_message(span_notice("[user] removes [cell] from [src]!"), span_notice("You remove [cell]."))
 	user.put_in_hands(cell)
-	cell.update_appearance()
 	cell = null
 	add_fingerprint(user)
 
diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm
index 289b2d46fab38..1cff0f5f1a1bd 100644
--- a/code/modules/power/monitor.dm
+++ b/code/modules/power/monitor.dm
@@ -19,11 +19,13 @@
 
 /obj/machinery/computer/monitor/Initialize(mapload)
 	. = ..()
+	//Add to the late process queue to record the accurate power usage data
+	SSmachines.processing_late += src
 	search()
 	history["supply"] = list()
 	history["demand"] = list()
 
-/obj/machinery/computer/monitor/process()
+/obj/machinery/computer/monitor/process_late()
 	if(!get_powernet())
 		update_use_power(IDLE_POWER_USE)
 		search()
@@ -36,7 +38,7 @@
 	attached_wire_ref = WEAKREF(locate(/obj/structure/cable) in T)
 	if(attached_wire_ref)
 		return
-	var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+	var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull its powernet instead
 	if(!A)
 		return
 	var/obj/machinery/power/apc/local_apc = A.apc
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 4514c89b862e2..4c91301978940 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -403,7 +403,7 @@ By design, d1 is the smallest direction and d2 is the highest
 
 	// exisiting pipe_cleaner doesn't point at our position or we have a supplied direction, so see if it's a stub
 	else if(C.d1 == 0)
-							// if so, make it a full pipe_cleaner pointing from it's old direction to our dirn
+							// if so, make it a full pipe_cleaner pointing from its old direction to our dirn
 		var/nd1 = C.d2 // these will be the new directions
 		var/nd2 = dirn
 
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index e4c1617c0f0b8..c5353ce62d537 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -1,4 +1,4 @@
-//Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
+//Baseline portable generator. Has all the default handling. Not intended to be used on its own (since it generates unlimited power).
 /obj/machinery/power/port_gen
 	name = "portable generator"
 	desc = "A portable generator for emergency backup power."
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 5cfeab92f06ca..c31870f2ad080 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -53,7 +53,7 @@
 			. += span_notice("It's operating on the [LOWER_TEXT(GLOB.cable_layer_to_name["[cable_layer]"])].")
 		else
 			. += span_warning("It's disconnected from the [LOWER_TEXT(GLOB.cable_layer_to_name["[cable_layer]"])].")
-		. += span_notice("It's power line can be changed with a [EXAMINE_HINT("multitool")].")
+		. += span_notice("Its power line can be changed with a [EXAMINE_HINT("multitool")].")
 
 /obj/machinery/power/multitool_act(mob/living/user, obj/item/tool)
 	if(can_change_cable_layer)
diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm
index 688dc70908f36..8bbaa5bc0fe58 100644
--- a/code/modules/power/power_store.dm
+++ b/code/modules/power/power_store.dm
@@ -57,6 +57,13 @@
 	)
 	AddElement(/datum/element/connect_loc, loc_connections)
 
+
+/obj/item/stock_parts/power_store/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
+	. = ..()
+	if(!isturf(old_loc))
+		update_appearance()
+
+
 /**
  * Signal proc for [COMSIG_ITEM_MAGICALLY_CHARGED]
  *
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 1659d30b2bbe9..562bf4c0825cd 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -60,6 +60,8 @@
 
 /obj/machinery/power/emitter/Initialize(mapload)
 	. = ..()
+	//Add to the early process queue to prioritize power draw
+	SSmachines.processing_early += src
 	RefreshParts()
 	set_wires(new /datum/wires/emitter(src))
 	if(welded)
@@ -187,7 +189,7 @@
 	togglelock(user)
 	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
-/obj/machinery/power/emitter/process(seconds_per_tick)
+/obj/machinery/power/emitter/process_early(seconds_per_tick)
 	var/power_usage = active_power_usage * seconds_per_tick
 	if(machine_stat & (BROKEN))
 		return
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 86e0fb1f92e91..1ae147b353a9e 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -306,7 +306,7 @@
 
 /**
  * Selects cinematic to play as part of the cult end depending on the outcome then ends the round afterward
- * called either when narsie eats everyone, or when [/proc/begin_the_end()] reaches it's conclusion
+ * called either when narsie eats everyone, or when [/proc/begin_the_end()] reaches its conclusion
  */
 /proc/cult_ending_helper(ending_type = CULT_VICTORY_NUKE)
 	switch(ending_type)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 76951670c9831..c4e3127aa5c9f 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -105,7 +105,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	var/external_power_immediate = 0
 
 	/// External damage that are added to the sm on next [/obj/machinery/power/supermatter_crystal/process_atmos] call.
-	/// SM will not take damage if it's health is lower than emergency point.
+	/// SM will not take damage if its health is lower than emergency point.
 	var/external_damage_immediate = 0
 
 	///The cutoff for a bolt jumping, grows with heat, lowers with higher mol count,
diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
index 862cdb02435ae..aea846d237ef1 100644
--- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
@@ -75,12 +75,12 @@ GLOBAL_LIST_INIT(sm_delam_list, list(
 	SEND_SIGNAL(sm, COMSIG_SUPERMATTER_DELAM_ALARM)
 	return TRUE
 
-/// Called when a supermatter switches it's strategy from another one to us.
+/// Called when a supermatter switches its strategy from another one to us.
 /// [/obj/machinery/power/supermatter_crystal/proc/set_delam]
 /datum/sm_delam/proc/on_select(obj/machinery/power/supermatter_crystal/sm)
 	return
 
-/// Called when a supermatter switches it's strategy from us to something else.
+/// Called when a supermatter switches its strategy from us to something else.
 /// [/obj/machinery/power/supermatter_crystal/proc/set_delam]
 /datum/sm_delam/proc/on_deselect(obj/machinery/power/supermatter_crystal/sm)
 	return
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index 590b135ad9a31..dbf5d1848dd48 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -292,7 +292,7 @@
 	input_turf = null
 
 /**
- * transfer's gases from it's input turf to it's internal gas mix
+ * transfers gases from its input turf to its internal gas mix
  * Returns temperature of the gas mix absorbed only if some work was done
  */
 /obj/machinery/power/turbine/inlet_compressor/proc/compress_gases()
diff --git a/code/modules/procedural_mapping/README.md b/code/modules/procedural_mapping/README.md
index 6434b534bff10..5123f51ef18f8 100644
--- a/code/modules/procedural_mapping/README.md
+++ b/code/modules/procedural_mapping/README.md
@@ -63,7 +63,7 @@ Existing Calls: `initialiseModules(),generate(),generateOneTurf()`
 
 ### mapGeneratorModule
 
-Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in it's mother's map based on cluster variables.
+Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in its mother's map based on cluster variables.
 
 ### sync(var/datum/map_generator/mum)
 
@@ -77,7 +77,7 @@ Existing Calls: `mapGenerator/syncModules()`
 
 Example: `generate()`
 
-Desc: Calls place(T) on all turfs in it's mother's map
+Desc: Calls place(T) on all turfs in its mother's map
 
 Existing Calls: `mapGenerator/generate()`
 
@@ -104,9 +104,9 @@ Existing Calls: `place()`
 Simple Workflow:
 
 1. Define a/some mapGeneratorModule(s) to your liking, choosing atoms and turfs to spawn
-   
+
 * I chose to split Turfs and Atoms off into separate modules, but this is NOT required.
-* A mapGeneratorModule may have turfs AND atoms, so long as each is in it's appropriate list
+* A mapGeneratorModule may have turfs AND atoms, so long as each is in its appropriate list
 
 2. Define a mapGenerator type who's modules list contains the typepath(s) of all the module(s) you wish to use
 
@@ -149,15 +149,15 @@ Variable Breakdown (For Mappers):
 
 ### mapGeneratorModule
 * mother - INTERNAL, do not touch
-  
+
 * spawnableAtoms - A list of typepaths and their probability to spawn, eg: `spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)`
-  
+
 * spawnableTurfs - A list of typepaths and their probability to spawn, eg: `spawnableTurfs = list(/turf/unsimulated/floor/grass = 100)`
-  
+
 * clusterMax - The max range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-  
+
 * clusterMin - The min range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-  
+
 * clusterCheckFlags - A Bitfield that controls how the cluster checks work, All based on clusterMin and clusterMax guides
 
 * allowAtomsOnSpace - A Boolean for if we allow atoms to spawn on space tiles
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index 1b1decd3649ee..e2afc1bd67e7f 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -81,9 +81,7 @@
 	var/direct_target
 	if(target && curloc.Adjacent(targloc, target=targloc, mover=src)) //if the target is right on our location or adjacent (including diagonally if reachable) we'll skip the travelling code in the proj's fire()
 		direct_target = target
-	if(!direct_target)
-		var/modifiers = params2list(params)
-		loaded_projectile.preparePixelProjectile(target, fired_from, modifiers, spread)
+	loaded_projectile.preparePixelProjectile(target, fired_from, params2list(params), spread)
 	var/obj/projectile/loaded_projectile_cache = loaded_projectile
 	loaded_projectile = null
 	loaded_projectile_cache.fire(null, direct_target)
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index a2f55f797bdb5..bc25970e7c364 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -26,7 +26,7 @@
 	desc = "A 10mm reaper bullet casing."
 	projectile_type = /obj/projectile/bullet/c10mm/reaper
 
-// 9mm (Makarov, Stechkin APS, PP-95)
+// 9mm (Makarov, Stechkin APS)
 
 /obj/item/ammo_casing/c9mm
 	name = "9mm bullet casing"
@@ -49,7 +49,6 @@
 	desc = "A 9mm incendiary bullet casing."
 	projectile_type = /obj/projectile/bullet/incendiary/c9mm
 
-
 // .50AE (Desert Eagle)
 
 /obj/item/ammo_casing/a50ae
@@ -57,3 +56,21 @@
 	desc = "A .50AE bullet casing."
 	caliber = CALIBER_50AE
 	projectile_type = /obj/projectile/bullet/a50ae
+
+// .160 Smart (Abielle smartgun)
+
+/obj/item/ammo_casing/c160smart
+	name = ".160 smart bullet casing"
+	desc = "A .160 smart bullet with a small charge of booster propellant at the bottom."
+	icon_state = "smartgun_casing"
+	caliber = CALIBER_160SMART
+	projectile_type = /obj/projectile/bullet/c160smart
+
+/obj/item/ammo_casing/c160smart/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/caseless)
+
+/obj/item/ammo_casing/c160smart/ready_proj(atom/target, mob/living/user, quiet, zone_override, atom/fired_from)
+	. = ..()
+	if(!isturf(target))
+		loaded_projectile.set_homing_target(target)
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index aeb3b34ed4a64..b7cda3e93e1a8 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -103,6 +103,15 @@
 	variance = 25
 	custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2)
 
+/obj/item/ammo_casing/shotgun/fletchette
+	name = "\improper Donk Co Flechette Shell"
+	desc = "A shotgun casing filled with small metal darts. Has poor armor penetration and velocity, but is good at destroying most electronic devices and injuring unarmored humanoids."
+	icon_state = "fletchette"
+	projectile_type = /obj/projectile/bullet/pellet/flechette
+	custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2, /datum/material/glass=SMALL_MATERIAL_AMOUNT*1)
+	pellets = 6
+	variance = 20
+
 /obj/item/ammo_casing/shotgun/ion
 	name = "ion shell"
 	desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
@@ -159,7 +168,13 @@
 /obj/item/ammo_casing/shotgun/dart/attackby()
 	return
 
+/obj/item/ammo_casing/shotgun/dart/large
+	name = "XL shotgun dart"
+	desc = "A dart for use in shotguns. Can be injected with up to 25 units of any chemical."
+	reagent_amount = 25
+
 /obj/item/ammo_casing/shotgun/dart/bioterror
+	name = "bioterror dart"
 	desc = "An improved shotgun dart filled with deadly toxins. Can be injected with up to 30 units of any chemical."
 	reagent_amount = 30
 
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 6eb2d238bb061..0b1623e9877ab 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -19,6 +19,12 @@
 	select_name = "kill"
 	fire_sound = 'sound/weapons/laser2.ogg'
 
+/obj/item/ammo_casing/energy/lasergun/carbine/cybersun
+	projectile_type = /obj/projectile/beam/laser/carbine/cybersun
+	e_cost = LASER_SHOTS(54, STANDARD_CELL_CHARGE)
+	select_name = "rapid fire"
+	fire_sound = 'sound/weapons/laser2.ogg'
+
 /obj/item/ammo_casing/energy/lasergun/carbine/practice
 	projectile_type = /obj/projectile/beam/laser/carbine/practice
 	select_name = "practice"
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index dbf071f6aee6c..6d90c54fc6927 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -14,25 +14,30 @@
 
 /obj/item/ammo_box/magazine/m12g/stun
 	name = "shotgun magazine (12g taser slugs)"
+	icon_state = "m12gs"
 	base_icon_state = "m12gs"
 	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
 
 /obj/item/ammo_box/magazine/m12g/slug
 	name = "shotgun magazine (12g slugs)"
+	icon_state = "m12gsl"
 	base_icon_state = "m12gsl"
 	ammo_type = /obj/item/ammo_casing/shotgun
 
 /obj/item/ammo_box/magazine/m12g/dragon
 	name = "shotgun magazine (12g dragon's breath)"
+	icon_state = "m12gf"
 	base_icon_state = "m12gf"
 	ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
 
 /obj/item/ammo_box/magazine/m12g/bioterror
 	name = "shotgun magazine (12g bioterror)"
+	icon_state = "m12gt"
 	base_icon_state = "m12gt"
 	ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
 
 /obj/item/ammo_box/magazine/m12g/meteor
 	name = "shotgun magazine (12g meteor slugs)"
+	icon_state = "m12gbc"
 	base_icon_state = "m12gbc"
 	ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
index 3ebb459ed9319..40837d9ddbc4c 100644
--- a/code/modules/projectiles/boxes_magazines/external/smg.dm
+++ b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -30,18 +30,16 @@
 	. = ..()
 	icon_state = "[base_icon_state]-[round(ammo_count(), 4)]"
 
-/obj/item/ammo_box/magazine/plastikov9mm
-	name = "PP-95 magazine (9mm)"
-	icon_state = "9x19-50"
-	base_icon_state = "9x19"
-	ammo_type = /obj/item/ammo_casing/c9mm
-	caliber = CALIBER_9MM
+/obj/item/ammo_box/magazine/smartgun
+	name = "Abielle magazine (.160 Smart)"
+	icon_state = "smartgun"
+	base_icon_state = "smartgun"
+	ammo_type = /obj/item/ammo_casing/c160smart
+	multiple_sprites = AMMO_BOX_FULL_EMPTY
+	multiple_sprite_use_base = TRUE
+	caliber = CALIBER_160SMART
 	max_ammo = 50
 
-/obj/item/ammo_box/magazine/plastikov9mm/update_icon_state()
-	. = ..()
-	icon_state = "[base_icon_state]-[ammo_count() ? 50 : 0]"
-
 /obj/item/ammo_box/magazine/uzim9mm
 	name = "uzi magazine (9mm)"
 	icon_state = "uzi9mm-32"
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index 863f29508dac0..b092e207c10d6 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -42,6 +42,9 @@
 	caliber = CALIBER_HARPOON
 	ammo_type = /obj/item/ammo_casing/harpoon
 
+/obj/item/ammo_box/magazine/internal/boltaction/jezail
+	max_ammo = 4
+
 /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/normal
 	name = "single round magazine"
 	max_ammo = 1
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index 3b2489022ea45..5331b5c92f8bc 100644
--- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -52,3 +52,8 @@
 	name = "triple-barrel shotgun internal magazine"
 	ammo_type = /obj/item/ammo_casing/shotgun/incapacitate
 	max_ammo = 3
+
+/obj/item/ammo_box/magazine/internal/shot/musket
+	name = "donk co musket internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/fletchette
+	max_ammo = 1
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f1df323609dd9..1452d879799fa 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -126,6 +126,21 @@
 	suppressed = null
 	update_appearance()
 
+/obj/item/gun/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	if(isliving(hit_atom))
+		var/mob/living/thrower = throwingdatum?.get_thrower()
+		toss_gun_hard(thrower, hit_atom)
+
+/obj/item/gun/proc/toss_gun_hard(mob/living/thrower, mob/living/target) //throw a gun at them. They don't expect it.
+	if(isnull(thrower))
+		return FALSE
+	if(!HAS_TRAIT(thrower, TRAIT_TOSS_GUN_HARD))
+		return FALSE
+	target.Knockdown(0.5 SECONDS)
+	target.apply_damage(damage = max(w_class * 5 - throwforce, 10), damagetype = BRUTE, def_zone = thrower.zone_selected, wound_bonus = CANT_WOUND, attacking_item = src)
+	return TRUE
+
 /obj/item/gun/examine(mob/user)
 	. = ..()
 	if(!pinless)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index adfd2fbf4fd54..972f7ebf32f63 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -5,6 +5,8 @@
 	name = "projectile gun"
 	icon_state = "debug"
 	w_class = WEIGHT_CLASS_NORMAL
+	pickup_sound = 'sound/items/gun_pick_up.ogg'
+	drop_sound = 'sound/items/gun_drop.ogg'
 
 	///sound when inserting magazine
 	var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg'
@@ -735,6 +737,24 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
 	chamber_round()
 	update_appearance()
 
+/obj/item/gun/ballistic/toss_gun_hard(mob/living/carbon/thrower, mob/living/target)
+	. = ..()
+	if(!.)
+		return
+	switch(bolt_type)
+		if(BOLT_TYPE_NO_BOLT) //emptying the revolver cylinder
+			attack_self()
+			return
+		if(BOLT_TYPE_OPEN) //emptying the chamber of an automatic weapon, because rack() doesn't do this to it
+			handle_chamber(chamber_next_round = FALSE)
+	if(!internal_magazine && magazine) //if a magazine is attached to the weapon, we remove it and throw it aside
+		magazine.forceMove(drop_location())
+		magazine.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), 1, 1)
+		magazine = null
+		update_icon() //updating the sprite of weapons without a magazine
+	if(!isnull(chambered)) //if there is a cartridge in the chamber, we remove it
+		rack()
+
 /obj/item/suppressor
 	name = "suppressor"
 	desc = "A syndicate small-arms suppressor for maximum espionage."
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index b86e2a9938995..a895cbe88e44f 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -86,20 +86,33 @@
 /obj/item/gun/ballistic/automatic/wt550/add_bayonet_point()
 	AddComponent(/datum/component/bayonet_attachable, offset_x = 25, offset_y = 12)
 
-/obj/item/gun/ballistic/automatic/plastikov
-	name = "\improper PP-95 SMG"
-	desc = "An ancient 9mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much."
-	icon_state = "plastikov"
-	inhand_icon_state = "plastikov"
-	accepted_magazine_type = /obj/item/ammo_box/magazine/plastikov9mm
-	burst_size = 5
-	spread = 25
-	can_suppress = FALSE
+/obj/item/gun/ballistic/automatic/smartgun
+	name = "\improper Abielle Smart-SMG"
+	desc = "An old experiment in smart-weapon technology that guides bullets towards the target the gun was aimed at when fired. \
+		While the tracking functions worked fine, the gun is prone to insanely wide spread thanks to it's practically non-existant barrel."
+	icon_state = "smartgun"
+	inhand_icon_state = "smartgun"
+	accepted_magazine_type = /obj/item/ammo_box/magazine/smartgun
+	burst_size = 4
+	fire_delay = 1
+	spread = 40
+	dual_wield_spread = 20
 	actions_types = list()
-	projectile_damage_multiplier = 0.35 //It's like 10.5 damage per bullet, it's close enough to 10 shots
+	bolt_type = BOLT_TYPE_LOCKING
+	can_suppress = FALSE
 	mag_display = TRUE
 	empty_indicator = TRUE
-	fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'
+	click_on_low_ammo = FALSE
+	/// List of the possible firing sounds
+	var/list/firing_sound_list = list(
+		'sound/weapons/gun/smartgun/smartgun_shoot_1.ogg',
+		'sound/weapons/gun/smartgun/smartgun_shoot_2.ogg',
+		'sound/weapons/gun/smartgun/smartgun_shoot_3.ogg',
+	)
+
+/obj/item/gun/ballistic/automatic/smartgun/fire_sounds()
+	var/picked_fire_sound = pick(firing_sound_list)
+	playsound(src, picked_fire_sound, fire_sound_volume, vary_fire_sound)
 
 /obj/item/gun/ballistic/automatic/mini_uzi
 	name = "\improper Type U3 Uzi"
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
index 92c4f19e9b333..d7a24c9deba47 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
@@ -45,6 +45,60 @@
 	jostle_pain_mult = 3
 	rip_time = 1 SECONDS
 
+/// sticky arrows
+/obj/item/ammo_casing/arrow/sticky
+	name = "sticky arrow"
+	desc = "A sticky arrow. Not sharp-ended, but ripping it off yourself once hit would be rather difficult and painful."
+	icon_state = "sticky_arrow"
+	inhand_icon_state = "sticky_arrow"
+	base_icon_state = "sticky_arrow"
+	projectile_type = /obj/projectile/bullet/arrow/sticky
+
+///sticky arrow projectile
+/obj/projectile/bullet/arrow/sticky
+	name = "sticky arrow"
+	desc = "Quite the sticky situation..."
+	icon_state = "sticky_arrow_projectile"
+	damage = 30
+	speed = 0.75
+	range = 20
+	embed_type = /datum/embed_data/arrow/sticky
+
+/datum/embed_data/arrow/sticky
+	embed_chance = 99
+	fall_chance = 0
+	jostle_chance = 1
+	ignore_throwspeed_threshold = TRUE
+	pain_stam_pct = 0.7
+	pain_mult = 3
+	jostle_pain_mult = 3
+	rip_time = 8 SECONDS
+
+/// poison arrows
+/obj/item/ammo_casing/arrow/poison
+	name = "poisonous arrow"
+	desc = "A poisonous arrow."
+	icon_state = "poison_arrow"
+	inhand_icon_state = "poison_arrow"
+	base_icon_state = "poison_arrow"
+	projectile_type = /obj/projectile/bullet/arrow/poison
+
+/// poison arrow projctile
+/obj/projectile/bullet/arrow/poison
+	name = "poisonous arrow"
+	desc = "Better to not get hit with this!"
+	icon_state = "poison_arrow_projectile"
+	damage = 40
+	embed_type = /datum/embed_data/arrow
+
+/obj/projectile/bullet/arrow/poison/on_hit(atom/target, blocked, pierce_hit)
+	. = ..()
+	if(!ishuman(target))
+		return
+
+	target.reagents?.add_reagent(/datum/reagent/toxin/cyanide, 8)
+	target.reagents?.add_reagent(/datum/reagent/toxin/staminatoxin, 1)
+
 /// holy arrows
 /obj/item/ammo_casing/arrow/holy
 	name = "holy arrow"
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 8604e21b32503..024f8353ddb48 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -170,6 +170,27 @@
 	if(.)
 		name = "\improper Obrez Moderna" // wear it loud and proud
 
+/obj/item/gun/ballistic/rifle/boltaction/donkrifle
+	name = "\improper Donk Co. Jezail"
+	desc = "A mass-manufactured bolt-action sporting rifle with a distinctively long barrel. Powerful enough to take down a space bear from a thousand paces. The lengthened barrel gives it good accuracy and power, even at range."
+	w_class = WEIGHT_CLASS_HUGE
+	lefthand_file = 'icons/mob/inhands/weapons/64x_guns_left.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/64x_guns_right.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
+	icon_state = "jezail"
+	inhand_icon_state = "jezail"
+	worn_icon_state = "jezail"
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/jezail
+	can_be_sawn_off = TRUE
+	sawn_desc = "A mass-manufactured bolt-action sporting rifle with a distinctively long barrel. Powerful enough to take down a space bear from a thousand paces. Its barrel has been cut off, so its power and accuracy have been impaired."
+
+/obj/item/gun/ballistic/rifle/boltaction/donkrifle/sawoff(mob/user) //the heavy price one pays for fitting this in a backpack
+	. = ..()
+	if(.)
+		projectile_damage_multiplier = 0.75
+		spread = 50
+
 /obj/item/gun/ballistic/rifle/rebarxbow
 	name = "Heated Rebar Crossbow"
 	desc = "Made from an inducer, iron rods, and some wire, this crossbow fires sharpened iron rods, made from the plentiful iron rods found stationwide. \
@@ -273,13 +294,14 @@
 	obj_flags = UNIQUE_RENAME
 	can_be_sawn_off = FALSE
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+	pb_knockback = 3
 
 	SET_BASE_PIXEL(-8, 0)
 
 /obj/item/gun/ballistic/rifle/boltaction/pipegun/add_bayonet_point()
 	AddComponent(/datum/component/bayonet_attachable, offset_x = 35, offset_y = 10)
 
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/handle_chamber()
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
 	. = ..()
 	do_sparks(1, TRUE, src)
 
@@ -303,13 +325,16 @@
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol
 	projectile_damage_multiplier = 0.50
 	spread = 15 //kinda inaccurate
+	burst_size = 3 //but it empties the entire magazine when it fires
+	fire_delay = 0.3 // and by empties, I mean it does it all at once
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM
+	semi_auto = TRUE
 
 	SET_BASE_PIXEL(0, 0)
 
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/pipepistol/add_bayonet_point()
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol/add_bayonet_point()
 	return
 
 /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime
@@ -330,6 +355,7 @@
 	inhand_icon_state = "regal_pipepistol"
 	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol/prime
 	projectile_damage_multiplier = 1
+	burst_size = 6 // WHOLE CLIP
 	spread = 0
 
 /// MAGICAL BOLT ACTIONS ///
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 792edbeaa16aa..9f854926dbdff 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -140,12 +140,15 @@
 
 /obj/item/gun/ballistic/shotgun/bulldog
 	name = "\improper Bulldog Shotgun"
-	desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
+	desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, \
+		nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. \
+		Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
 	icon_state = "bulldog"
-	inhand_icon_state = "bulldog"
-	worn_icon_state = "cshotgun"
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+	inhand_icon_state = "bulldog"
+	worn_icon = 'icons/mob/clothing/back.dmi'
+	worn_icon_state = "bulldog"
 	inhand_x_dimension = 32
 	inhand_y_dimension = 32
 	projectile_damage_multiplier = 1.2
@@ -166,9 +169,9 @@
 	internal_magazine = FALSE
 	tac_reloads = TRUE
 	burst_fire_selection = TRUE
-	///the type of secondary magazine for the bulldog
+	/// The type of secondary magazine for the bulldog
 	var/secondary_magazine_type
-	///the secondary magazine
+	/// The secondary magazine
 	var/obj/item/ammo_box/magazine/secondary_magazine
 
 /obj/item/gun/ballistic/shotgun/bulldog/Initialize(mapload)
@@ -199,10 +202,8 @@
 		. += "[icon_state]_secondary_mag_[initial(secondary_magazine.icon_state)]"
 		if(!secondary_magazine.ammo_count())
 			. += "[icon_state]_secondary_mag_empty"
-	else
-		. += "[icon_state]_no_secondary_mag"
 
-/obj/item/gun/ballistic/shotgun/bulldog/handle_chamber()
+/obj/item/gun/ballistic/shotgun/bulldog/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
 	if(!secondary_magazine)
 		return ..()
 	var/secondary_shells_left = LAZYLEN(secondary_magazine.stored_ammo)
@@ -340,3 +341,18 @@
 	if(LAZYACCESS(params2list(params), RIGHT_CLICK))
 		return hook.try_fire_gun(target, user, params)
 	return ..()
+
+/obj/item/gun/ballistic/shotgun/musket
+	name = "\improper Donk Co. Musket"
+	icon = 'icons/obj/weapons/guns/ballistic.dmi'
+	icon_state = "donk_musket"
+	inhand_icon_state = "donk_musket"
+	worn_icon_state = "donk_musket"
+	desc = "A large-bore boltloading firearm with a classy wooden frame. Cheap, accurate, and easy to maintain. Reload and rack after every shot."
+	semi_auto = TRUE
+	alternative_caliber = CALIBER_50BMG
+	casing_ejector = TRUE
+	bolt_type = BOLT_TYPE_LOCKING
+	bolt_wording = "bolt"
+	internal_magazine = TRUE
+	accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/musket
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 237d7cbbb1005..cb90438f56b4f 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -47,7 +47,7 @@
 	pb_knockback = 0
 	gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
 
-/obj/item/gun/ballistic/shotgun/toy/handle_chamber()
+/obj/item/gun/ballistic/shotgun/toy/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
 	. = ..()
 	if(chambered && !chambered.loaded_projectile)
 		qdel(chambered)
diff --git a/code/modules/projectiles/guns/bolt_types_explained.md b/code/modules/projectiles/guns/bolt_types_explained.md
index 63f6d6d4364f6..e1f638dceabda 100644
--- a/code/modules/projectiles/guns/bolt_types_explained.md
+++ b/code/modules/projectiles/guns/bolt_types_explained.md
@@ -1,7 +1,7 @@
 # Balistic gun icon states explained
 
 
-For a unknown period of time, `/obj/item/gun/ballistic` used the wrong icon state for it's `bolt_type` and so, if you tried to copy how it worked to make your own gun, you'd get a broken sprite.  This documentation is intended to explain in detail what some of the variables and functions do, and how to make your own gun subtypes that work properly.
+For a unknown period of time, `/obj/item/gun/ballistic` used the wrong icon state for its `bolt_type` and so, if you tried to copy how it worked to make your own gun, you'd get a broken sprite.  This documentation is intended to explain in detail what some of the variables and functions do, and how to make your own gun subtypes that work properly.
 
 ## Bolt Types
 The easiest thing to screw up.  For a long time, `/obj/item/gun/ballistic` had `bolt_type` set to `BOLT_TYPE_STANDARD` when the sprite was configured to use `BOLT_TYPE_LOCKING` sprites.  Nobody noticed, because it wasn't obtainable through normal gameplay, and the Mosin which was broken by it only has like 3 pixels missing.
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 5add2af58e300..d0342c02eadb2 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -3,6 +3,8 @@
 	name = "energy gun"
 	desc = "A basic energy-based gun."
 	icon = 'icons/obj/weapons/guns/energy.dmi'
+	pickup_sound = 'sound/items/gun_pick_up.ogg'
+	drop_sound = 'sound/items/gun_drop.ogg'
 
 	/// What type of power cell this uses
 	var/obj/item/stock_parts/power_store/cell
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index ab023d38b55ef..53cbe825085b2 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -84,6 +84,9 @@
 	else
 		to_chat(user, span_notice("There are no modifications currently installed."))
 
+/obj/item/gun/energy/recharge/kinetic_accelerator/try_fire_gun(atom/target, mob/living/user, params)
+	return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params)
+
 /obj/item/gun/energy/recharge/kinetic_accelerator/attack_hand_secondary(mob/user, list/modifiers)
 	. = ..()
 	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
@@ -192,6 +195,10 @@
 	var/pressure_decrease = 0.25
 	var/obj/item/gun/energy/recharge/kinetic_accelerator/kinetic_gun
 
+/obj/projectile/kinetic/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/parriable_projectile, parry_callback = CALLBACK(src, PROC_REF(on_parry)))
+
 /obj/projectile/kinetic/Destroy()
 	kinetic_gun = null
 	return ..()
@@ -209,6 +216,13 @@
 		damage = damage * pressure_decrease
 		pressure_decrease_active = TRUE
 
+/obj/projectile/kinetic/proc/on_parry(mob/user)
+	SIGNAL_HANDLER
+
+	// Ensure that if the user doesn't have tracer mod we're still visible
+	icon_state = "ka_tracer"
+	update_appearance()
+
 /obj/projectile/kinetic/on_range()
 	strike_thing()
 	..()
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 90dc0c5717275..a85d1d0db14ab 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -45,6 +45,15 @@
 	. = ..()
 	AddComponent(/datum/component/automatic_fire, 0.15 SECONDS, allow_akimbo = FALSE)
 
+/obj/item/gun/energy/laser/carbine/cybersun
+	name = "\improper Cybersun S-120"
+	desc = "A laser gun primarily used by syndicate security guards. It fires a rapid spray of low-power plasma beams."
+	icon_state = "cybersun_s120"
+	inhand_icon_state = "s120"
+	ammo_type = list(/obj/item/ammo_casing/energy/lasergun/carbine/cybersun)
+	spread = 14
+	pin = /obj/item/firing_pin/implant/pindicate
+
 /obj/item/gun/energy/laser/carbine/practice
 	name = "practice laser carbine"
 	desc = "A modified version of the laser carbine, this one fires even less concentrated energy bolts designed for target practice."
@@ -139,12 +148,14 @@
 	icon_state = "scatterlaser"
 	range = 255
 	damage = 6
+	var/size_per_tile = 0.1
+	var/max_scale = 4
 
 /obj/projectile/beam/laser/accelerator/Range()
 	..()
 	damage += 7
 	transform = 0
-	transform *= 1 + (((damage - 6)/7) * 0.2)//20% larger per tile
+	transform *= min(1 + (decayedRange - range) * size_per_tile, max_scale)
 
 ///X-ray gun
 
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 961d32c96ee8b..d06a36056d1c0 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -169,6 +169,9 @@
 	else
 		. = ..(amount=1)
 
+/obj/item/gun/energy/plasmacutter/try_fire_gun(atom/target, mob/living/user, params)
+	return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params)
+
 #undef PLASMA_CUTTER_CHARGE_WELD
 
 /obj/item/gun/energy/plasmacutter/adv
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 7870c10e9ef4a..c501f15db90e6 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -85,7 +85,8 @@
 	/// `speed` a modest value like 1 and set this to a low value like 0.2.
 	var/pixel_speed_multiplier = 1
 
-	var/Angle = 0
+	/// The current angle of the projectile. Initially null, so if the arg is missing from [/fire()], we can calculate it from firer and target as fallback.
+	var/Angle
 	var/original_angle = 0 //Angle at firing
 	var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
 	var/spread = 0 //amount (in degrees) of projectile spread
@@ -208,14 +209,9 @@
 	var/wound_falloff_tile
 	///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes
 	var/embed_falloff_tile
-	var/static/list/projectile_connections = list(
-		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
-		COMSIG_ATOM_ATTACK_HAND = PROC_REF(attempt_parry),
-	)
+	var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered))
 	/// If true directly targeted turfs can be hit
 	var/can_hit_turfs = FALSE
-	/// If this projectile has been parried before
-	var/parried = FALSE
 
 /obj/projectile/Initialize(mapload)
 	. = ..()
@@ -420,33 +416,6 @@
 		return
 	Impact(A)
 
-/// Signal proc for when a mob attempts to attack this projectile or the turf it's on with an empty hand.
-/obj/projectile/proc/attempt_parry(datum/source, mob/user, list/modifiers)
-	SIGNAL_HANDLER
-
-	if(parried)
-		return FALSE
-
-	if(SEND_SIGNAL(user, COMSIG_LIVING_PROJECTILE_PARRYING, src) & ALLOW_PARRY)
-		on_parry(user, modifiers)
-		return TRUE
-
-	return FALSE
-
-
-/// Called when a mob with PARRY_TRAIT clicks on this projectile or the tile its on, reflecting the projectile within 7 degrees and increasing the bullet's stats.
-/obj/projectile/proc/on_parry(mob/user, list/modifiers)
-	if(SEND_SIGNAL(user, COMSIG_LIVING_PROJECTILE_PARRIED, src) & INTERCEPT_PARRY_EFFECTS)
-		return
-
-	parried = TRUE
-	set_angle(dir2angle(user.dir) + rand(-3, 3))
-	firer = user
-	speed *= 0.8 // Go 20% faster when parried
-	damage *= 1.15 // And do 15% more damage
-	add_atom_colour(COLOR_RED_LIGHT, TEMPORARY_COLOUR_PRIORITY)
-
-
 /**
  * Called when the projectile hits something
  * This can either be from it bumping something,
@@ -528,7 +497,7 @@
 		return process_hit(T, select_target(T, target, bumped), bumped, hit_something) // try to hit something else
 	// at this point we are going to hit the thing
 	// in which case send signal to it
-	if (SEND_SIGNAL(target, COMSIG_PROJECTILE_PREHIT, args, src) & PROJECTILE_INTERRUPT_HIT)
+	if ((SEND_SIGNAL(target, COMSIG_PROJECTILE_PREHIT, args, src) & PROJECTILE_INTERRUPT_HIT) || (SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_PREHIT, args) & PROJECTILE_INTERRUPT_HIT))
 		qdel(src)
 		return BULLET_ACT_BLOCK
 	if(mode == PROJECTILE_PIERCE_HIT)
@@ -565,7 +534,7 @@
  */
 /obj/projectile/proc/select_target(turf/our_turf, atom/target, atom/bumped)
 	// 1. special bumped border object check
-	if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, FALSE, TRUE))
+	if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, TRUE, TRUE))
 		return bumped
 	// 2. original
 	if(can_hit_target(original, TRUE, FALSE, original == bumped))
@@ -776,7 +745,7 @@
 			required_moves = SSprojectiles.global_max_tick_moves
 			time_offset += overrun * speed
 		time_offset += MODULUS(elapsed_time_deciseconds, speed)
-
+	SEND_SIGNAL(src, COMSIG_PROJECTILE_BEFORE_MOVE)
 	for(var/i in 1 to required_moves)
 		pixel_move(pixel_speed_multiplier, FALSE)
 
@@ -793,21 +762,19 @@
 		process_hit(get_turf(direct_target), direct_target)
 		if(QDELETED(src))
 			return
+	var/turf/starting = get_turf(src)
 	if(isnum(angle))
 		set_angle(angle)
-	if(spread)
-		set_angle(Angle + ((rand() - 0.5) * spread))
-	var/turf/starting = get_turf(src)
-	if(isnull(Angle)) //Try to resolve through offsets if there's no angle set.
+	else if(isnull(Angle)) //Try to resolve through offsets if there's no angle set.
 		if(isnull(xo) || isnull(yo))
 			stack_trace("WARNING: Projectile [type] deleted due to being unable to resolve a target after angle was null!")
 			qdel(src)
 			return
 		var/turf/target = locate(clamp(starting + xo, 1, world.maxx), clamp(starting + yo, 1, world.maxy), starting.z)
 		set_angle(get_angle(src, target))
+	if(spread)
+		set_angle(Angle + (rand() - 0.5) * spread)
 	original_angle = Angle
-	if(!nondirectional_sprite)
-		transform = transform.Turn(Angle)
 	trajectory_ignore_forcemove = TRUE
 	forceMove(starting)
 	trajectory_ignore_forcemove = FALSE
@@ -816,7 +783,6 @@
 	fired = TRUE
 	play_fov_effect(starting, 6, "gunfire", dir = NORTH, angle = Angle)
 	SEND_SIGNAL(src, COMSIG_PROJECTILE_FIRE)
-	RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attempt_parry))
 	if(hitscan)
 		process_hitscan()
 		if(QDELETED(src))
@@ -936,21 +902,25 @@
 			trajectory.increment(-trajectory_multiplier)
 			qdel(src)
 			return
-		if(T.z != loc.z)
-			var/old = loc
-			before_z_change(loc, T)
-			trajectory_ignore_forcemove = TRUE
-			forceMove(T)
-			trajectory_ignore_forcemove = FALSE
-			after_z_change(old, loc)
-			if(!hitscanning)
-				pixel_x = trajectory.return_px()
-				pixel_y = trajectory.return_py()
-			forcemoved = TRUE
-			hitscan_last = loc
-		else if(T != loc)
+		if (T == loc)
+			continue
+		if (T.z == loc.z)
 			step_towards(src, T)
 			hitscan_last = loc
+			SEND_SIGNAL(src, COMSIG_PROJECTILE_PIXEL_STEP)
+			continue
+		var/old = loc
+		before_z_change(loc, T)
+		trajectory_ignore_forcemove = TRUE
+		forceMove(T)
+		trajectory_ignore_forcemove = FALSE
+		after_z_change(old, loc)
+		if(!hitscanning)
+			pixel_x = trajectory.return_px()
+			pixel_y = trajectory.return_py()
+		forcemoved = TRUE
+		hitscan_last = loc
+		SEND_SIGNAL(src, COMSIG_PROJECTILE_PIXEL_STEP)
 	if(QDELETED(src)) //deleted on last move
 		return
 	if(!hitscanning && !forcemoved)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index a8946379f8c52..542c2aaa35d92 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -38,6 +38,15 @@
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/yellow_laser
 	damage = 0
 
+/obj/projectile/beam/laser/carbine/cybersun
+	name = "red plasma beam"
+	icon_state = "lava"
+	light_color = COLOR_DARK_RED
+	impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
+	damage = 9
+	wound_bonus = -40
+	speed = 1.1
+
 //overclocked laser, does a bit more damage but has much higher wound power (-0 vs -20)
 /obj/projectile/beam/laser/hellfire
 	name = "hellfire laser"
diff --git a/code/modules/projectiles/projectile/bullets/junk.dm b/code/modules/projectiles/projectile/bullets/junk.dm
index 285c3ea281509..1c6ea89962e14 100644
--- a/code/modules/projectiles/projectile/bullets/junk.dm
+++ b/code/modules/projectiles/projectile/bullets/junk.dm
@@ -5,9 +5,28 @@
 	icon_state = "trashball"
 	damage = 30
 	embed_type = /datum/embed_data/bullet_junk
-	var/bane_mob_biotypes = MOB_ROBOTIC
-	var/bane_multiplier = 1.5
-	var/bane_added_damage = 0
+	/// What biotype does our junk projectile especially harm?
+	var/extra_damage_mob_biotypes = MOB_ROBOTIC
+	/// How much do we multiply our total base damage?
+	var/extra_damage_multiplier = 1.5
+	/// How much extra damage do we do on top of this total damage? Separate from the multiplier and unaffected by it.
+	var/extra_damage_added_damage = 0
+	/// What damage type is our extra damage?
+	var/extra_damage_type = BRUTE
+
+/obj/projectile/bullet/junk/on_hit(atom/target, blocked = 0, pierce_hit)
+	. = ..()
+
+	if(!isliving(target))
+		return
+	var/mob/living/living_target = target
+
+	var/is_correct_biotype = living_target.mob_biotypes & extra_damage_mob_biotypes
+	if(extra_damage_mob_biotypes && is_correct_biotype)
+		var/multiplied_damage = extra_damage_multiplier ? ((damage * extra_damage_multiplier) - damage) : 0
+		var/finalized_damage = multiplied_damage + extra_damage_added_damage
+		if(finalized_damage)
+			living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus)
 
 /datum/embed_data/bullet_junk
 	embed_chance=15
@@ -19,10 +38,6 @@
 	jostle_pain_mult=6
 	rip_time=10
 
-/obj/projectile/bullet/junk/Initialize(mapload)
-	. = ..()
-	AddElement(/datum/element/bane, mob_biotypes = bane_mob_biotypes, target_type = /mob/living, damage_multiplier = bane_multiplier, added_damage = bane_added_damage, requires_combat_mode = FALSE)
-
 /obj/projectile/bullet/incendiary/fire/junk
 	name = "burning oil"
 	damage = 30
@@ -40,7 +55,8 @@
 	damage = 15
 	embed_type = null
 	shrapnel_type = null
-	bane_multiplier = 3
+	extra_damage_added_damage = 30
+	extra_damage_type = BURN
 
 /obj/projectile/bullet/junk/shock/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
@@ -51,9 +67,9 @@
 /obj/projectile/bullet/junk/hunter
 	name = "junk hunter bullet"
 	icon_state = "gauss"
-	bane_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
-	bane_multiplier = 0
-	bane_added_damage = 50
+	extra_damage_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
+	extra_damage_multiplier = 0
+	extra_damage_added_damage = 50
 
 /obj/projectile/bullet/junk/ripper
 	name = "junk ripper bullet"
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 6bd355219f950..63e491e2f290d 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -71,3 +71,25 @@
 	impact_light_intensity = 5
 	impact_light_range = 1
 	impact_light_color_override = LIGHT_COLOR_DIM_YELLOW
+
+// .160 Smart
+
+/obj/projectile/bullet/c160smart
+	name = ".160 smart bullet"
+	icon_state = "smartgun"
+	damage = 10
+	embed_type = /datum/embed_data/bullet_c160smart
+	speed = 2
+	homing_turn_speed = 5
+	homing_inaccuracy_min = 4
+	homing_inaccuracy_max = 10
+
+/datum/embed_data/bullet_c160smart
+	embed_chance = 10
+	fall_chance = 5
+	jostle_chance = 3
+	ignore_throwspeed_threshold = TRUE
+	pain_stam_pct = 0.25
+	pain_mult = 3
+	jostle_pain_mult = 6
+	rip_time = 5
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index a013aaba691d7..7ae5741f3b992 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -108,6 +108,19 @@
 	stamina = 6
 	embed_type = null
 
+/obj/projectile/bullet/pellet/flechette
+	name = "flechette"
+	icon_state = "flechette"
+	damage = 6
+	wound_bonus = -25
+	bare_wound_bonus = 50
+	wound_falloff_tile = -10
+	speed = 0.8
+	ricochet_decay_chance = 0.6
+	ricochet_decay_damage = 0.3
+	demolition_mod = 10
+	weak_against_armour = TRUE
+
 // Mech Scattershot
 
 /obj/projectile/bullet/scattershot
diff --git a/code/modules/projectiles/projectile/energy/photon.dm b/code/modules/projectiles/projectile/energy/photon.dm
index 7caac3e062e01..62b5770fb441e 100644
--- a/code/modules/projectiles/projectile/energy/photon.dm
+++ b/code/modules/projectiles/projectile/energy/photon.dm
@@ -37,7 +37,7 @@
 		do_sparks(rand(1, 4), FALSE, src)
 
 /**
- * When traveling to a new turf, throws a probability to generate a hotspot across it's path.
+ * When traveling to a new turf, throws a probability to generate a hotspot across its path.
  */
 /obj/projectile/energy/photon/proc/scorch_earth(turf/open/floor/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
 	SIGNAL_HANDLER
diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm
index 66ea4d2c86593..b393dc3415fe5 100644
--- a/code/modules/projectiles/projectile/energy/stun.dm
+++ b/code/modules/projectiles/projectile/energy/stun.dm
@@ -19,7 +19,7 @@
 		var/mob/living/carbon/C = target
 		C.add_mood_event("tased", /datum/mood_event/tased)
 		SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
-		if(C.dna && C.dna.check_mutation(/datum/mutation/human/hulk))
+		if(HAS_TRAIT(C, TRAIT_HULK))
 			C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
 		else if(!C.check_stun_immunity(CANKNOCKDOWN))
 			addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 20), 0.5 SECONDS)
diff --git a/code/modules/reagents/chemistry/chem_wiki_render.dm b/code/modules/reagents/chemistry/chem_wiki_render.dm
index 99116adc84b08..2bb6bd7175bdc 100644
--- a/code/modules/reagents/chemistry/chem_wiki_render.dm
+++ b/code/modules/reagents/chemistry/chem_wiki_render.dm
@@ -9,7 +9,7 @@ ADMIN_VERB(generate_wikichem_list, R_DEBUG, "Parse Wikichems", "Parse and genera
 |-
 "}
 
-	var/input_text = tgui_input_text(user, "Input a name of a reagent, or a series of reagents split with a comma (no spaces) to get it's wiki table entry", "Recipe") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
+	var/input_text = tgui_input_text(user, "Input a name of a reagent, or a series of reagents split with a comma (no spaces) to get its wiki table entry", "Recipe") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
 	if(!input_text)
 		to_chat(user, "Input was blank!")
 		return
diff --git a/code/modules/reagents/chemistry/equilibrium.dm b/code/modules/reagents/chemistry/equilibrium.dm
index 4ab88b3caa674..435f4159ccbed 100644
--- a/code/modules/reagents/chemistry/equilibrium.dm
+++ b/code/modules/reagents/chemistry/equilibrium.dm
@@ -87,10 +87,10 @@
 	PRIVATE_PROC(TRUE)
 
 	if(QDELETED(holder))
-		stack_trace("an equilibrium is missing it's holder.")
+		stack_trace("an equilibrium is missing its holder.")
 		return FALSE
 	if(QDELETED(reaction))
-		stack_trace("an equilibrium is missing it's reaction.")
+		stack_trace("an equilibrium is missing its reaction.")
 		return FALSE
 	if(!length(reaction.required_reagents))
 		stack_trace("an equilibrium is missing required reagents.")
diff --git a/code/modules/reagents/chemistry/fermi_readme.md b/code/modules/reagents/chemistry/fermi_readme.md
index ebb930e486fca..0fc2ed76da1a9 100644
--- a/code/modules/reagents/chemistry/fermi_readme.md
+++ b/code/modules/reagents/chemistry/fermi_readme.md
@@ -82,11 +82,11 @@ Reaction rates are determined by the current temperature of the reagents holder.
 The amount added is based off the recipies’ required_temp, optimal_temp, overheat_temp and temp_exponent_factor. See below:
 ![image](https://user-images.githubusercontent.com/33956696/104081088-5e571e00-5224-11eb-8834-87aa36b3e45f.png)
 
-the y axis is the normalised value of growth, which is then muliplied by the rate_up_lim. You can see that temperatures below the required_temp produce no result (the reaction doesn't start, or if it is reacting, the reaction will stop). Between the required and optimal is a region that is defined by the temp_exponent_factor, so in this case the value is ^2, so we see exponential growth. Between the optimal_temp and the overheat_temp is the optimal phase - where the rate factor is 1. After that it continues to react, but will call overheated() per timestep. Presently the default for overheated() is to reduce the yield of the product (i.e. it's faster but you get less). The rate_up_lim is the maximum rate the reaction can go at optimal temperatures, so in this case a rate factor of 1 i.e. a temperature between 500+ will produce 10u, or a temperature of 400 will roughly produce 4u per step (independant of product ratio produced, if you put 10, it will only create 10 maximum regardless of how much product is defined in the results list). 
+the y axis is the normalised value of growth, which is then muliplied by the rate_up_lim. You can see that temperatures below the required_temp produce no result (the reaction doesn't start, or if it is reacting, the reaction will stop). Between the required and optimal is a region that is defined by the temp_exponent_factor, so in this case the value is ^2, so we see exponential growth. Between the optimal_temp and the overheat_temp is the optimal phase - where the rate factor is 1. After that it continues to react, but will call overheated() per timestep. Presently the default for overheated() is to reduce the yield of the product (i.e. it's faster but you get less). The rate_up_lim is the maximum rate the reaction can go at optimal temperatures, so in this case a rate factor of 1 i.e. a temperature between 500+ will produce 10u, or a temperature of 400 will roughly produce 4u per step (independant of product ratio produced, if you put 10, it will only create 10 maximum regardless of how much product is defined in the results list).
 
 ### How pH ranges are set and what pH mechanics do
 
-Optimal pH ranges are set on a per recipe basis - though at the moment all recipes use a default recipe, so they all have the same window (except for the buffers). Hopefully either as a community effort/or in future PRs we can create unique profiles for the present reactions in the game. 
+Optimal pH ranges are set on a per recipe basis - though at the moment all recipes use a default recipe, so they all have the same window (except for the buffers). Hopefully either as a community effort/or in future PRs we can create unique profiles for the present reactions in the game.
 
 As for how you define the reaction variables for a reaction, there are a few new variables for the chemical_recipe datum. I'll go over specifically how pH works for the default reaction.
 ```dm
@@ -106,7 +106,7 @@ The y axis is the purity of the product made for that time step. This is recalcu
 
 If you're designing a reaction you can define an optimal range between the OptimalpHMin to OptimalpHMax (5 - 7 in this case) and a deterministic region set by the ReactpHLim (5 - 4, 9 + 4 aka between 1 to 5 and 9 to 13). This deterministic region is exponential, so if you set it to 2 then it’ll exponentially grow, but since our CurveSharpph = 1, it’s linear (basically normalise the range in the determinsitic region, then put that to the power of CurveSharppH). Finally values outside of these ranges will prevent reactions from starting, but if a reaction drifts out during a reaction, the purity of volume created for each step will be 0 (It does not stop ongoing reactions). It’s entirely possible to design a reaction without a deterministic or optimal phase if you wanted.
 
-Though to note; if your purity dips below the PurityMin of a reaction it’ll call the overly_impure() function – which by default reduces the purity of all reagents in the beaker. Additionally, if the purity at the end of a reaction is below the PurityMin, it’ll convert into the failed chem defined by the product’s failed_chem defined in it's reagent datum. For default the PurityMin is 0.15, and is pretty difficult to fail. This is all customisable however, if you wanted to use these hooks to design a even more unique reaction, just don’t call the parent proc when using methods.
+Though to note; if your purity dips below the PurityMin of a reaction it’ll call the overly_impure() function – which by default reduces the purity of all reagents in the beaker. Additionally, if the purity at the end of a reaction is below the PurityMin, it’ll convert into the failed chem defined by the product’s failed_chem defined in its reagent datum. For default the PurityMin is 0.15, and is pretty difficult to fail. This is all customisable however, if you wanted to use these hooks to design a even more unique reaction, just don’t call the parent proc when using methods.
 
 
 ### Conditional changes in reagents datum per timestep
@@ -118,7 +118,7 @@ Though to note; if your purity dips below the PurityMin of a reaction it’ll ca
 	var/H_ion_release 			= 0.01       	// pH change per 1u reaction
 ```
 
-The thermic_constant is how much the temperature changes per u created, so for 10u created the temperature will increase by 10K. The H_ion_release is how much the pH changes per u created, for 10u created the pH will increase by 0.1. During a reaction this is the only factor in pH changes - presently the addition/removal of reagents tie to the reaction won't affect this, though other reactions ongoing in the beaker will also affect pH, as well as the removal/addition of reagents outside of the reaction. 
+The thermic_constant is how much the temperature changes per u created, so for 10u created the temperature will increase by 10K. The H_ion_release is how much the pH changes per u created, for 10u created the pH will increase by 0.1. During a reaction this is the only factor in pH changes - presently the addition/removal of reagents tie to the reaction won't affect this, though other reactions ongoing in the beaker will also affect pH, as well as the removal/addition of reagents outside of the reaction.
 
 ### Reaction flags
 
@@ -127,11 +127,11 @@ Reaction_flags can be used to set these defines:
 ```dm
 #define REACTION_CLEAR_IMPURE   //Convert into impure/pure on reaction completion in the datum/reagents holder instead of on consumption
 #define REACTION_CLEAR_INVERSE  //Convert into inverse on reaction completion when purity is low enough in the datum/reagents holder instead of on consumption
-#define REACTION_CLEAR_RETAIN	//Clear converted chems retain their purities/inverted purities. Requires 1 or both of the above. This is so that it can split again after splitting from a reaction (i.e. if your impure_chem or inverse_chem has it's own impure_chem/inverse_chem and you want it to split again on consumption). 
+#define REACTION_CLEAR_RETAIN	//Clear converted chems retain their purities/inverted purities. Requires 1 or both of the above. This is so that it can split again after splitting from a reaction (i.e. if your impure_chem or inverse_chem has its own impure_chem/inverse_chem and you want it to split again on consumption).
 #define REACTION_INSTANT        //Used to create instant reactions
 
 /datum/chemical_reaction
-	var/reaction_flags	
+	var/reaction_flags
 ```
 
 For REACTION_CLEAR – this causes the purity mechanics to resolve in the beaker at the end of the reaction, instead of when added to a mob.
@@ -145,7 +145,7 @@ Eg:
 	...
 	var/required_temp			= 300
 	var/optimal_temp			= 200
-	var/overheat_temp 			= 50 
+	var/overheat_temp 			= 50
 ```
 
 # Reagents
@@ -156,45 +156,45 @@ The new vars that are introduced are below:
 	var/ph = 7
 	///Purity of the reagent
 	var/purity = 1
-	///the purity of the reagent on creation (i.e. when it's added to a mob and it's purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
-	var/creation_purity = 1	
+	///the purity of the reagent on creation (i.e. when it's added to a mob and its purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
+	var/creation_purity = 1
 	//impure chem values (see fermi_readme.dm for more details):
 	var/impure_chem		 = /datum/reagent/impurity			// What chemical path is made when metabolised as a function of purity
 	var/inverse_chem_val = 0.2								// If the impurity is below 0.5, replace ALL of the chem with inverse_chem upon metabolising
 	var/inverse_chem	 = /datum/reagent/impurity/toxic		// What chem is metabolised when purity is below inverse_chem_val
 	var/failed_chem		 = /datum/reagent/consumable/failed_reaction //what chem is made at the end of a reaction IF the purity is below the recipies purity_min
-    var/chemical_flags 
+    var/chemical_flags
 ```
 
 - `pH` is the innate pH of the reagent and is used to calculate the pH of a reagents datum on addition/removal. This does not change and is a reference value. The reagents datum pH changes.
 - `purity` is the INTERNAL value for splitting. This is set to 1 after splitting so that it doesn't infinite split
 - `creation_purity` is the purity of the reagent on creation. This won't change. If you want to write code that checks the purity in any of the methods, use this.
-- `impure_chem` is the datum type that is created provided that it's `creation_purity` is above the `inverse_chem_val`. When the reagent is consumed it will split into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_IMPURE flag it will split at the end of the reaction in the `datum/reagents` holder
+- `impure_chem` is the datum type that is created provided that its `creation_purity` is above the `inverse_chem_val`. When the reagent is consumed it will split into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_IMPURE flag it will split at the end of the reaction in the `datum/reagents` holder
 - `inverse_chem_val` if a reagent's purity is below this value it will 100% convert into `inverse_chem`. If above it will split into `impure_chem`. See the note on purity effects above
-- `inverse_chem` is the datum type that is created provided that it's `creation_purity` is below the `inverse_chem_val`. When the reagent is consumed it will 100% convert into this OR if the associated  `datum/chemical_recipe` has a REACTION_CLEAR_INVERSE flag it will 100% convert at the end of the reaction in the `datum/reagents` holder
-- `failed_chem` is the chem that the product is 100% converted into if the purity is below the associated `datum/chemical_recipies`' `PurityMin` AT THE END OF A REACTION. 
+- `inverse_chem` is the datum type that is created provided that its `creation_purity` is below the `inverse_chem_val`. When the reagent is consumed it will 100% convert into this OR if the associated  `datum/chemical_recipe` has a REACTION_CLEAR_INVERSE flag it will 100% convert at the end of the reaction in the `datum/reagents` holder
+- `failed_chem` is the chem that the product is 100% converted into if the purity is below the associated `datum/chemical_recipies`' `PurityMin` AT THE END OF A REACTION.
 
 When writing any reagent code ALWAYS use creation_purity. Purity is kept for internal mechanics only and won’t reflect the purity on creation.
 
 See above for purity mechanics, but this is where you set the reagents that are created. If you’re making an impure reagent I recommend looking at impure_reagents.dm to see how they’re set up and consider using the `datum/reagents/impure` as a parent.
 
 The flags you can set for `var/chemical_flags` are:
-```dm 
+```dm
 #define REAGENT_DEAD_PROCESS		(1<<0)	//allows on_mob_dead() if present in a dead body
 #define REAGENT_DONOTSPLIT			(1<<1)	//Do not split the chem at all during processing - ignores all purity effects
 #define REAGENT_INVISIBLE			(1<<2)	//Doesn't appear on handheld health analyzers.
 #define REAGENT_SNEAKYNAME          (1<<3)  //When inverted, the inverted chem uses the name of the original chem
-#define REAGENT_SPLITRETAINVOL      (1<<4)  //Retains initial volume of chem when splitting for purity effects 
+#define REAGENT_SPLITRETAINVOL      (1<<4)  //Retains initial volume of chem when splitting for purity effects
 
 /datum/reagent
-	var/chemical_flags 
+	var/chemical_flags
 ```
 
 While you might think reagent_flags is a more sensible name - it is already used for beakers. Hopefully this doesn't trip anyone up.
 
 # Relivant vars from the holder.dm / reagents datum
 
-There are a few variables that are useful to know about 
+There are a few variables that are useful to know about
 ```dm
 /datum/reagents
 	/// Current temp of the holder volume
@@ -209,4 +209,4 @@ There are a few variables that are useful to know about
 - chem_temp is the temperature used in the `datum/chemical_recipe`
 - pH is a result of the sum of all reagents, as well as any changes from buffers and reactions. This is the pH used in `datum/chemical_recipe`.
 - isReacting is a bool that can be used outside to ensure that you don't touch a reagents that is reacting.
-- previous_reagent_list is a list of the previous reagents (just the typepaths, not the objects) that was present on the last handle_reactions() method. This is to prevent pointless method calls.
\ No newline at end of file
+- previous_reagent_list is a list of the previous reagents (just the typepaths, not the objects) that was present on the last handle_reactions() method. This is to prevent pointless method calls.
diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm
index 46d00e765a343..11117142d70e5 100644
--- a/code/modules/reagents/chemistry/holder/holder.dm
+++ b/code/modules/reagents/chemistry/holder/holder.dm
@@ -249,7 +249,7 @@
 		cached_reagent.volume -= remove_amount
 
 		//record the changes
-		removed_reagents += cached_reagent
+		removed_reagents[cached_reagent] = remove_amount
 		total_removed_amount += remove_amount
 
 		//if we reached here means we have found our specific reagent type so break
@@ -257,8 +257,8 @@
 			break
 
 	//inform others about our reagents being removed
-	for(var/datum/reagent/removed_reagent as anything in cached_reagents)
-		SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, removed_reagent, amount)
+	for(var/datum/reagent/removed_reagent as anything in removed_reagents)
+		SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, removed_reagent, removed_reagents[removed_reagent])
 
 	//update the holder & handle reactions
 	update_total()
@@ -476,6 +476,8 @@
 		if(preserve_data)
 			trans_data = copy_data(reagent)
 		if(reagent.intercept_reagents_transfer(target_holder, amount))
+			update_total()
+			target_holder.update_total()
 			continue
 		transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred.
 		if(!transfered_amount)
@@ -607,7 +609,7 @@
 	. = 0
 
 	//responsible for removing reagents and computing total ph & volume
-	//all it's code was taken out of del_reagent() initially for efficiency purposes
+	//all its code was taken out of del_reagent() initially for efficiency purposes
 	while(chem_index <= num_reagents)
 		var/datum/reagent/reagent = cached_reagents[chem_index]
 		chem_index += 1
diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm
index ad7f0413ce561..0344971497b01 100644
--- a/code/modules/reagents/chemistry/items.dm
+++ b/code/modules/reagents/chemistry/items.dm
@@ -109,7 +109,7 @@
 		to_chat(user, span_notice("You switch the chemical analyzer to provide a detailed description of each reagent."))
 		scanmode = DETAILED_CHEM_OUTPUT
 	else
-		to_chat(user, span_notice("You switch the chemical analyzer to not include reagent descriptions in it's report."))
+		to_chat(user, span_notice("You switch the chemical analyzer to not include reagent descriptions in its report."))
 		scanmode = SHORTENED_CHEM_OUTPUT
 
 /obj/item/ph_meter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 22e569af66021..cf193decb6931 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -211,8 +211,8 @@
 	.["amount"] = amount
 	.["energy"] = cell.charge ? cell.charge : 0 //To prevent NaN in the UI.
 	.["maxEnergy"] = cell.maxcharge
-	.["displayedEnergy"] = display_energy(cell.charge)
-	.["displayedMaxEnergy"] = display_energy(cell.maxcharge)
+	.["displayedUnits"] = cell.charge ? (cell.charge / power_cost) : 0
+	.["displayedMaxUnits"] = cell.maxcharge / power_cost
 	.["showpH"] = isnull(recording_recipe) ? show_ph : FALSE //virtual beakers have no ph to compute & display
 
 	var/list/chemicals = list()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 0a08bf9b62329..e90c4c7145802 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -247,11 +247,6 @@
 /obj/machinery/chem_master/attack_ai_secondary(mob/user, list/modifiers)
 	return attack_hand_secondary(user, modifiers)
 
-/obj/machinery/chem_master/ui_assets(mob/user)
-	return list(
-		get_asset_datum(/datum/asset/spritesheet/chemmaster)
-	)
-
 /obj/machinery/chem_master/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
@@ -273,9 +268,10 @@
 		//add containers to this category
 		for(var/obj/item/reagent_containers/container as anything in printable_containers[category])
 			category_list["containers"] += list(list(
-				"icon" = sanitize_css_class_name("[container]"),
 				"ref" = REF(container),
 				"name" = initial(container.name),
+				"icon" = initial(container.icon),
+				"icon_state" = initial(container.icon_state),
 				"volume" = initial(container.volume),
 			))
 
@@ -365,32 +361,18 @@
  * Transfers a single reagent between buffer & beaker
  * Arguments
  *
- * * mob/user - the player who is attempting the transfer
  * * datum/reagents/source - the holder we are transferring from
  * * datum/reagents/target - the holder we are transferring to
  * * datum/reagent/path - the reagent typepath we are transfering
- * * amount - volume to transfer -1 means custom amount
+ * * amount - volume to transfer
  * * do_transfer - transfer the reagents else destroy them
  */
-/obj/machinery/chem_master/proc/transfer_reagent(mob/user, datum/reagents/source, datum/reagents/target, datum/reagent/path, amount, do_transfer)
+/obj/machinery/chem_master/proc/transfer_reagent(datum/reagents/source, datum/reagents/target, datum/reagent/path, amount, do_transfer)
 	PRIVATE_PROC(TRUE)
 
 	//sanity checks for transfer amount
-	if(isnull(amount))
-		return FALSE
-	amount = text2num(amount)
-	if(isnull(amount))
-		return FALSE
-	if(amount == -1)
-		var/target_amount = tgui_input_number(user, "Enter amount to transfer", "Transfer amount")
-		if(!target_amount)
-			return FALSE
-		amount = text2num(target_amount)
-		if(isnull(amount))
-			return FALSE
-	if(amount <= 0)
+	if(isnull(amount) || amount <= 0)
 		return FALSE
-
 	//sanity checks for reagent path
 	var/datum/reagent/reagent = text2path(path)
 	if (!reagent)
@@ -425,18 +407,34 @@
 
 		if("transfer")
 			if(is_printing)
-				say("buffer locked while printing!")
+				say("The buffer is locked while printing.")
 				return
 
 			var/reagent_ref = params["reagentRef"]
 			var/amount = params["amount"]
 			var/target = params["target"]
 
+			if(amount == -1) // Set custom amount
+				var/mob/user = ui.user //Hold a reference of the user if the UI is closed
+				amount = tgui_input_number(user, "Enter amount to transfer", "Transfer amount")
+				if(!amount || !user.can_perform_action(src))
+					return FALSE
+
+			var/should_transfer = is_transfering || (target == "buffer") // we should always transfer if target is the buffer
+			if(should_transfer && isnull(beaker)) // if there's no beaker, we cannot transfer
+				say("No reagent container is inserted.")
+				return FALSE
+
+			var/reagents_from
+			var/reagents_to = null
 			if(target == "buffer")
-				return transfer_reagent(ui.user, beaker.reagents, reagents, reagent_ref, amount, TRUE)
+				reagents_from = beaker.reagents
+				reagents_to = reagents // buffer
 			else if(target == "beaker")
-				return transfer_reagent(ui.user, reagents, beaker.reagents, reagent_ref, amount, is_transfering)
-			return FALSE
+				reagents_from = reagents // buffer
+				if(should_transfer)
+					reagents_to = beaker.reagents
+			return transfer_reagent(reagents_from, reagents_to, reagent_ref, amount, should_transfer)
 
 		if("toggleTransferMode")
 			is_transfering = !is_transfering
diff --git a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
index 9d81188fb405e..9b0773a8316b5 100644
--- a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
@@ -203,7 +203,7 @@
 		ui.send_update()
 
 /**
- * Decodes the ui reaction var into it's original name
+ * Decodes the ui reaction var into its original name
  * Arguments
  *
  * * variable - the name of the variable as seen in the UI
diff --git a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
index 016e55012c570..9c92cc631be79 100644
--- a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
+++ b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
@@ -11,6 +11,7 @@
 	custom_premium_price = PAYCHECK_CREW * 14
 	interaction_flags_click = FORBID_TELEKINESIS_REACH
 	interaction_flags_mouse_drop = FORBID_TELEKINESIS_REACH
+	storage_type = /datum/storage/portable_chem_mixer
 
 	///Creating an empty slot for a beaker that can be added to dispense into
 	var/obj/item/reagent_containers/beaker
@@ -21,15 +22,7 @@
 
 /obj/item/storage/portable_chem_mixer/Initialize(mapload)
 	. = ..()
-	atom_storage.max_total_storage = 200
-	atom_storage.max_slots = 50
-	atom_storage.set_holdable(list(
-		/obj/item/reagent_containers/cup/beaker,
-		/obj/item/reagent_containers/cup/bottle,
-		/obj/item/reagent_containers/cup/tube,
-		/obj/item/reagent_containers/cup/glass/waterbottle,
-		/obj/item/reagent_containers/condiment,
-	))
+
 	register_context()
 
 /obj/item/storage/portable_chem_mixer/Destroy()
@@ -107,18 +100,18 @@
 /obj/item/storage/portable_chem_mixer/ex_act(severity, target)
 	return severity > EXPLODE_LIGHT ? ..() : FALSE
 
-/obj/item/storage/portable_chem_mixer/item_interaction(mob/living/user, obj/item/weapon, list/modifiers)
+/obj/item/storage/portable_chem_mixer/storage_insert_on_interacted_with(datum/storage, obj/item/weapon, mob/living/user)
 	if (!atom_storage.locked || \
 		(weapon.item_flags & ABSTRACT) || \
 		(weapon.flags_1 & HOLOGRAM_1) || \
 		!is_reagent_container(weapon) || \
 		!weapon.is_open_container() \
 	)
-		return NONE
+		return TRUE //continue with regular insertion
 
 	replace_beaker(user, weapon)
 	update_appearance()
-	return ITEM_INTERACT_SUCCESS
+	return FALSE //block insertion cause we handled it ourselves
 
 /**
  * Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently
@@ -267,7 +260,7 @@
 		SStgui.close_uis(src)
 	else
 		atom_storage.locked = STORAGE_FULLY_LOCKED
-		atom_storage.hide_contents(usr)
+		atom_storage.hide_contents(user)
 
 	update_appearance()
 	return CLICK_ACTION_SUCCESS
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 9a1b24fedd348..4d143e05a1c98 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -204,7 +204,11 @@
 		if(weapon.w_class + total_weight > maximum_weight)
 			to_chat(user, span_warning("[weapon] is too big to fit into [src]."))
 			continue
-		weapon.forceMove(src)
+
+		//try to remove the right way
+		if(!user.transferItemToLoc(weapon, src))
+			continue
+
 		total_weight += weapon.w_class
 		items_transfered += 1
 		to_chat(user, span_notice("[weapon] was loaded into [src]."))
@@ -212,8 +216,8 @@
 	return items_transfered
 
 /obj/machinery/reagentgrinder/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
-	if(user.combat_mode || (tool.item_flags & ABSTRACT) || (tool.flags_1 & HOLOGRAM_1) || !can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH))
-		return NONE
+	if(user.combat_mode || (tool.item_flags & ABSTRACT) || (tool.flags_1 & HOLOGRAM_1))
+		return ITEM_INTERACT_SKIP_TO_ATTACK
 
 	//add the beaker
 	if (is_reagent_container(tool) && tool.is_open_container())
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 576d62585f7a8..8edfb38abc397 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -24,7 +24,7 @@
 	var/ph = 7
 	///Purity of the reagent - for use with internal reaction mechanics only. Use below (creation_purity) if you're writing purity effects into a reagent's use mechanics.
 	var/purity = 1
-	///the purity of the reagent on creation (i.e. when it's added to a mob and it's purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
+	///the purity of the reagent on creation (i.e. when it's added to a mob and its purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
 	var/creation_purity = 1
 	///The molar mass of the reagent - if you're adding a reagent that doesn't have a recipe, just add a random number between 10 - 800. Higher numbers are "harder" but it's mostly arbitary.
 	var/mass
@@ -270,7 +270,7 @@ Primarily used in reagents/reaction_agents
 	return creation_purity / normalise_num_to
 
 /**
- * Gets the inverse purity of this reagent. Mostly used when converting from a normal reagent to it's inverse one.
+ * Gets the inverse purity of this reagent. Mostly used when converting from a normal reagent to its inverse one.
  *
  * Arguments
  * * purity - Overrides the purity used for determining the inverse purity.
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 680cced458d91..dd463397b77bd 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -536,7 +536,7 @@
 /*
 *How this medicine works:
 *Penthrite if you are not in crit only stabilizes your heart.
-*As soon as you pass crit threshold it's special effects kick in. Penthrite forces your heart to beat preventing you from entering
+*As soon as you pass crit threshold its special effects kick in. Penthrite forces your heart to beat preventing you from entering
 *soft and hard crit, but there is a catch. During this you will be healed and you will sustain
 *heart damage that will not imapct you as long as penthrite is in your system.
 *If you reach the threshold of -60 HP penthrite stops working and you get a heart attack, penthrite is flushed from your system in that very moment,
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index e50775c2487e6..3f5b7e3a24479 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -10,7 +10,7 @@
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	creation_purity = 1 // impure base reagents are a big no-no
 	ph = 7.33
-	burning_temperature = 2193//ethanol burns at 1970C (at it's peak)
+	burning_temperature = 2193//ethanol burns at 1970C (at its peak)
 	burning_volume = 0.1
 	default_container = /obj/item/reagent_containers/cup/glass/bottle/beer
 	fallback_icon = 'icons/obj/drinks/bottles.dmi'
@@ -1755,28 +1755,32 @@
 	quality = DRINK_GOOD
 	taste_description = "bitter, creamy cacao"
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-	var/obj/item/shield/mighty_shield
+	var/datum/weakref/mighty_shield
 
 /datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/drinker)
 	. = ..()
 	if(ishuman(drinker))
 		var/mob/living/carbon/human/the_human = drinker
 		for(var/obj/item/shield/the_shield in the_human.contents)
-			mighty_shield = the_shield
-			mighty_shield.block_chance += 10
+			mighty_shield = WEAKREF(the_shield)
+			the_shield.block_chance += 10
 			to_chat(the_human, span_notice("[the_shield] appears polished, although you don't recall polishing it."))
+			break
 
 /datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired)
-	if(mighty_shield && !(mighty_shield in drinker.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
+	var/obj/item/shield/the_shield = mighty_shield?.resolve()
+	if(the_shield && !(the_shield in drinker.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
 		holder.remove_reagent(type, volume)
 		return
 	return ..()
 
 /datum/reagent/consumable/ethanol/alexander/on_mob_end_metabolize(mob/living/drinker)
 	. = ..()
-	if(mighty_shield)
-		mighty_shield.block_chance -= 10
-		to_chat(drinker,span_notice("You notice [mighty_shield] looks worn again. Weird."))
+	var/obj/item/shield/the_shield = mighty_shield?.resolve()
+	if(the_shield)
+		the_shield.block_chance -= 10
+		to_chat(drinker,span_notice("You notice [the_shield] looks worn again. Weird."))
+		mighty_shield = null
 
 /datum/reagent/consumable/ethanol/amaretto_alexander
 	name = "Amaretto Alexander"
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
index 3ae946d4fab46..336ab2353947a 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
@@ -227,7 +227,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
 	///Prevents message spam
 	var/spammer = 0
 
-//Just the removed itching mechanism - omage to it's origins.
+//Just the removed itching mechanism - omage to its origins.
 /datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
 	. = ..()
 	if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated()))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 29822e3158bec..1ecc9ca9b5db5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -928,7 +928,7 @@
 	reagent_state = GAS
 	color = COLOR_GRAY
 	taste_mult = 0 // oderless and tasteless
-	ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in it's implementation anyways
+	ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in its implementation anyways
 	chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
 
 
@@ -2685,7 +2685,7 @@
 /datum/reagent/metalgen
 	name = "Metalgen"
 	data = list("material"=null)
-	description = "A purple metal morphic liquid, said to impose it's metallic properties on whatever it touches."
+	description = "A purple metal morphic liquid, said to impose its metallic properties on whatever it touches."
 	color = "#b000aa"
 	taste_mult = 0 // oderless and tasteless
 	chemical_flags = REAGENT_NO_RANDOM_RECIPE
diff --git a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
index d6c4f0009b403..e7cb222ac5837 100644
--- a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
@@ -110,7 +110,7 @@
 
 /datum/reagent/reaction_agent/speed_agent
 	name = "Tempomyocin"
-	description = "This reagent will consume itself and speed up an ongoing reaction, modifying the current reaction's purity by it's own."
+	description = "This reagent will consume itself and speed up an ongoing reaction, modifying the current reaction's purity by its own."
 	ph = 10
 	color = "#e61f82"
 
diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm
index 40305c9a8bc47..59271ccbcf9db 100644
--- a/code/modules/reagents/chemistry/recipes.dm
+++ b/code/modules/reagents/chemistry/recipes.dm
@@ -151,7 +151,7 @@
 				return
 
 /**
- * Occurs when a reation is overheated (i.e. past it's overheatTemp)
+ * Occurs when a reation is overheated (i.e. past its overheatTemp)
  * Will be called every tick in the reaction that it is overheated
  * If you want this to be a once only proc (i.e. the reaction is stopped after) set reaction.toDelete = TRUE
  * The above is useful if you're writing an explosion
diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
index 28aeb5743faaa..ae6e616b20390 100644
--- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
+++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
@@ -155,7 +155,7 @@
 	if(off_cooldown(holder, equilibrium, 2, "hercuri_freeze"))
 		return
 	playsound(holder.my_atom, 'sound/magic/ethereal_exit.ogg', 50, 1)
-	holder.my_atom.visible_message("The reaction frosts over, releasing it's chilly contents!")
+	holder.my_atom.visible_message("The reaction frosts over, releasing its chilly contents!")
 	var/radius = max((equilibrium.step_target_vol/50), 1)
 	freeze_radius(holder, equilibrium, 200, radius, 60 SECONDS) //drying agent exists
 	explode_shockwave(holder, equilibrium, sound_and_text = FALSE)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f02aaa3ab2473..62a14ddc794be 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -499,7 +499,7 @@
 		return ..()
 	var/turf/local_turf = get_turf(holder.my_atom)
 	playsound(local_turf, 'sound/magic/ethereal_exit.ogg', 50, 1)
-	local_turf.visible_message("The reaction frosts over, releasing it's chilly contents!")
+	local_turf.visible_message("The reaction frosts over, releasing its chilly contents!")
 	freeze_radius(holder, null, holder.chem_temp*2, clamp(cryostylane.volume/30, 2, 6), 120 SECONDS, 2)
 	clear_reactants(holder, 15)
 	holder.chem_temp += 100
diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index 592a281ed7301..75a60ba49d53d 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -345,9 +345,9 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents())
 			dat += " <li>heating it above [recipe.required_temp] degrees"
 			dat += " but not above [recipe.overheat_temp] degrees"
 		if(recipe.thermic_constant > 0)
-			dat += "<li> taking care of it's exothermic nature</li>"
+			dat += "<li> taking care of its exothermic nature</li>"
 		else if(recipe.thermic_constant < 0)
-			dat += "<li> taking care of it's endothermic nature</li>"
+			dat += "<li> taking care of its endothermic nature</li>"
 	var/datum/chemical_reaction/randomized/random_recipe = recipe
 	if(random_recipe)
 		if(random_recipe.randomize_req_ph)
diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
index 97906b26240e5..fda39ed4877ba 100644
--- a/code/modules/reagents/reagent_containers/cups/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -431,7 +431,7 @@
 
 /obj/item/reagent_containers/cup/bottle/thermite
 	name = "thermite bottle"
-	list_reagents = list(/datum/reagent/thermite = 30)
+	list_reagents = list(/datum/reagent/thermite = 50)
 
 // Bottles for mail goodies.
 
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
index 2f326accb9074..c124ccec6bb77 100644
--- a/code/modules/reagents/reagent_containers/cups/drinks.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -316,7 +316,7 @@
 		var/mob/living/thrower = throwingdatum?.get_thrower()
 		if(thrower)
 			thrower.add_mood_event("bottle_flip", /datum/mood_event/bottle_flip)
-	else // landed on it's side
+	else // landed on its side
 		animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
 
 /obj/item/reagent_containers/cup/glass/waterbottle/pickup(mob/user)
diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm
index d2dc2adfb5f76..8b13ab4a54beb 100644
--- a/code/modules/reagents/reagent_containers/misc.dm
+++ b/code/modules/reagents/reagent_containers/misc.dm
@@ -91,7 +91,6 @@
 
 /obj/item/reagent_containers/cup/maunamug/attack_hand(mob/living/user, list/modifiers)
 	if(cell && open)
-		cell.update_appearance()
 		user.put_in_hands(cell)
 		cell = null
 		to_chat(user, span_notice("You remove the power cell from [src]."))
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index bb426436599c0..dc54dcd7db44b 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -229,6 +229,8 @@
 	stream_range = 4
 	amount_per_transfer_from_this = 5
 	list_reagents = list(/datum/reagent/consumable/condensedcapsaicin = 50)
+	pickup_sound = 'sound/items/pepper_spray_pick_up.ogg'
+	drop_sound = 'sound/items/pepper_spray_drop.ogg'
 
 /obj/item/reagent_containers/spray/pepper/empty //for protolathe printing
 	list_reagents = null
diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm
index c5dfdc39d3e98..21c5aa7a1a902 100644
--- a/code/modules/recycling/conveyor.dm
+++ b/code/modules/recycling/conveyor.dm
@@ -373,8 +373,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 
 /obj/machinery/conveyor_switch/Destroy()
 	LAZYREMOVE(GLOB.conveyors_by_id[id], src)
-	QDEL_NULL(wires)
-	. = ..()
+	return ..()
 
 /obj/machinery/conveyor_switch/vv_edit_var(var_name, var_value)
 	if (var_name == NAMEOF(src, id))
diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm
index 78de2bd3a0bb0..8e01403e5a64c 100644
--- a/code/modules/religion/sparring/sparring_datum.dm
+++ b/code/modules/religion/sparring/sparring_datum.dm
@@ -60,7 +60,6 @@
 	UnregisterSignal(sparring, list(
 		COMSIG_MOB_FIRED_GUN,
 		COMSIG_MOB_GRENADE_ARMED,
-		COMSIG_MOB_ITEM_ATTACK,
 		COMSIG_MOVABLE_MOVED,
 		COMSIG_MOVABLE_POST_TELEPORT,
 		COMSIG_MOB_STATCHANGE,
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 7572a73529200..53104494c820e 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -582,6 +582,16 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SERVICE
 
+/datum/design/board/dehydrator
+	name = "Dehydrator Board"
+	desc = "The circuit board for a dehydrator."
+	id = "dehydrator"
+	build_path = /obj/item/circuitboard/machine/dehydrator
+	category = list(
+		RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_KITCHEN
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+
 /datum/design/board/vatgrower
 	name = "Growing Vat Board"
 	desc = "The circuit board for a growing vat."
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 19b3403908f81..96b3e60c63505 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1987,6 +1987,17 @@
 	var/datum/mod_theme/theme = GLOB.mod_themes[initial(armor_type.theme)]
 	desc = "External plating for a MODsuit. [theme.desc]"
 
+/datum/design/mod_plating/civilian
+	name = "MOD Civilian Plating"
+	id = "mod_plating_civilian"
+	build_path = /obj/item/mod/construction/plating/civilian
+	materials = list(
+		/datum/material/iron =SHEET_MATERIAL_AMOUNT*3,
+		/datum/material/glass =SHEET_MATERIAL_AMOUNT*1.5,
+		/datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT,
+	)
+	research_icon_state = "civilian-plating"
+
 /datum/design/mod_plating/engineering
 	name = "MOD Engineering Plating"
 	id = "mod_plating_engineering"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 27dbbca1d179c..5daf936119076 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -403,7 +403,11 @@
 	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
 	id = "ci-surgery"
 	build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
-	materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5)
+	materials = list (
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.25,
+		/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+	)
 	construction_time = 2 SECONDS
 	build_path = /obj/item/organ/internal/cyberimp/arm/surgery
 	category = list(
@@ -416,7 +420,11 @@
 	desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm."
 	id = "ci-toolset"
 	build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
-	materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5)
+	materials = list (
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.25,
+		/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+	)
 	construction_time = 2 SECONDS
 	build_path = /obj/item/organ/internal/cyberimp/arm/toolset
 	category = list(
@@ -1070,6 +1078,12 @@
 	surgery = /datum/surgery/advanced/lobotomy
 	research_icon_state = "surgery_head"
 
+/datum/design/surgery/lobotomy/mechanic
+	name = "Wetware OS Destructive Defragmentation"
+	desc = "A destructive robotic defragmentation method which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
+	id = "surgery_lobotomy_mechanic"
+	surgery = /datum/surgery/advanced/lobotomy/mechanic
+
 /datum/design/surgery/pacify
 	name = "Pacification"
 	desc = "A surgical procedure which permanently inhibits the aggression center of the brain, making the patient unwilling to cause direct harm."
@@ -1077,6 +1091,12 @@
 	surgery = /datum/surgery/advanced/pacify
 	research_icon_state = "surgery_head"
 
+/datum/design/surgery/pacify/mechanic
+	name = "Aggression Suppression Programming"
+	desc = "Malware which permanently inhibits the aggression programming of the patient's neural network, making the patient unwilling to cause direct harm."
+	id = "surgery_pacify_mechanic"
+	surgery = /datum/surgery/advanced/pacify/mechanic
+
 /datum/design/surgery/viral_bonding
 	name = "Viral Bonding"
 	desc = "A surgical procedure that forces a symbiotic relationship between a virus and its host. The patient must be dosed with spaceacillin, virus food, and formaldehyde."
@@ -1135,6 +1155,12 @@
 	surgery = /datum/surgery/advanced/brainwashing
 	research_icon_state = "surgery_head"
 
+/datum/design/surgery/brainwashing/mechanic
+	name = "Reprogramming"
+	desc = "Malware which directly implants a directive into the robotic patient's operating system, making it their absolute priority. It can be cleared using a mindshield implant."
+	id = "surgery_brainwashing_mechanic"
+	surgery = /datum/surgery/advanced/brainwashing/mechanic
+
 /datum/design/surgery/nerve_splicing
 	name = "Nerve Splicing"
 	desc = "A surgical procedure which splices the patient's nerves, making them more resistant to stuns."
@@ -1142,6 +1168,12 @@
 	surgery = /datum/surgery/advanced/bioware/nerve_splicing
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/nerve_splicing/mechanic
+	name = "System Automatic Reset Subroutine"
+	desc = "A robotic upgrade which upgrades a robotic patient's automatic systems, making them more resistant to stuns."
+	id = "surgery_nerve_splice_mechanic"
+	surgery = /datum/surgery/advanced/bioware/nerve_splicing/mechanic
+
 /datum/design/surgery/nerve_grounding
 	name = "Nerve Grounding"
 	desc = "A surgical procedure which makes the patient's nerves act as grounding rods, protecting them from electrical shocks."
@@ -1149,6 +1181,12 @@
 	surgery = /datum/surgery/advanced/bioware/nerve_grounding
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/nerve_grounding/mechanic
+	name = "System Shock Dampening"
+	desc = "A robotic upgrade which installs grounding rods into the robotic patient's system, protecting them from electrical shocks."
+	id = "surgery_nerve_ground_mechanic"
+	surgery = /datum/surgery/advanced/bioware/nerve_grounding/mechanic
+
 /datum/design/surgery/vein_threading
 	name = "Vein Threading"
 	desc = "A surgical procedure which severely reduces the amount of blood lost in case of injury."
@@ -1156,13 +1194,25 @@
 	surgery = /datum/surgery/advanced/bioware/vein_threading
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/vein_threading/mechanic
+	name = "Hydraulics Routing Optimization"
+	desc = "A robotic upgrade which severely reduces the amount of hydraulic fluid lost in case of injury."
+	id = "surgery_vein_thread_mechanic"
+	surgery = /datum/surgery/advanced/bioware/vein_threading/mechanic
+
 /datum/design/surgery/muscled_veins
 	name = "Vein Muscle Membrane"
-	desc = "A surgical procedure which adds a muscled membrane to blood vessels, allowing them to pump blood without a heart."
+	desc = "A surgical procedure which adds a muscled membrane to blood vessels, allowing a patient to pump blood without a heart."
 	id = "surgery_muscled_veins"
 	surgery = /datum/surgery/advanced/bioware/muscled_veins
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/muscled_veins/mechanic
+	name = "Hydraulics Redundancy Subroutine"
+	desc = "A robotic upgrade which adds sophisticated hydraulics redundancies, allowing a patient to pump hydraulic fluid without an engine."
+	id = "surgery_muscled_veins_mechanic"
+	surgery = /datum/surgery/advanced/bioware/muscled_veins/mechanic
+
 /datum/design/surgery/ligament_hook
 	name = "Ligament Hook"
 	desc = "A surgical procedure which reshapes the connections between torso and limbs, making it so limbs can be attached manually if severed. \
@@ -1171,6 +1221,13 @@
 	surgery = /datum/surgery/advanced/bioware/ligament_hook
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/ligament_hook/mechanic
+	name = "Anchor Point Snaplocks"
+	desc = "A robotic upgrade which installs rapid detachment anchor points, making it so limbs can be attached manually if detached. \
+		However this weakens the connection, making them easier to detach as well."
+	id = "surgery_ligament_hook_mechanic"
+	surgery = /datum/surgery/advanced/bioware/ligament_hook/mechanic
+
 /datum/design/surgery/ligament_reinforcement
 	name = "Ligament Reinforcement"
 	desc = "A surgical procedure which adds a protective tissue and bone cage around the connections between the torso and limbs, preventing dismemberment. \
@@ -1179,6 +1236,13 @@
 	surgery = /datum/surgery/advanced/bioware/ligament_reinforcement
 	research_icon_state = "surgery_chest"
 
+/datum/design/surgery/ligament_reinforcement/mechanic
+	name = "Anchor Point Reinforcement"
+	desc = "A surgical procedure which adds reinforced limb anchor points to the patient's chassis, preventing dismemberment. \
+		However, the nerve connections as a result are more easily interrupted, making it easier to disable limbs with damage."
+	id = "surgery_ligament_reinforcement_mechanic"
+	surgery = /datum/surgery/advanced/bioware/ligament_reinforcement/mechanic
+
 /datum/design/surgery/cortex_imprint
 	name = "Cortex Imprint"
 	desc = "A surgical procedure which modifies the cerebral cortex into a redundant neural pattern, making the brain able to bypass damage caused by minor brain traumas."
@@ -1186,6 +1250,13 @@
 	surgery = /datum/surgery/advanced/bioware/cortex_imprint
 	research_icon_state = "surgery_head"
 
+/datum/design/surgery/cortex_imprint/mechanic
+	name = "Wetware OS Ver 2.0"
+	desc = "A surgical procedure which updates the patient's operating system to the 'latest version', whatever that means, making the brain able to bypass damage caused by minor brain traumas. \
+		Shame about all the adware."
+	id = "surgery_cortex_imprint_mechanic"
+	surgery = /datum/surgery/advanced/bioware/cortex_imprint/mechanic
+
 /datum/design/surgery/cortex_folding
 	name = "Cortex Folding"
 	desc = "A surgical procedure which modifies the cerebral cortex into a complex fold, giving space to non-standard neural patterns."
@@ -1193,6 +1264,12 @@
 	surgery = /datum/surgery/advanced/bioware/cortex_folding
 	research_icon_state = "surgery_head"
 
+/datum/design/surgery/cortex_folding/mechanic
+	name = "Wetware OS Labyrinthian Programming"
+	desc = "A robotic upgrade which reprograms the patient's neural network in a downright eldritch programming language, giving space to non-standard neural patterns."
+	id = "surgery_cortex_folding_mechanic"
+	surgery = /datum/surgery/advanced/bioware/cortex_folding/mechanic
+
 /datum/design/surgery/necrotic_revival
 	name = "Necrotic Revival"
 	desc = "An experimental surgical procedure that stimulates the growth of a Romerol tumor inside the patient's brain. Requires zombie powder or rezadone."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 8f7787c439482..0c28fcab2bf6e 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -574,11 +574,19 @@
 	COOLDOWN_DECLARE(cooldown)
 	//What visual theme this artefact has. Current possible choices: "prototype", "necrotech"
 	var/artifact_theme = "prototype"
+	var/datum/effect_system/spark_spread/sparks
 
 /obj/item/relic/Initialize(mapload)
 	. = ..()
+	sparks = new()
+	sparks.set_up(5, 1, src)
+	sparks.attach(src)
 	random_themed_appearance()
 
+/obj/item/relic/Destroy(force)
+	QDEL_NULL(sparks)
+	. = ..()
+
 /obj/item/relic/proc/random_themed_appearance()
 	var/themed_name_prefix
 	var/themed_name_suffix
@@ -720,34 +728,38 @@
 
 /obj/item/relic/proc/do_the_teleport(mob/user)
 	var/turf/userturf = get_turf(user)
-	if(loc == user && !is_centcom_level(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
-		visible_message(span_notice("[src] twists and bends, relocating itself!"))
-		throw_smoke(userturf)
-		do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
-		throw_smoke(get_turf(user))
-		warn_admins(user, "Teleport", 0)
+	//Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
+	if(is_centcom_level(userturf.z))
+		return
+	var/to_teleport = ismovable(loc) ? loc : src
+	visible_message(span_notice("[to_teleport] twists and bends, relocating itself!"))
+	throw_smoke(get_turf(to_teleport))
+	do_teleport(to_teleport, userturf, 8, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
+	throw_smoke(get_turf(to_teleport))
+	warn_admins(user, "Teleport", 0)
 
 // Creates a glass and fills it up with a drink.
 /obj/item/relic/proc/drink_dispenser(mob/user)
 	var/obj/item/reagent_containers/cup/glass/drinkingglass/freebie = new(get_step_rand(user))
-	playsound(freebie, 'sound/effects/phasein.ogg', rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+	playsound(freebie, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+	sparks.start()
 	addtimer(CALLBACK(src, PROC_REF(dispense_drink), freebie), 0.5 SECONDS)
 
 /obj/item/relic/proc/dispense_drink(obj/item/reagent_containers/cup/glass/glasser)
+	playsound(glasser, 'sound/effects/phasein.ogg', rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 	glasser.reagents.add_reagent(get_random_drink_id(), rand(glasser.volume * 0.3, glasser.volume))
-	playsound(glasser, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 	throw_smoke(get_turf(glasser))
 
 // Scrambles your organs. 33% chance to delete after use.
 /obj/item/relic/proc/tummy_ache(mob/user)
-	new /obj/effect/temp_visual/bioscrambler_wave/light(get_turf(src))
+	new /obj/effect/temp_visual/circle_wave/bioscrambler/light(get_turf(src))
 	to_chat(user, span_notice("Your stomach starts growling..."))
 	addtimer(CALLBACK(src, PROC_REF(scrambliticus), user), rand(1 SECONDS, 3 SECONDS)) // throw it away!
 
 /obj/item/relic/proc/scrambliticus(mob/user)
-	new /obj/effect/temp_visual/bioscrambler_wave(get_turf(src))
+	new /obj/effect/temp_visual/circle_wave/bioscrambler/light(get_turf(src))
 	playsound(src, 'sound/magic/cosmic_energy.ogg', vol = 50, vary = TRUE)
-	for(var/mob/living/carbon/nearby in hearers(2, src))
+	for(var/mob/living/carbon/nearby in range(2, get_turf(src))) //needs get_turf() to work
 		nearby.bioscramble(name)
 		playsound(nearby, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
 		throw_smoke(get_turf(nearby))
@@ -838,7 +850,7 @@
 	// carbons always get a hat at least
 	var/mob/living/carbon/carbonius = user
 	//hat
-	var/obj/item/clothing/head/costume/disguise_hat = roll_costume(/obj/item/clothing/head/costume, HIDEMASK)
+	var/obj/item/clothing/head/costume/disguise_hat = roll_costume(ITEM_SLOT_HEAD, HIDEMASK)
 	carbonius.dropItemToGround(carbonius.head)
 	carbonius.equip_to_slot_or_del(disguise_hat, ITEM_SLOT_HEAD)
 	if(!ishuman(carbonius))
@@ -847,11 +859,11 @@
 
 	var/mob/living/carbon/human/humerus = carbonius
 	// uniform
-	var/obj/item/clothing/under/costume/disguise_uniform = roll_costume(/obj/item/clothing/under/costume)
+	var/obj/item/clothing/under/costume/disguise_uniform = roll_costume(ITEM_SLOT_ICLOTHING)
 	humerus.dropItemToGround(humerus.w_uniform)
 	humerus.equip_to_slot_or_del(disguise_uniform, ITEM_SLOT_ICLOTHING)
 	// suit
-	var/obj/item/clothing/suit/costume/disguise_suit = roll_costume(/obj/item/clothing/suit/costume)
+	var/obj/item/clothing/suit/costume/disguise_suit = roll_costume(ITEM_SLOT_OCLOTHING)
 	humerus.dropItemToGround(humerus.wear_suit)
 	humerus.equip_to_slot_or_del(disguise_suit, ITEM_SLOT_OCLOTHING)
 	// id
@@ -863,7 +875,6 @@
 	if(!card_id)
 		return
 	card_id.scribbled_name = "[pick(GLOB.first_names)] [pick(GLOB.last_names)]"
-	card_id.update_name()
 	card_id.details_colors = list(ready_random_color(), ready_random_color(), ready_random_color())
 	card_id.item_flags |= DROPDEL
 
@@ -872,17 +883,17 @@
 	if(random_trim.trim_state && random_trim.assignment)
 		card_id.scribbled_trim = replacetext(random_trim.trim_state, "trim_", "cardboard_")
 	card_id.scribbled_assignment = random_trim.assignment
-	card_id.update_overlays()
+	card_id.update_appearance()
 	REMOVE_TRAIT(user, TRAIT_NO_JUMPSUIT, REF(src))
 
-/obj/item/relic/proc/roll_costume(type, flagcheck)
+/obj/item/relic/proc/roll_costume(slot, flagcheck)
 	var/list/candidates = list()
-	for(var/obj/item/thingy as anything in subtypesof(type))
-		if(flagcheck && !(initial(thingy.flags_inv) & flagcheck))
+	for(var/obj/item/costume as anything in GLOB.all_autodrobe_items)
+		if(flagcheck && !(initial(costume.flags_inv) & flagcheck))
 			continue
-		if(isnull(initial(thingy.icon_state)))
+		if(slot && !(initial(costume.slot_flags) & slot))
 			continue
-		candidates |= thingy
+		candidates |= costume
 	var/obj/item/new_costume = pick(candidates)
 	new_costume = new new_costume()
 	new_costume.item_flags |= DROPDEL
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index cc8e842f18e9a..91cf89582d369 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -96,6 +96,20 @@ Nothing else in the console has ID requirements.
 		stored_research = tool.buffer
 	return TRUE
 
+/obj/machinery/computer/rdconsole/proc/enqueue_node(id, mob/user)
+	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+		say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!")
+		return FALSE
+	stored_research.enqueue_node(id, user)
+	return TRUE
+
+/obj/machinery/computer/rdconsole/proc/dequeue_node(id, mob/user)
+	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+		say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!")
+		return FALSE
+	stored_research.dequeue_node(id, user)
+	return TRUE
+
 /obj/machinery/computer/rdconsole/proc/research_node(id, mob/user)
 	if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
 		say("Node unlock failed: Either no techweb is found, node is already researched or is not available!")
@@ -171,6 +185,7 @@ Nothing else in the console has ID requirements.
 		return data
 	data += list(
 		"nodes" = list(),
+		"queue_nodes" = stored_research.research_queue_nodes,
 		"experiments" = list(),
 		"researched_designs" = stored_research.researched_designs,
 		"points" = stored_research.research_points,
@@ -194,6 +209,10 @@ Nothing else in the console has ID requirements.
 	// Serialize all nodes to display
 	for(var/v in stored_research.tiers)
 		var/datum/techweb_node/n = SSresearch.techweb_node_by_id(v)
+		var/enqueued_by_user = FALSE
+
+		if((v in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[v] == user)
+			enqueued_by_user = TRUE
 
 		// Ensure node is supposed to be visible
 		if (stored_research.hidden_nodes[v])
@@ -201,8 +220,11 @@ Nothing else in the console has ID requirements.
 
 		data["nodes"] += list(list(
 			"id" = n.id,
+			"is_free" = n.is_free(stored_research),
 			"can_unlock" = stored_research.can_unlock_node(n),
+			"have_experiments_done" = stored_research.have_experiments_for_node(n),
 			"tier" = stored_research.tiers[n.id],
+			"enqueued_by_user" = enqueued_by_user
 		))
 
 	// Get experiments and serialize them
@@ -322,6 +344,12 @@ Nothing else in the console has ID requirements.
 		if ("researchNode")
 			research_node(params["node_id"], usr)
 			return TRUE
+		if ("enqueueNode")
+			enqueue_node(params["node_id"], usr)
+			return TRUE
+		if ("dequeueNode")
+			dequeue_node(params["node_id"], usr)
+			return TRUE
 		if ("ejectDisk")
 			eject_disk(params["type"])
 			return TRUE
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 0cfca236d24c3..665dae0e243c9 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -35,7 +35,6 @@
 	if(stored_research)
 		log_research("[src] disconnected from techweb [stored_research] (destroyed).")
 		stored_research = null
-	QDEL_NULL(wires)
 	return ..()
 
 /obj/machinery/rnd/examine(mob/user)
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 3c920f6b9a6fe..1a5a387551178 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -70,6 +70,12 @@
 	  * Filled with nulls on init, populated only on publication.
 	*/
 	var/list/published_papers
+	/**
+	  * Assoc list of nodes queued for automatic research when there are enough points available
+	  * research_queue_nodes[node_id] = user_enqueued
+	*/
+	var/list/research_queue_nodes = list()
+
 
 /datum/techweb/New()
 	SSresearch.techwebs += src
@@ -325,6 +331,40 @@
 /datum/techweb/proc/printout_points()
 	return techweb_point_display_generic(research_points)
 
+/datum/techweb/proc/enqueue_node(id, mob/user)
+	var/queue_first = FALSE
+	if(istype(user, /mob/living/carbon/human))
+		var/mob/living/carbon/human/human_user = user
+		var/list/access = human_user.wear_id?.GetAccess()
+		if(ACCESS_RD in access)
+			queue_first = TRUE
+
+	if(id in research_queue_nodes)
+		if(queue_first)
+			research_queue_nodes.Remove(id) // Remove to be able to place first
+		else
+			return FALSE
+
+	for(var/node_id in research_queue_nodes)
+		if(research_queue_nodes[node_id] == user)
+			research_queue_nodes.Remove(node_id)
+
+	if (queue_first)
+		research_queue_nodes.Insert(1, id)
+	research_queue_nodes[id] = user
+
+	return TRUE
+
+/datum/techweb/proc/dequeue_node(id, mob/user)
+	if(!(id in research_queue_nodes))
+		return FALSE
+	if(research_queue_nodes[id] != user)
+		return FALSE
+
+	research_queue_nodes.Remove(id)
+
+	return TRUE
+
 /datum/techweb/proc/research_node_id(id, force, auto_update_points, get_that_dosh_id)
 	return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points, get_that_dosh_id)
 
@@ -377,6 +417,10 @@
 	if (MC_RUNNING())
 		log_research(log_message)
 
+	// Dequeue
+	if(node.id in research_queue_nodes)
+		research_queue_nodes.Remove(node.id)
+
 	return TRUE
 
 /datum/techweb/proc/unresearch_node_id(id)
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 7714946a4d290..23ad6fd213dba 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -90,11 +90,21 @@
 		var/list/boostlist = host.boosted_nodes[id]
 		for(var/booster in boostlist)
 			if(actual_costs[booster])
-				var/delta = max(0, actual_costs[booster] - 250)
-				actual_costs[booster] -= min(boostlist[booster], delta)
+				actual_costs[booster] = max(actual_costs[booster] - boostlist[booster], 0)
 
 	return actual_costs
 
+/datum/techweb_node/proc/is_free(datum/techweb/host)
+	var/list/costs = get_price(host)
+	var/total_points = 0
+
+	for(var/point_type in costs)
+		total_points += costs[point_type]
+
+	if(total_points == 0)
+		return TRUE
+	return FALSE
+
 /datum/techweb_node/proc/price_display(datum/techweb/TN)
 	return techweb_point_display_generic(get_price(TN))
 
diff --git a/code/modules/research/techweb/nodes/alien_nodes.dm b/code/modules/research/techweb/nodes/alien_nodes.dm
index c5d21c255cf8e..58e8dbfc68f1f 100644
--- a/code/modules/research/techweb/nodes/alien_nodes.dm
+++ b/code/modules/research/techweb/nodes/alien_nodes.dm
@@ -73,6 +73,7 @@
 		"alien_saw",
 		"alien_scalpel",
 		"surgery_brainwashing",
+		"surgery_brainwashing_mechanic",
 		"surgery_heal_combo_upgrade_femto",
 		"surgery_zombie",
 	)
diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
index 0a4fa91429484..5e0ad2f64e0e9 100644
--- a/code/modules/research/techweb/nodes/cyborg_nodes.dm
+++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -90,7 +90,7 @@
 
 /datum/techweb_node/borg_utility
 	id = TECHWEB_NODE_BORG_UTILITY
-	display_name = "Untility Cyborg Upgrades"
+	display_name = "Utility Cyborg Upgrades"
 	description = "Let them wipe our floors for us."
 	prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SANITATION)
 	design_ids = list(
diff --git a/code/modules/research/techweb/nodes/modsuit_nodes.dm b/code/modules/research/techweb/nodes/modsuit_nodes.dm
index 56addbad12723..955389f61aeba 100644
--- a/code/modules/research/techweb/nodes/modsuit_nodes.dm
+++ b/code/modules/research/techweb/nodes/modsuit_nodes.dm
@@ -12,6 +12,7 @@
 		"mod_gauntlets",
 		"mod_boots",
 		"mod_plating_standard",
+		"mod_plating_civilian",
 		"mod_paint_kit",
 		"mod_storage",
 		"mod_plasma",
diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm
index 1553f3a0c20d8..591308947b23f 100644
--- a/code/modules/research/techweb/nodes/service_nodes.dm
+++ b/code/modules/research/techweb/nodes/service_nodes.dm
@@ -138,6 +138,7 @@
 		"reagentgrinder",
 		"microwave_engineering",
 		"smartfridge",
+		"dehydrator",
 		"sheetifier",
 		"fat_sucker",
 		"dish_drive",
diff --git a/code/modules/research/techweb/nodes/surgery_nodes.dm b/code/modules/research/techweb/nodes/surgery_nodes.dm
index 0b8812191e2a9..4be7a3256ac70 100644
--- a/code/modules/research/techweb/nodes/surgery_nodes.dm
+++ b/code/modules/research/techweb/nodes/surgery_nodes.dm
@@ -32,6 +32,7 @@
 		"surgery_heal_burn_upgrade_femto",
 		"surgery_heal_combo",
 		"surgery_lobotomy",
+		"surgery_lobotomy_mechanic",
 		"surgery_wing_reconstruction",
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
@@ -44,15 +45,24 @@
 	prereq_ids = list(TECHWEB_NODE_SURGERY_ADV)
 	design_ids = list(
 		"surgery_cortex_folding",
+		"surgery_cortex_folding_mechanic",
 		"surgery_cortex_imprint",
+		"surgery_cortex_imprint_mechanic",
 		"surgery_heal_combo_upgrade",
 		"surgery_ligament_hook",
+		"surgery_ligament_hook_mechanic",
 		"surgery_ligament_reinforcement",
+		"surgery_ligament_reinforcement_mechanic",
 		"surgery_muscled_veins",
+		"surgery_muscled_veins_mechanic",
 		"surgery_nerve_ground",
+		"surgery_nerve_ground_mechanic",
 		"surgery_nerve_splice",
+		"surgery_nerve_splice_mechanic",
 		"surgery_pacify",
+		"surgery_pacify_mechanic",
 		"surgery_vein_thread",
+		"surgery_vein_thread_mechanic",
 		"surgery_viral_bond",
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm
index 5a23d30671f54..be8bba7ec66fa 100644
--- a/code/modules/research/xenobiology/crossbreeding/consuming.dm
+++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm
@@ -226,30 +226,40 @@ Consuming extracts:
 	icon_state = "bluespace"
 	taste = "sugar and starlight"
 
-/obj/item/slime_cookie/bluespace/do_effect(mob/living/M, mob/user)
-	var/list/L = get_area_turfs(get_area(get_turf(M)))
+/obj/item/slime_cookie/bluespace/do_effect(mob/living/eater, mob/user)
+	var/area/eater_area = get_area(eater)
+	if (eater_area.area_flags & NOTELEPORT)
+		fail_effect(eater)
+		return
+
+	var/list/area_turfs = get_area_turfs(get_area(get_turf(eater)))
 	var/turf/target
-	while (L.len && !target)
-		var/I = rand(1, L.len)
-		var/turf/T = L[I]
-		if (is_centcom_level(T.z))
-			L.Cut(I,I+1)
+
+	while (length(area_turfs))
+		var/turf/check_turf = pick_n_take(area_turfs)
+		if (is_centcom_level(check_turf.z))
+			continue // Probably already filtered out by NOTELEPORT but let's just be careful
+		if (check_turf.is_blocked_turf())
 			continue
-		if(!T.density)
-			var/clear = TRUE
-			for(var/obj/O in T)
-				if(O.density)
-					clear = FALSE
-					break
-			if(clear)
-				target = T
-		if (!target)
-			L.Cut(I,I+1)
-
-	if(target)
-		do_teleport(M, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
-		new /obj/effect/particle_effect/sparks(get_turf(M))
-		playsound(get_turf(M), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+		target = check_turf
+		break
+
+	if (isnull(target))
+		fail_effect(eater)
+		return
+	if (!do_teleport(eater, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE))
+		fail_effect(eater)
+		return
+	new /obj/effect/particle_effect/sparks(target)
+	playsound(target, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+/obj/item/slime_cookie/bluespace/proc/fail_effect(mob/living/eater)
+	eater.visible_message(
+		message = span_warning("[eater] briefly vanishes... then slams forcefully into the ground"),
+		self_message = span_warning("You briefly vanish... and are returned forcefully to the ground.")
+	)
+	eater.Knockdown(0.1 SECONDS)
+	new /obj/effect/particle_effect/sparks(get_turf(eater))
 
 /obj/item/slimecross/consuming/sepia
 	colour = SLIME_TYPE_SEPIA
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 82beed78e439c..d04838f79ec0d 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -8,6 +8,7 @@ Regenerative extracts:
 	desc = "It's filled with a milky substance, and pulses like a heartbeat."
 	effect = "regenerative"
 	icon_state = "regenerative"
+	effect_desc = "Completely heals your injuries, with no extra effects."
 
 /obj/item/slimecross/regenerative/proc/core_effect(mob/living/carbon/human/target, mob/user)
 	return
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 9f22520d6ab10..6ec7fca37e362 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -715,13 +715,10 @@
 	if(!dumb_mob.compare_sentience_type(sentience_type)) // Will also return false if not a basic or simple mob, which are the only two we want anyway
 		balloon_alert(user, "invalid creature!")
 		return
-	if(isnull(potion_reason))
-		balloon_alert(user, "no reason for offering set!")
-		return
 	balloon_alert(user, "offering...")
 	being_used = TRUE
 	var/mob/chosen_one = SSpolling.poll_ghosts_for_target(
-		question = "[span_danger(user.name)] is offering [span_notice(dumb_mob.name)] an intelligence potion! Reason: [span_boldnotice(potion_reason)]",
+		question = "[span_danger(user.name)] is offering [span_notice(dumb_mob.name)] an intelligence potion![potion_reason ? " Reason: [span_boldnotice(potion_reason)]" : ""]",
 		check_jobban = ROLE_SENTIENCE,
 		poll_time = 20 SECONDS,
 		checked_target = dumb_mob,
@@ -799,7 +796,7 @@
 
 	user.do_attack_animation(interacting_with)
 	prompted = 1
-	if(tgui_alert(usr,"This will permanently transfer your consciousness to [switchy_mob]. Are you sure you want to do this?",,list("Yes","No")) == "No")
+	if(tgui_alert(usr,"This will permanently transfer your consciousness to [switchy_mob]. Are you sure you want to do this?",,list("Yes","No")) != "Yes")
 		prompted = 0
 		return ITEM_INTERACT_BLOCKING
 
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index dc046d6fa6fb5..69fc6f73289e1 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -9,7 +9,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 /obj/machinery/keycard_auth
 	name = "Keycard Authentication Device"
 	desc = "This device is used to trigger station functions, which require more than one ID card to authenticate, or to give the Janitor access to a department."
-	icon = 'icons/obj/machines/wallmounts.dmi'
+	icon = 'icons/obj/machines/keycard_auth_table.dmi'
 	icon_state = "auth_off"
 	power_channel = AREA_USAGE_ENVIRON
 	req_access = list(ACCESS_KEYCARD_AUTH)
@@ -23,8 +23,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
 
 	COOLDOWN_DECLARE(access_grant_cooldown)
 
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
-
 /obj/machinery/keycard_auth/Initialize(mapload)
 	. = ..()
 	activated = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, PROC_REF(triggerEvent)))
@@ -158,6 +156,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
 		if(KEYCARD_BSA_UNLOCK)
 			toggle_bluespace_artillery()
 
+/// Subtype which is stuck to a wall
+/obj/machinery/keycard_auth/wall_mounted
+	icon = 'icons/obj/machines/wallmounts.dmi'
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth/wall_mounted, 26)
+
+/obj/machinery/keycard_auth/wall_mounted/Initialize(mapload)
+	. = ..()
+	find_and_hang_on_wall()
+
 GLOBAL_VAR_INIT(emergency_access, FALSE)
 /proc/make_maint_all_access()
 	for(var/area/station/maintenance/area in GLOB.areas)
diff --git a/code/modules/shuttle/shuttle_events/_shuttle_events.dm b/code/modules/shuttle/shuttle_events/_shuttle_events.dm
index 35b00ac3e790a..f809e274dc601 100644
--- a/code/modules/shuttle/shuttle_events/_shuttle_events.dm
+++ b/code/modules/shuttle/shuttle_events/_shuttle_events.dm
@@ -69,6 +69,11 @@
 	var/list/target_corner //Top left or bottom right corner
 	var/list/spawn_offset //bounding_coords is ONLY the shuttle, not the space around it, so offset spawn_tiles or stuff spawns on the walls of the shuttle
 
+	// Bounding coords sticky to either the top right or bottom left corner of the template, depending on proximity to docking port
+	// If we sticky to the bottom right corner, then [1] and [2] will be the bottom right corner, so we need to invert it
+	if(bounding_coords[1] > bounding_coords[3])
+		bounding_coords = list(bounding_coords[3], bounding_coords[4], bounding_coords[1], bounding_coords[2])
+
 	switch(direction)
 		if(NORTH) //we're travelling north (so people get pushed south)
 			step_dir = list(1, 0)
@@ -101,7 +106,6 @@
 			//Get the corner tile, but jump over the shuttle and then continue unto the cordon
 			spawning_turfs_miss.Add(locate(target_corner[1] + corner_delta[1] * step_dir[1] + step_dir[1] * i + spawn_offset[1], target_corner[2] + corner_delta[2] * step_dir[2] + step_dir[2] * i + spawn_offset[2], port.z))
 
-
 /datum/shuttle_event/simple_spawner/event_process()
 	. = ..()
 
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 01657d2ebb976..72096f7bb9bfb 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -81,12 +81,11 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 	if(!length(stuff_to_send_home))
 		return FALSE
 
-	var/obj/structure/closet/supplypod/centcompod/et_go_home = new()
-
-	for(var/atom/movable/et as anything in stuff_to_send_home)
-		et.forceMove(et_go_home)
-
-	new /obj/effect/pod_landingzone(get_turf(home), et_go_home)
+	podspawn(list(
+		"target" = get_turf(home),
+		"path" = /obj/structure/closet/supplypod/centcompod,
+		"spawn" = stuff_to_send_home,
+	))
 
 	return stuff_to_send_home
 
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index f76ecb104e72b..b72abea937ed6 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -248,7 +248,7 @@
 	if(HAS_TRAIT(cast_loc, TRAIT_CASTABLE_LOC))
 		if(HAS_TRAIT(cast_loc, TRAIT_SPELLS_TRANSFER_TO_LOC) && ismob(cast_loc.loc))
 			return cast_loc.loc
-		else 
+		else
 			return cast_loc
 	// They're in an atom which allows casting, so redirect the caster to loc
 
diff --git a/code/modules/spells/spell_types/pointed/terrorize.dm b/code/modules/spells/spell_types/pointed/terrorize.dm
index 33465b1d35348..699410b9a3c6b 100644
--- a/code/modules/spells/spell_types/pointed/terrorize.dm
+++ b/code/modules/spells/spell_types/pointed/terrorize.dm
@@ -1,6 +1,6 @@
 /datum/action/cooldown/spell/pointed/terrorize
 	name = "Terrorize"
-	desc = "Project yourself into a victim's mind, inflictng them with terror buildup. \
+	desc = "Project yourself into a victim's mind, inflicting them with terror buildup. \
 		Prey will become increasingly terrified. Swatting terrified prey with an open hand will \
 		scare and disorient them."
 	button_icon_state = "terrify"
diff --git a/code/modules/spells/spell_types/pointed/tie_shoes.dm b/code/modules/spells/spell_types/pointed/tie_shoes.dm
new file mode 100644
index 0000000000000..5783717d0e72b
--- /dev/null
+++ b/code/modules/spells/spell_types/pointed/tie_shoes.dm
@@ -0,0 +1,137 @@
+
+/datum/action/cooldown/spell/pointed/untie_shoes
+	name = "Untie Shoes"
+	desc = "This unassuming spell unties and then knots the target's shoes."
+	ranged_mousepointer = 'icons/effects/mouse_pointers/lace.dmi'
+	button_icon_state = "lace"
+
+	school = SCHOOL_CONJURATION
+	cooldown_time = 3 SECONDS
+	cooldown_reduction_per_rank = 0.2 SECONDS
+
+	spell_max_level = 4
+	invocation = "Acetato!"
+	invocation_type = INVOCATION_SHOUT
+	spell_requirements = NONE
+	antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY
+
+	cast_range = INFINITY
+	active_msg = "You prepare to tie your target's shoes!"
+
+	/// Ignores inability to tie laces, such as jackboots, magboots, or sandals.
+	var/bypass_tie_status = FALSE
+	/// Summons shoes to untie if the target has none.
+	var/summons_shoes = FALSE
+
+/datum/action/cooldown/spell/pointed/untie_shoes/New(Target)
+	. = ..()
+	// tgs first spell with multiple invocations!!!!!!
+	invocation = pick("Acetato!", "Agaletto!")
+
+/datum/action/cooldown/spell/pointed/untie_shoes/level_spell(bypass_cap)
+	. = ..()
+	if(spell_level == 2)
+		bypass_tie_status = TRUE
+		to_chat(owner, span_notice("You will now summon laces on laceless shoes, such as jackboots."))
+
+	if(spell_level == 3)
+		summons_shoes = TRUE
+		to_chat(owner, span_notice("You will now summon shoes if your target has none."))
+
+	if(spell_level == 4)
+		invocation_type = INVOCATION_NONE
+		to_chat(owner, span_boldnotice("Your invocations are now silent!"))
+
+/datum/action/cooldown/spell/pointed/untie_shoes/is_valid_target(atom/cast_on)
+	return isliving(cast_on)
+
+// We need to override this, as trying to change next_use_time in cast() will just result in it being overridden.
+/datum/action/cooldown/spell/touch/before_cast(atom/cast_on)
+	return ..() | SPELL_NO_IMMEDIATE_COOLDOWN
+
+/datum/action/cooldown/spell/pointed/untie_shoes/cast(mob/living/carbon/cast_on)
+	. = ..()
+	if(cast_on.can_block_magic(antimagic_flags))
+		to_chat(owner, span_warning("The spell had no effect!"))
+		return FALSE
+
+	if(isanimal_or_basicmob(cast_on))
+		cast_on.add_movespeed_modifier(/datum/movespeed_modifier/magic_ties)
+		addtimer(CALLBACK(cast_on, TYPE_PROC_REF(/mob/living, remove_movespeed_modifier), /datum/movespeed_modifier/magic_ties), 3 SECONDS * spell_level, TIMER_UNIQUE|TIMER_OVERRIDE)
+		to_chat(owner, span_warning("You tie [cast_on] with weak, magic laces!"))
+		if(invocation_type != INVOCATION_NONE) // extra feedback since it's weird for them
+			cast_on.balloon_alert_to_viewers("magically tied!")
+		else
+			cast_on.balloon_alert(owner, "magically tied!")
+		playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+		return TRUE
+
+	var/shoe_to_cast = /obj/item/clothing/shoes/sneakers/random
+
+	if(HAS_TRAIT(owner, TRAIT_CHUUNIBYOU))
+		shoe_to_cast = /obj/item/clothing/shoes/sneakers/marisa
+	if(HAS_TRAIT(owner, TRAIT_SPLATTERCASTER))
+		shoe_to_cast = /obj/item/clothing/shoes/laceup
+
+	var/obj/item/clothing/shoes/shoes_to_tie = cast_on.shoes
+
+	if(isnull(shoes_to_tie))
+		if(!summons_shoes)
+			to_chat(owner, span_warning("[cast_on] isn't wearing any shoes!"))
+			return FALSE
+
+		shoes_to_tie = new shoe_to_cast(cast_on)
+		if(!cast_on.equip_to_slot_or_del(shoes_to_tie,	ITEM_SLOT_FEET))
+			to_chat(owner, span_warning("Couldn't equip shoes on [cast_on]!"))
+			return FALSE
+
+		if(invocation_type != INVOCATION_NONE)
+			playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+
+	switch(shoes_to_tie.tied)
+		if(SHOES_TIED)
+			if(!shoes_to_tie.can_be_tied)
+				if(bypass_tie_status)
+					to_chat(owner, span_warning("You magically grant laces to [cast_on]'s shoes!"))
+					cast_on.balloon_alert(owner, "laced!")
+					shoes_to_tie.can_be_tied = TRUE
+					if(invocation_type != INVOCATION_NONE)
+						playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+					return TRUE
+				else
+					to_chat(owner, span_warning("[cast_on] is wearing laceless shoes!"))
+					cast_on.balloon_alert(owner, "laceless!")
+					return FALSE
+
+			to_chat(owner, span_warning("You untie [cast_on]'s shoes!"))
+			cast_on.balloon_alert(owner, "untied!")
+			shoes_to_tie.adjust_laces(SHOES_UNTIED, force_lacing = TRUE)
+		if(SHOES_UNTIED)
+			to_chat(owner, span_warning("You knot [cast_on]'s laces!"))
+			cast_on.balloon_alert(owner, "knotted!")
+			shoes_to_tie.adjust_laces(SHOES_KNOTTED, force_lacing = TRUE)
+		if(SHOES_KNOTTED)
+			to_chat(owner, span_warning("[cast_on]'s laces are already knotted!"))
+			return FALSE
+
+// We need to override this, as trying to change next_use_time in cast() will just result in it being overridden.
+/datum/action/cooldown/spell/pointed/untie_shoes/after_cast(atom/cast_on)
+	. = ..()
+	var/extra_time = 0 SECONDS
+	if((cast_on.z != owner.z) || get_dist(cast_on, owner) > 7)
+		extra_time += cooldown_time * 10 // :)
+
+	StartCooldown(cooldown_time + extra_time)
+
+/datum/action/cooldown/spell/pointed/untie_shoes/get_spell_title()
+	switch(spell_level)
+		if(2)
+			return "Laceless "
+		if(3)
+			return "Prankster's "
+		if(4)
+			return "Sneakerly "
+		if(5)
+			return "Clown's Own "
+
+	return ""
diff --git a/code/modules/spells/spell_types/self/rod_form.dm b/code/modules/spells/spell_types/self/rod_form.dm
index 5336036cd2c51..9989c4420c086 100644
--- a/code/modules/spells/spell_types/self/rod_form.dm
+++ b/code/modules/spells/spell_types/self/rod_form.dm
@@ -122,7 +122,7 @@
 	return TRUE
 
 /**
- * Called when the wizard rod reaches it's maximum distance
+ * Called when the wizard rod reaches its maximum distance
  * or is otherwise stopped by something.
  * Dumps out the wizard, and deletes.
  */
diff --git a/code/modules/surgery/advanced/bioware/cortex_folding.dm b/code/modules/surgery/advanced/bioware/cortex_folding.dm
index 73792575a7bcf..2e20f0906acdd 100644
--- a/code/modules/surgery/advanced/bioware/cortex_folding.dm
+++ b/code/modules/surgery/advanced/bioware/cortex_folding.dm
@@ -14,6 +14,21 @@
 
 	status_effect_gained = /datum/status_effect/bioware/cortex/folded
 
+/datum/surgery/advanced/bioware/cortex_folding/mechanic
+	name = "Wetware OS Labyrinthian Programming"
+	desc = "A robotic upgrade which reprograms the patient's neural network in a downright eldritch programming language, giving space to non-standard neural patterns."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/fold_cortex,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/bioware/cortex_folding/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)
 	if(!target_brain)
diff --git a/code/modules/surgery/advanced/bioware/cortex_imprint.dm b/code/modules/surgery/advanced/bioware/cortex_imprint.dm
index 26b43ee691f85..27a75a261674d 100644
--- a/code/modules/surgery/advanced/bioware/cortex_imprint.dm
+++ b/code/modules/surgery/advanced/bioware/cortex_imprint.dm
@@ -14,6 +14,22 @@
 
 	status_effect_gained = /datum/status_effect/bioware/cortex/imprinted
 
+/datum/surgery/advanced/bioware/cortex_imprint/mechanic
+	name = "Wetware OS Ver 2.0"
+	desc = "A robotic upgrade which updates the patient's operating system to the 'latest version', whatever that means, making the brain able to bypass damage caused by minor brain traumas. \
+		Shame about all the adware."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/imprint_cortex,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/bioware/cortex_imprint/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)
 	if(!target_brain)
diff --git a/code/modules/surgery/advanced/bioware/ligament_hook.dm b/code/modules/surgery/advanced/bioware/ligament_hook.dm
index b4a8b168a2e8c..8cae41a960216 100644
--- a/code/modules/surgery/advanced/bioware/ligament_hook.dm
+++ b/code/modules/surgery/advanced/bioware/ligament_hook.dm
@@ -15,6 +15,22 @@
 
 	status_effect_gained = /datum/status_effect/bioware/ligaments/hooked
 
+/datum/surgery/advanced/bioware/ligament_hook/mechanic
+	name = "Anchor Point Snaplocks"
+	desc = "A robotic upgrade which installs rapid detachment anchor points, making it so limbs can be attached manually if detached. \
+		However this weakens the connection, making them easier to detach as well."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/reshape_ligaments,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/reshape_ligaments
 	name = "reshape ligaments (hand)"
 
diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
index 27f4674c7b65f..02a9eb15e818f 100644
--- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
+++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm
@@ -15,6 +15,22 @@
 
 	status_effect_gained = /datum/status_effect/bioware/ligaments/reinforced
 
+/datum/surgery/advanced/bioware/ligament_reinforcement/mechanic
+	name = "Anchor Point Reinforcement"
+	desc = "A surgical procedure which adds reinforced limb anchor points to the patient's chassis, preventing dismemberment. \
+		However, the nerve connections as a result are more easily interrupted, making it easier to disable limbs with damage."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/reinforce_ligaments,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/reinforce_ligaments
 	name = "reinforce ligaments (hand)"
 
diff --git a/code/modules/surgery/advanced/bioware/muscled_veins.dm b/code/modules/surgery/advanced/bioware/muscled_veins.dm
index 13355a569481b..05fb341d06cd2 100644
--- a/code/modules/surgery/advanced/bioware/muscled_veins.dm
+++ b/code/modules/surgery/advanced/bioware/muscled_veins.dm
@@ -14,6 +14,21 @@
 
 	status_effect_gained = /datum/status_effect/bioware/heart/muscled_veins
 
+/datum/surgery/advanced/bioware/muscled_veins/mechanic
+	name = "Hydraulics Redundancy Subroutine"
+	desc = "A robotic upgrade which adds sophisticated hydraulics redundancies, allowing a patient to pump hydraulic fluid without an engine."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/muscled_veins,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/muscled_veins
 	name = "shape vein muscles (hand)"
 
diff --git a/code/modules/surgery/advanced/bioware/nerve_grounding.dm b/code/modules/surgery/advanced/bioware/nerve_grounding.dm
index b0879bb07344b..611c4bbab7858 100644
--- a/code/modules/surgery/advanced/bioware/nerve_grounding.dm
+++ b/code/modules/surgery/advanced/bioware/nerve_grounding.dm
@@ -14,6 +14,21 @@
 
 	status_effect_gained = /datum/status_effect/bioware/nerves/grounded
 
+/datum/surgery/advanced/bioware/nerve_grounding/mechanic
+	name = "System Shock Dampening"
+	desc = "A robotic upgrade which installs grounding rods into the robotic patient's system, protecting them from electrical shocks."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/ground_nerves,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/ground_nerves
 	name = "ground nerves (hand)"
 	time = 15.5 SECONDS
diff --git a/code/modules/surgery/advanced/bioware/nerve_splicing.dm b/code/modules/surgery/advanced/bioware/nerve_splicing.dm
index 5962f8280095a..3481e6e08a3a9 100644
--- a/code/modules/surgery/advanced/bioware/nerve_splicing.dm
+++ b/code/modules/surgery/advanced/bioware/nerve_splicing.dm
@@ -14,6 +14,21 @@
 
 	status_effect_gained = /datum/status_effect/bioware/nerves/spliced
 
+/datum/surgery/advanced/bioware/nerve_splicing/mechanic
+	name = "System Automatic Reset Subroutine"
+	desc = "A robotic upgrade which upgrades a robotic patient's automatic systems, making them more resistant to stuns."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/splice_nerves,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/splice_nerves
 	name = "splice nerves (hand)"
 	time = 15.5 SECONDS
diff --git a/code/modules/surgery/advanced/bioware/vein_threading.dm b/code/modules/surgery/advanced/bioware/vein_threading.dm
index ee83ddbba4d96..9eced408beb74 100644
--- a/code/modules/surgery/advanced/bioware/vein_threading.dm
+++ b/code/modules/surgery/advanced/bioware/vein_threading.dm
@@ -14,6 +14,21 @@
 
 	status_effect_gained = /datum/status_effect/bioware/heart/threaded_veins
 
+/datum/surgery/advanced/bioware/vein_threading/mechanic
+	name = "Hydraulics Routing Optimization"
+	desc = "A robotic upgrade which severely reduces the amount of hydraulic fluid lost in case of injury."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/apply_bioware/thread_veins,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/apply_bioware/thread_veins
 	name = "thread veins (hand)"
 
diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm
index 69b2a3d83c7e0..0e80f89b6dc60 100644
--- a/code/modules/surgery/advanced/brainwashing.dm
+++ b/code/modules/surgery/advanced/brainwashing.dm
@@ -1,7 +1,10 @@
 /obj/item/disk/surgery/brainwashing
 	name = "Brainwashing Surgery Disk"
 	desc = "The disk provides instructions on how to impress an order on a brain, making it the primary objective of the patient."
-	surgeries = list(/datum/surgery/advanced/brainwashing)
+	surgeries = list(
+		/datum/surgery/advanced/brainwashing,
+		/datum/surgery/advanced/brainwashing/mechanic,
+	)
 
 /datum/surgery/advanced/brainwashing
 	name = "Brainwashing"
@@ -16,6 +19,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/advanced/brainwashing/mechanic
+	name = "Reprogramming"
+	desc = "Malware which directly implants a directive into the robotic patient's operating system, making it their absolute priority. It can be cleared using a mindshield implant."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/brainwash/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/brainwashing/can_start(mob/user, mob/living/carbon/target)
 	if(!..())
 		return FALSE
@@ -37,6 +53,17 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	var/objective
 
+/datum/surgery_step/brainwash/mechanic
+	name = "reprogram (multitool)"
+	implements = list(
+		TOOL_MULTITOOL = 85,
+		TOOL_HEMOSTAT = 50,
+		TOOL_WIRECUTTER = 50,
+		/obj/item/stack/package_wrap = 35,
+		/obj/item/stack/cable_coil = 15)
+	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
+	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
+
 /datum/surgery_step/brainwash/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	objective = tgui_input_text(user, "Choose the objective to imprint on your victim's brain", "Brainwashing")
 	if(!objective)
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index b36bcee140a5d..1c82052fe98b1 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -2,7 +2,6 @@
 	name = "Lobotomy"
 	desc = "An invasive surgical procedure which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
 	possible_locs = list(BODY_ZONE_HEAD)
-	requires_bodypart_type = NONE
 	steps = list(
 		/datum/surgery_step/incise,
 		/datum/surgery_step/retract_skin,
@@ -12,6 +11,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/advanced/lobotomy/mechanic
+	name = "Wetware OS Destructive Defragmentation"
+	desc = "A destructive robotic defragmentation method which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/lobotomize/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/lobotomy/can_start(mob/user, mob/living/carbon/target)
 	. = ..()
 	if(!.)
@@ -36,6 +48,18 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/lobotomize/mechanic
+	name = "execute neural defragging (multitool)"
+	implements = list(
+		TOOL_MULTITOOL = 85,
+		/obj/item/melee/energy/sword = 55,
+		/obj/item/knife = 35,
+		/obj/item/shard = 25,
+		/obj/item = 20,
+	)
+	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
+	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
+
 /datum/surgery_step/lobotomize/tool_check(mob/user, obj/item/tool)
 	if(implement_type == /obj/item && !tool.get_sharpness())
 		return FALSE
diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm
index 48a2d1c88e664..6db290e1df715 100644
--- a/code/modules/surgery/advanced/pacification.dm
+++ b/code/modules/surgery/advanced/pacification.dm
@@ -2,7 +2,6 @@
 	name = "Pacification"
 	desc = "A surgical procedure which permanently inhibits the aggression center of the brain, making the patient unwilling to cause direct harm."
 	possible_locs = list(BODY_ZONE_HEAD)
-	requires_bodypart_type = NONE
 	steps = list(
 		/datum/surgery_step/incise,
 		/datum/surgery_step/retract_skin,
@@ -12,6 +11,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/advanced/pacify/mechanic
+	name = "Aggression Suppression Programming"
+	desc = "Malware which permanently inhibits the aggression programming of the patient's neural network, making the patient unwilling to cause direct harm."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/pacify/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/pacify/can_start(mob/user, mob/living/carbon/target)
 	. = ..()
 	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)
@@ -23,12 +35,24 @@
 	implements = list(
 		TOOL_HEMOSTAT = 100,
 		TOOL_SCREWDRIVER = 35,
-		/obj/item/pen = 15)
+		/obj/item/pen = 15,
+	)
 	time = 40
 	preop_sound = 'sound/surgery/hemostat1.ogg'
 	success_sound = 'sound/surgery/hemostat1.ogg'
 	failure_sound = 'sound/surgery/organ2.ogg'
 
+/datum/surgery_step/pacify/mechanic
+	name = "delete aggression programming (multitool)"
+	implements = list(
+		TOOL_MULTITOOL = 100,
+		TOOL_HEMOSTAT = 35,
+		TOOL_SCREWDRIVER = 35,
+		/obj/item/pen = 15,
+	)
+	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
+	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
+
 /datum/surgery_step/pacify/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index c94c728c62a35..e0b9e7678edba 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -1,7 +1,6 @@
 
 /datum/surgery/amputation
 	name = "Ампутация"
-	requires_bodypart_type = NONE
 	surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_MORBID_CURIOSITY
 	possible_locs = list(
 		BODY_ZONE_R_ARM,
@@ -19,6 +18,22 @@
 		/datum/surgery_step/sever_limb,
 	)
 
+/datum/surgery/amputation/mechanic
+	name = "Разбор"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/sever_limb/mechanic, //The benefit of being robotic; people can pull you apart in an instant! Wait, that's not a benefit...
+	)
+
+/datum/surgery/amputation/peg
+	name = "Detach"
+	requires_bodypart_type = BODYTYPE_PEG
+	steps = list(
+		/datum/surgery_step/sever_limb/peg,	//Easy come, easy go
+	)
+
 /datum/surgery/amputation/can_start(mob/user, mob/living/patient)
 	if(HAS_TRAIT(patient, TRAIT_NODISMEMBER))
 		return FALSE
@@ -34,12 +49,39 @@
 		/obj/item/melee/arm_blade = 80,
 		/obj/item/fireaxe = 50,
 		/obj/item/hatchet = 40,
-		/obj/item/knife/butcher = 25)
+		/obj/item/knife/butcher = 25,
+	)
 	time = 64
 	preop_sound = 'sound/surgery/scalpel1.ogg'
 	success_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/sever_limb/mechanic
+	name = "отсоединить конечность (ключ или монтировка)"
+	implements = list(
+		/obj/item/shovel/giant_wrench = 300,
+		TOOL_WRENCH = 100,
+		TOOL_CROWBAR = 100,
+		TOOL_SCALPEL = 50,
+		TOOL_SAW = 50,
+	)
+	time = 20 //WAIT I NEED THAT!!
+	preop_sound = 'sound/items/ratchet.ogg'
+	preop_sound = 'sound/machines/doorclick.ogg'
+
+/datum/surgery_step/sever_limb/peg
+	name = "detach limb (circular saw)"
+	implements = list(
+		TOOL_SAW = 100,
+		/obj/item/shovel/serrated = 100,
+		/obj/item/fireaxe = 90,
+		/obj/item/hatchet = 75,
+		TOOL_SCALPEL = 25,
+	)
+	time = 30
+	preop_sound = 'sound/surgery/saw.ogg'
+	success_sound = 'sound/items/wood_drop.ogg'
+
 /datum/surgery_step/sever_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
diff --git a/code/modules/surgery/autopsy.dm b/code/modules/surgery/autopsy.dm
index 89db162a1e406..b77125141ddc5 100644
--- a/code/modules/surgery/autopsy.dm
+++ b/code/modules/surgery/autopsy.dm
@@ -9,6 +9,16 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/autopsy/mechanic
+	name = "System Failure Analysis"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/autopsy,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/autopsy/can_start(mob/user, mob/living/patient)
 	if(!..())
 		return FALSE
diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm
index ca395ae45ab53..bdffbad6a8577 100644
--- a/code/modules/surgery/blood_filter.dm
+++ b/code/modules/surgery/blood_filter.dm
@@ -9,6 +9,19 @@
 		/datum/surgery_step/close,
 	)
 
+
+/datum/surgery/blood_filter/mechanic
+	name = "Hydraulics Purge"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/filter_blood,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/blood_filter/can_start(mob/user, mob/living/carbon/target)
 	if(HAS_TRAIT(target, TRAIT_HUSK)) //You can filter the blood of a dead person just not husked
 		return FALSE
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 06599c2fb4809..7fc0cb130dc49 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -115,17 +115,19 @@
 
 	///the type of damage overlay (if any) to use when this bodypart is bruised/burned.
 	var/dmg_overlay_type = "human"
+	///a color (optionally matrix) for the damage overlays to give the limb
+	var/damage_overlay_color
 	/// If we're bleeding, which icon are we displaying on this part
 	var/bleed_overlay_icon
 
 	//Damage messages used by help_shake_act()
-	var/light_brute_msg = "bruised"
-	var/medium_brute_msg = "battered"
-	var/heavy_brute_msg = "mangled"
+	var/light_brute_msg = "поцарапана"
+	var/medium_brute_msg = "помята"
+	var/heavy_brute_msg = "искалечена"
 
-	var/light_burn_msg = "numb"
-	var/medium_burn_msg = "blistered"
-	var/heavy_burn_msg = "peeling away"
+	var/light_burn_msg = "онемела"
+	var/medium_burn_msg = "покрыта волдырями"
+	var/heavy_burn_msg = "отслаивает кожу"
 
 	//Damage messages used by examine(). the desc that is most common accross all bodyparts gets shown
 	var/list/damage_examines = list(
@@ -199,6 +201,8 @@
 	var/any_existing_wound_can_mangle_our_interior
 	/// get_damage() / total_damage must surpass this to allow our limb to be disabled, even temporarily, by an EMP.
 	var/robotic_emp_paralyze_damage_percent_threshold = 0.3
+	/// A potential texturing overlay to put on the limb
+	var/datum/bodypart_overlay/texture/texture_bodypart_overlay
 
 /obj/item/bodypart/apply_fantasy_bonuses(bonus)
 	. = ..()
@@ -224,10 +228,14 @@
 
 	RegisterSignal(src, COMSIG_ATOM_RESTYLE, PROC_REF(on_attempt_feature_restyle))
 
+	if(texture_bodypart_overlay)
+		texture_bodypart_overlay = new texture_bodypart_overlay()
+		add_bodypart_overlay(texture_bodypart_overlay)
+
 	if(!IS_ORGANIC_LIMB(src))
 		grind_results = null
 
-	name = "[limb_id] [parse_zone(body_zone)]"
+	name = "[parse_zone(body_zone)] ([limb_id])"
 	update_icon_dropped()
 	refresh_bleed_rate()
 
@@ -272,9 +280,9 @@
 
 	. = ..()
 	if(brute_dam > DAMAGE_PRECISION)
-		. += span_warning("This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.")
+		. += span_warning("У этой конечности [brute_dam > 30 ? "тяжёлые" : "лёгкие"] ушибы.")
 	if(burn_dam > DAMAGE_PRECISION)
-		. += span_warning("This limb has [burn_dam > 30 ? "severe" : "minor"] burns.")
+		. += span_warning("У этой конечности [burn_dam > 30 ? "тяжёлые" : "лёгкие"] ожоги.")
 
 	for(var/datum/wound/wound as anything in wounds)
 		var/wound_desc = wound.get_limb_examine_description()
@@ -300,9 +308,9 @@
 
 	if(self_aware)
 		if(!shown_brute && !shown_burn)
-			status = "no damage"
+			status = "нет повреждений"
 		else
-			status = "[shown_brute] brute damage and [shown_burn] burn damage"
+			status = "[shown_brute] урона от ушибов и [shown_burn] урона от ожогов"
 
 	else
 		if(shown_brute > (max_damage * 0.8))
@@ -313,7 +321,7 @@
 			status += light_brute_msg
 
 		if(shown_brute > DAMAGE_PRECISION && shown_burn > DAMAGE_PRECISION)
-			status += " and "
+			status += " и "
 
 		if(shown_burn > (max_damage * 0.8))
 			status += heavy_burn_msg
@@ -323,36 +331,36 @@
 			status += light_burn_msg
 
 		if(status == "")
-			status = "OK"
+			status = "в порядке"
 
 	var/no_damage
-	if(status == "OK" || status == "no damage")
+	if(status == "в порядке" || status == "нет повреждений")
 		no_damage = TRUE
 
 	var/is_disabled = ""
 	if(bodypart_disabled)
-		is_disabled = " is disabled"
+		is_disabled = " обездвижена"
 		if(no_damage)
-			is_disabled += " but otherwise"
+			is_disabled += ", но в целом"
 		else
-			is_disabled += " and"
+			is_disabled += " и"
 
-	check_list += "\t <span class='[no_damage ? "notice" : "warning"]'>Your [name][is_disabled][self_aware ? " has " : " is "][status].</span>"
+	check_list += "\t <span class='[no_damage ? "notice" : "warning"]'>Ваша [name][is_disabled][self_aware ? " имеет " : " "][status].</span>"
 
 	for(var/datum/wound/wound as anything in wounds)
 		switch(wound.severity)
 			if(WOUND_SEVERITY_TRIVIAL)
-				check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)].")]"
+				check_list += "\t [span_danger("Ваша [name] страдает от: [LOWER_TEXT(wound.name)].")]"
 			if(WOUND_SEVERITY_MODERATE)
-				check_list += "\t [span_warning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!")]"
+				check_list += "\t [span_warning("Ваша [name] страдает от: [LOWER_TEXT(wound.name)]!")]"
 			if(WOUND_SEVERITY_SEVERE)
-				check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!")]"
+				check_list += "\t [span_boldwarning("Ваша [name] страдает от: [LOWER_TEXT(wound.name)]!!")]"
 			if(WOUND_SEVERITY_CRITICAL)
-				check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!!")]"
+				check_list += "\t [span_boldwarning("Ваша [name] страдает от: [LOWER_TEXT(wound.name)]!!!")]"
 
 	for(var/obj/item/embedded_thing in embedded_objects)
-		var/stuck_word = embedded_thing.is_embed_harmless() ? "stuck" : "embedded"
-		check_list += "\t <a href='?src=[REF(examiner)];embedded_object=[REF(embedded_thing)];embedded_limb=[REF(src)]' class='warning'>There is \a [embedded_thing] [stuck_word] in your [name]!</a>"
+		var/stuck_word = embedded_thing.is_embed_harmless() ? "прилип" : "застрял"
+		check_list += "\t <a href='?src=[REF(examiner)];embedded_object=[REF(embedded_thing)];embedded_limb=[REF(src)]' class='warning'>[capitalize(embedded_thing.name)] [stuck_word] [stuck_word == "застрял" ? "в" : "к"] вашей [name]!</a>"
 
 /obj/item/bodypart/blob_act()
 	receive_damage(max_damage, wound_bonus = CANT_WOUND)
@@ -366,17 +374,17 @@
 			if(!human_victim.get_bodypart(body_zone))
 				user.temporarilyRemoveItemFromInventory(src, TRUE)
 				if(!try_attach_limb(victim))
-					to_chat(user, span_warning("[human_victim]'s body rejects [src]!"))
+					to_chat(user, span_warning("Тело [human_victim] отвергает [src.name]!"))
 					forceMove(human_victim.loc)
 					return
 				if(check_for_frankenstein(victim))
 					bodypart_flags |= BODYPART_IMPLANTED
 				if(human_victim == user)
-					human_victim.visible_message(span_warning("[human_victim] jams [src] into [human_victim.p_their()] empty socket!"),\
-					span_notice("You force [src] into your empty socket, and it locks into place!"))
+					human_victim.visible_message(span_warning("[human_victim] вклинивает [src.name] в пустой сокет на своём теле!"),\
+					span_notice("Вы вставляете [src.name] в свой пустой сокет, и [src.name] встаёт на место!"))
 				else
-					human_victim.visible_message(span_warning("[user] jams [src] into [human_victim]'s empty socket!"),\
-					span_notice("[user] forces [src] into your empty socket, and it locks into place!"))
+					human_victim.visible_message(span_warning("[user] вклинивает [src.name] в пустой сокет на теле [human_victim]!"),\
+					span_notice("[user] вставляет [src.name] в свой пустой сокет, и [src.name] встаёт на место!"))
 				return
 	return ..()
 
@@ -386,11 +394,11 @@
 	if(weapon.get_sharpness())
 		add_fingerprint(user)
 		if(!contents.len)
-			to_chat(user, span_warning("There is nothing left inside [src]!"))
+			to_chat(user, span_warning("Внутри [src.name] ничего не осталось!"))
 			return
 		playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1)
-		user.visible_message(span_warning("[user] begins to cut open [src]."),\
-			span_notice("You begin to cut open [src]..."))
+		user.visible_message(span_warning("[user] начинает вскрывать: [src.name]."),\
+			span_notice("Вы начинаете вскрывать: [src.name]..."))
 		if(do_after(user, 5.4 SECONDS, target = src))
 			drop_organs(user, TRUE)
 	else
@@ -1059,7 +1067,8 @@
 			for(var/external_layer in overlay.all_layers)
 				if(overlay.layers & external_layer)
 					. += overlay.get_overlay(external_layer, src)
-
+			for(var/datum/layer in .)
+				overlay.modify_bodypart_appearance(layer)
 	return .
 
 /obj/item/bodypart/proc/huskify_image(image/thing_to_husk, draw_blood = TRUE)
@@ -1139,7 +1148,7 @@
 	refresh_bleed_rate()
 
 /// Refresh the cache of our rate of bleeding sans any modifiers
-/// ANYTHING ADDED TO THIS PROC NEEDS TO CALL IT WHEN IT'S EFFECT CHANGES
+/// ANYTHING ADDED TO THIS PROC NEEDS TO CALL IT WHEN ITS EFFECT CHANGES
 /obj/item/bodypart/proc/refresh_bleed_rate()
 	SHOULD_NOT_OVERRIDE(TRUE)
 
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 1fa6db17e5a54..517847fb24f3d 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -4,7 +4,7 @@
 		return FALSE
 	return TRUE
 
-///Remove target limb from it's owner, with side effects.
+///Remove target limb from its owner, with side effects.
 /obj/item/bodypart/proc/dismember(dam_type = BRUTE, silent=TRUE, wounding_type)
 	if(!owner || (bodypart_flags & BODYPART_UNREMOVABLE))
 		return FALSE
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index a0955af4e46c8..8833f87e28ee8 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -178,7 +178,7 @@
 	if(new_bodypart)
 		new_bodypart.update_limb(is_creating = TRUE)
 
-/// Makes sure that the owner's bodytype flags match the flags of all of it's parts and organs
+/// Makes sure that the owner's bodytype flags match the flags of all of its parts and organs
 /mob/living/carbon/proc/synchronize_bodytypes()
 	var/all_limb_flags = NONE
 	for(var/obj/item/bodypart/limb as anything in bodyparts)
@@ -188,7 +188,7 @@
 
 	bodytype = all_limb_flags
 
-/// Makes sure that the owner's bodyshape flags match the flags of all of it's parts and organs
+/// Makes sure that the owner's bodyshape flags match the flags of all of its parts and organs
 /mob/living/carbon/proc/synchronize_bodyshapes()
 	var/all_limb_flags = NONE
 	for(var/obj/item/bodypart/limb as anything in bodyparts)
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 7a25f6ea70f65..ac8cd00ad2239 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -182,7 +182,7 @@
 		return
 
 	var/atom/movable/screen/inventory/hand/hand = new_owner.hud_used.hand_slots["[held_index]"]
-	hand.update_appearance()
+	hand?.update_appearance()
 
 /obj/item/bodypart/arm/left
 	name = "left arm"
diff --git a/code/modules/surgery/bodyparts/worn_feature_offset.dm b/code/modules/surgery/bodyparts/worn_feature_offset.dm
index ec2b7ddefddf4..8d33e5478ebb5 100644
--- a/code/modules/surgery/bodyparts/worn_feature_offset.dm
+++ b/code/modules/surgery/bodyparts/worn_feature_offset.dm
@@ -64,4 +64,5 @@
 /// When we change direction, re-apply the offset
 /datum/worn_feature_offset/proc/on_dir_change(mob/living/carbon/owner, olddir, newdir)
 	SIGNAL_HANDLER
-	owner.update_features(feature_key)
+	if(olddir != newdir)
+		owner.update_features(feature_key)
diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm
index 6a7971c3efa2f..13c1b69c36de4 100644
--- a/code/modules/surgery/brain_surgery.dm
+++ b/code/modules/surgery/brain_surgery.dm
@@ -1,7 +1,6 @@
 /datum/surgery/brain_surgery
 	name = "Операция на мозге"
 	possible_locs = list(BODY_ZONE_HEAD)
-	requires_bodypart_type = NONE
 	steps = list(
 		/datum/surgery_step/incise,
 		/datum/surgery_step/retract_skin,
@@ -11,6 +10,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/brain_surgery/mechanic
+	name = "Wetware OS Diagnostics"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	possible_locs = list(BODY_ZONE_HEAD)
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/fix_brain/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery_step/fix_brain
 	name = "Проведите коррекцию мозговой функции (гемостат)"
 	implements = list(
@@ -23,6 +35,16 @@
 	success_sound = 'sound/surgery/hemostat1.ogg'
 	failure_sound = 'sound/surgery/organ2.ogg'
 
+/datum/surgery_step/fix_brain/mechanic
+	name = "perform neural debugging (hemostat or multitool)"
+	implements = list(
+		TOOL_HEMOSTAT = 85,
+		TOOL_MULTITOOL = 85,
+		TOOL_SCREWDRIVER = 35,
+		/obj/item/pen = 15)
+	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
+	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
+
 /datum/surgery/brain_surgery/can_start(mob/user, mob/living/carbon/target)
 	return target.get_organ_slot(ORGAN_SLOT_BRAIN) && ..()
 
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 07cf23b540f70..37104a5c219fe 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -9,6 +9,8 @@
 		/datum/surgery_step/handle_cavity,
 		/datum/surgery_step/close)
 
+GLOBAL_LIST_INIT(heavy_cavity_implants, typecacheof(list(/obj/item/transfer_valve)))
+
 //handle cavity
 /datum/surgery_step/handle_cavity
 	name = "вставьте предмет"
@@ -49,7 +51,7 @@
 /datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery = FALSE)
 	var/obj/item/bodypart/chest/target_chest = target.get_bodypart(BODY_ZONE_CHEST)
 	if(tool)
-		if(item_for_cavity || tool.w_class > WEIGHT_CLASS_NORMAL || HAS_TRAIT(tool, TRAIT_NODROP) || isorgan(tool))
+		if(item_for_cavity || ((tool.w_class > WEIGHT_CLASS_NORMAL) && !is_type_in_typecache(tool, GLOB.heavy_cavity_implants)) || HAS_TRAIT(tool, TRAIT_NODROP) || isorgan(tool))
 			to_chat(user, span_warning("Кажется, вы не можете поместить [tool.name] в <i>[target_zone]</i> у [target]!"))
 			return FALSE
 		else
@@ -72,7 +74,7 @@
 				span_notice("[user] вытягивает [item_for_cavity] из <i>[target_zone]</i> у [target]!"),
 				span_notice("[user] вытягивает [item_for_cavity.w_class > WEIGHT_CLASS_SMALL ? item_for_cavity : "что-то"] из <i>[target_zone]</i> у [target]."),
 			)
-			display_pain(target, "Что-то вытащили из вашего <i>[target_zone]</i>! это чертовски больно!")
+			display_pain(target, "Что-то вытащили из вашей <i>[target_zone]</i>! Это чертовски больно!")
 			user.put_in_hands(item_for_cavity)
 			target_chest.cavity_item = null
 			return ..()
diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index 799d286347d33..e4212891277ef 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -12,6 +12,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/gastrectomy/mechanic
+	name = "Engine Diagnostic"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/incise_heart/mechanic,
+		/datum/surgery_step/coronary_bypass/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/coronary_bypass/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/heart/target_heart = target.get_organ_slot(ORGAN_SLOT_HEART)
 	if(isnull(target_heart) || target_heart.damage < 60 || target_heart.operated)
@@ -33,6 +46,17 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/incise_heart/mechanic
+	name = "access engine internals (scalpel or crowbar)"
+	implements = list(
+		TOOL_SCALPEL = 95,
+		TOOL_CROWBAR = 95,
+		/obj/item/melee/energy/sword = 65,
+		/obj/item/knife = 45,
+		/obj/item/shard = 35)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/incise_heart/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
@@ -87,6 +111,17 @@
 	success_sound = 'sound/surgery/hemostat1.ogg'
 	failure_sound = 'sound/surgery/organ2.ogg'
 
+/datum/surgery_step/coronary_bypass/mechanic
+	name = "perform maintenance (hemostat or wrench)"
+	implements = list(
+		TOOL_HEMOSTAT = 90,
+		TOOL_WRENCH = 90,
+		TOOL_WIRECUTTER = 35,
+		/obj/item/stack/package_wrap = 15,
+		/obj/item/stack/cable_coil = 5)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/coronary_bypass/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
@@ -102,6 +137,8 @@
 	var/obj/item/organ/internal/heart/target_heart = target.get_organ_slot(ORGAN_SLOT_HEART)
 	if(target_heart) //slightly worrying if we lost our heart mid-operation, but that's life
 		target_heart.operated = TRUE
+		if(target_heart.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
+			target_heart.organ_flags &= ~ORGAN_EMP
 	display_results(
 		user,
 		target,
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index e1006fac77709..14990b13e98ac 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -14,6 +14,18 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/gastrectomy/mechanic
+	name = "Nutrient Processing System Diagnostic"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/gastrectomy/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/gastrectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/stomach/target_stomach = target.get_organ_slot(ORGAN_SLOT_STOMACH)
 	if(isnull(target_stomach) || target_stomach.damage < 50 || target_stomach.operated)
@@ -35,6 +47,17 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/gastrectomy/mechanic
+	name = "perform maintenance (scalpel or wrench)"
+	implements = list(
+		TOOL_SCALPEL = 95,
+		TOOL_WRENCH = 95,
+		/obj/item/melee/energy/sword = 65,
+		/obj/item/knife = 45,
+		/obj/item/shard = 35)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/gastrectomy/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
@@ -51,6 +74,8 @@
 	target_human.setOrganLoss(ORGAN_SLOT_STOMACH, 20) // Stomachs have a threshold for being able to even digest food, so I might tweak this number
 	if(target_stomach)
 		target_stomach.operated = TRUE
+		if(target_stomach.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
+			target_stomach.organ_flags &= ~ORGAN_EMP
 	display_results(
 		user,
 		target,
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index bd23bab5a8ee1..1d843fa3b480a 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -13,6 +13,18 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/hepatectomy/mechanic
+	name = "Impurity Management System Diagnostic"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/hepatectomy/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/hepatectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/liver/target_liver = target.get_organ_slot(ORGAN_SLOT_LIVER)
 	if(isnull(target_liver) || target_liver.damage < 50 || target_liver.operated)
@@ -34,6 +46,17 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/hepatectomy/mechanic
+	name = "perform maintenance (scalpel or wirecutter)"
+	implements = list(
+		TOOL_SCALPEL = 95,
+		TOOL_WRENCH = 95,
+		/obj/item/melee/energy/sword = 65,
+		/obj/item/knife = 45,
+		/obj/item/shard = 35)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/hepatectomy/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
@@ -50,6 +73,8 @@
 	human_target.setOrganLoss(ORGAN_SLOT_LIVER, 10) //not bad, not great
 	if(target_liver)
 		target_liver.operated = TRUE
+		if(target_liver.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
+			target_liver.organ_flags &= ~ORGAN_EMP
 	display_results(
 		user,
 		target,
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index a8388c5b10afd..5a140b2a19942 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -9,6 +9,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/lipoplasty/mechanic
+	name = "Nutrient Reserve Expulsion"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/cut_fat/mechanic,
+		/datum/surgery_step/remove_fat/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
 	if(!HAS_TRAIT_FROM(target, TRAIT_FAT, OBESITY) || target.nutrition < NUTRITION_LEVEL_WELL_FED)
 		return FALSE
@@ -22,7 +35,8 @@
 		TOOL_SAW = 100,
 		/obj/item/shovel/serrated = 75,
 		/obj/item/hatchet = 35,
-		/obj/item/knife/butcher = 25)
+		/obj/item/knife/butcher = 25,
+	)
 	time = 64
 	surgery_effects_mood = TRUE
 	preop_sound = list(
@@ -30,6 +44,19 @@
 		/obj/item = 'sound/surgery/scalpel1.ogg',
 	)
 
+/datum/surgery_step/cut_fat/mechanic
+	name = "откройте ёмкости жира (ключ или монтировка)"
+	implements = list(
+		TOOL_WRENCH = 95,
+		TOOL_CROWBAR = 95,
+		TOOL_SAW = 65,
+		/obj/item/melee/energy/sword = 65,
+		/obj/item/knife = 45,
+		/obj/item/shard = 35,
+	)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	user.visible_message(span_notice("[user] начинает отрезать лишний жир у [target]."), span_notice("Вы начинаете отрезать лишний жир у [target]..."))
 	display_results(
@@ -58,11 +85,23 @@
 	implements = list(
 		TOOL_RETRACTOR = 100,
 		TOOL_SCREWDRIVER = 45,
-		TOOL_WIRECUTTER = 35)
+		TOOL_WIRECUTTER = 35,
+	)
 	time = 32
 	preop_sound = 'sound/surgery/retractor1.ogg'
 	success_sound = 'sound/surgery/retractor2.ogg'
 
+/datum/surgery_step/remove_fat/mechanic
+	name = "включите клапан очистки (отвертка или ключ)" //gross
+	implements = list(
+		TOOL_SCREWDRIVER = 100,
+		TOOL_WRENCH = 100,
+		TOOL_WIRECUTTER = 35,
+		TOOL_RETRACTOR = 35,
+	)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/surgery/organ2.ogg'
+
 /datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 4a276c85f0967..0131960233657 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -11,13 +11,24 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/lobectomy/mechanic
+	name = "Air Filtration Diagnostic"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/lobectomy/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/lobectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/lungs/target_lungs = target.get_organ_slot(ORGAN_SLOT_LUNGS)
 	if(isnull(target_lungs) || target_lungs.damage < 60 || target_lungs.operated)
 		return FALSE
 	return ..()
 
-
 //lobectomy, removes the most damaged lung lobe with a 95% base success chance
 /datum/surgery_step/lobectomy
 	name = "удалите поврежденный участок легкого (скальпель)"
@@ -32,6 +43,17 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 	surgery_effects_mood = TRUE
 
+/datum/surgery_step/lobectomy/mechanic
+	name = "Perform maintenance (scalpel or wrench)"
+	implements = list(
+		TOOL_SCALPEL = 95,
+		TOOL_WRENCH = 95,
+		/obj/item/melee/energy/sword = 65,
+		/obj/item/knife = 45,
+		/obj/item/shard = 35)
+	preop_sound = 'sound/items/ratchet.ogg'
+	success_sound = 'sound/machines/doorclick.ogg'
+
 /datum/surgery_step/lobectomy/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,
@@ -46,8 +68,11 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/human_target = target
 		var/obj/item/organ/internal/lungs/target_lungs = human_target.get_organ_slot(ORGAN_SLOT_LUNGS)
-		target_lungs.operated = TRUE
 		human_target.setOrganLoss(ORGAN_SLOT_LUNGS, 60)
+		if(target_lungs)
+			target_lungs.operated = TRUE
+			if(target_lungs.organ_flags & ORGAN_EMP) //If our organ is failing due to an EMP, fix that
+				target_lungs.organ_flags &= ~ORGAN_EMP
 		display_results(
 			user,
 			target,
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
index 824908a30c782..46bdf6175fd76 100644
--- a/code/modules/surgery/mechanic_steps.dm
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -1,6 +1,6 @@
 //open shell
 /datum/surgery_step/mechanic_open
-	name = "открутить корпус (отвертка)"
+	name = "открутить корпус (отвертка или скальпель)"
 	implements = list(
 		TOOL_SCREWDRIVER = 100,
 		TOOL_SCALPEL = 75, // med borgs could try to unscrew shell with scalpel
@@ -30,7 +30,7 @@
 
 //close shell
 /datum/surgery_step/mechanic_close
-	name = "закрутите корпус (отвертка)"
+	name = "закрутите корпус (отвертка или скальпель)"
 	implements = list(
 		TOOL_SCREWDRIVER = 100,
 		TOOL_SCALPEL = 75,
@@ -60,10 +60,10 @@
 
 //prepare electronics
 /datum/surgery_step/prepare_electronics
-	name = "подготовьте электронику (мультитул)"
+	name = "подготовьте электронику (мультитул или гемостат)"
 	implements = list(
 		TOOL_MULTITOOL = 100,
-		TOOL_HEMOSTAT = 10) // try to reboot internal controllers via short circuit with some conductor
+		TOOL_HEMOSTAT = 75)
 	time = 24
 	preop_sound = 'sound/items/taperecorder/tape_flip.ogg'
 	success_sound = 'sound/items/taperecorder/taperecorder_close.ogg'
@@ -80,10 +80,10 @@
 
 //unwrench
 /datum/surgery_step/mechanic_unwrench
-	name = "выкрутите болты (ключ)"
+	name = "выкрутите болты (ключ или ретрактор)"
 	implements = list(
 		TOOL_WRENCH = 100,
-		TOOL_RETRACTOR = 10)
+		TOOL_RETRACTOR = 75)
 	time = 24
 	preop_sound = 'sound/items/ratchet.ogg'
 
@@ -105,10 +105,10 @@
 
 //wrench
 /datum/surgery_step/mechanic_wrench
-	name = "закрутите болты (ключ)"
+	name = "закрутите болты (ключ или ретрактор)"
 	implements = list(
 		TOOL_WRENCH = 100,
-		TOOL_RETRACTOR = 10)
+		TOOL_RETRACTOR = 75)
 	time = 24
 	preop_sound = 'sound/items/ratchet.ogg'
 
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 71aa2b080d9f0..c029bf0a37cfa 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -55,7 +55,7 @@
 	)
 
 /datum/surgery/organ_manipulation/mechanic
-	name = "Манипуляции с органами протезирования"
+	name = "Манипуляция с оборудованием"
 	requires_bodypart_type = BODYTYPE_ROBOTIC
 	surgery_flags = SURGERY_SELF_OPERABLE | SURGERY_REQUIRE_LIMB
 	possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD)
@@ -110,7 +110,7 @@
 	)
 
 /datum/surgery/organ_manipulation/mechanic/external
-	name = "Модификация характеристик протеза"
+	name = "Манипуляция с корпусом"
 	possible_locs = list(
 		BODY_ZONE_CHEST,
 		BODY_ZONE_HEAD,
@@ -128,7 +128,7 @@
 		/datum/surgery_step/mechanic_close,
 	)
 
-///Organ manipulation base class. Do not use, it wont work. Use it's subtypes
+///Organ manipulation base class. Do not use, it wont work. Use its subtypes
 /datum/surgery_step/manipulate_organs
 	name = "проведите манипуляцию с органами"
 	repeatable = TRUE
diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm
index e4bb7dfe769fe..98d947793efae 100644
--- a/code/modules/surgery/organs/_organ.dm
+++ b/code/modules/surgery/organs/_organ.dm
@@ -322,6 +322,9 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
 	if(advanced && (organ_flags & ORGAN_PROMINENT))
 		return "<font color='#cc3333'>Harmful Foreign Body</font>"
 
+	if(organ_flags & ORGAN_EMP)
+		return "<font color='#cc3333'>EMP-Derived Failure Cascade in Progress</font>"
+
 	if(owner.has_reagent(/datum/reagent/inverse/technetium))
 		return "<font color='#E42426'>[round((damage/maxHealth)*100, 1)]% damaged.</font>"
 
diff --git a/code/modules/surgery/organs/external/_external_organ.dm b/code/modules/surgery/organs/external/_external_organ.dm
index a054bc741e632..f41cb2a82bd8c 100644
--- a/code/modules/surgery/organs/external/_external_organ.dm
+++ b/code/modules/surgery/organs/external/_external_organ.dm
@@ -21,11 +21,11 @@
 	var/dna_block
 
 	///Set to EXTERNAL_BEHIND, EXTERNAL_FRONT or EXTERNAL_ADJACENT if you want to draw one of those layers as the object sprite. FALSE to use your own
-	///This will not work if it doesn't have a limb to generate it's icon with
+	///This will not work if it doesn't have a limb to generate its icon with
 	var/use_mob_sprite_as_obj_sprite = FALSE
-	///Does this organ have any bodytypes to pass to it's bodypart_owner?
+	///Does this organ have any bodytypes to pass to its bodypart_owner?
 	var/external_bodytypes = NONE
-	///Does this organ have any bodyshapes to pass to it's bodypart_owner?
+	///Does this organ have any bodyshapes to pass to its bodypart_owner?
 	var/external_bodyshapes = NONE
 	///Which flags does a 'modification tool' need to have to restyle us, if it all possible (located in code/_DEFINES/mobs)
 	var/restyle_flags = NONE
diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm
index e4cd3f50a4997..1a52bbe56cd5b 100644
--- a/code/modules/surgery/organs/external/tails.dm
+++ b/code/modules/surgery/organs/external/tails.dm
@@ -175,7 +175,7 @@
 
 	bodypart_overlay = /datum/bodypart_overlay/mutant/tail/monkey
 
-	dna_block = DNA_MONKEY_TAIL_BLOCK
+	dna_block = null
 
 ///Monkey tail bodypart overlay
 /datum/bodypart_overlay/mutant/tail/monkey
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index 23f897bce95a2..f4a5a23bf69ef 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -25,6 +25,8 @@
 
 	///Are our wings open or closed?
 	var/wings_open = FALSE
+	///We cant hide this wings in suit
+	var/cant_hide = FALSE
 
 	// grind_results = list(/datum/reagent/flightpotion = 5)
 	food_reagents = list(/datum/reagent/flightpotion = 5)
@@ -66,7 +68,7 @@
 	if(human.stat || human.body_position == LYING_DOWN)
 		return FALSE
 	//Jumpsuits have tail holes, so it makes sense they have wing holes too
-	if(human.wear_suit && ((human.wear_suit.flags_inv & HIDEJUMPSUIT) && (!human.wear_suit.species_exception || !is_type_in_list(src, human.wear_suit.species_exception))))
+	if(!cant_hide && human.wear_suit && ((human.wear_suit.flags_inv & HIDEJUMPSUIT) && (!human.wear_suit.species_exception || !is_type_in_list(src, human.wear_suit.species_exception))))
 		to_chat(human, span_warning("Your suit blocks your wings from extending!"))
 		return FALSE
 	var/turf/location = get_turf(human)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
index a2eeb4eac32ca..4a7dcab80f259 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
@@ -2,7 +2,7 @@
 	name = "arm-mounted implant"
 	desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
 	zone = BODY_ZONE_R_ARM
-	icon_state = "implant-toolkit"
+	icon_state = "toolkit_generic"
 	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 	///A ref for the arm we're taking up. Mostly for the unregister signal upon removal
@@ -17,6 +17,10 @@
 	var/extend_sound = 'sound/mecha/mechmove03.ogg'
 	/// Sound played when retracting
 	var/retract_sound = 'sound/mecha/mechmove03.ogg'
+	/// Organ slot that the implant occupies for the right arm
+	var/right_arm_organ_slot = ORGAN_SLOT_RIGHT_ARM_AUG
+	/// Organ slot that the implant occupies for the left arm
+	var/left_arm_organ_slot = ORGAN_SLOT_LEFT_ARM_AUG
 
 /obj/item/organ/internal/cyberimp/arm/Initialize(mapload)
 	. = ..()
@@ -48,9 +52,9 @@
 /obj/item/organ/internal/cyberimp/arm/proc/SetSlotFromZone()
 	switch(zone)
 		if(BODY_ZONE_L_ARM)
-			slot = ORGAN_SLOT_LEFT_ARM_AUG
+			slot = left_arm_organ_slot
 		if(BODY_ZONE_R_ARM)
-			slot = ORGAN_SLOT_RIGHT_ARM_AUG
+			slot = right_arm_organ_slot
 		else
 			CRASH("Invalid zone for [type]")
 
@@ -137,6 +141,7 @@
 /obj/item/organ/internal/cyberimp/arm/proc/Retract()
 	if(!active_item || (active_item in src))
 		return FALSE
+	active_item.resistance_flags = active_item::resistance_flags
 	if(owner)
 		owner.visible_message(
 			span_notice("[owner] retracts [active_item] back into [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."),
@@ -259,6 +264,7 @@
 /obj/item/organ/internal/cyberimp/arm/toolset
 	name = "integrated toolset implant"
 	desc = "A stripped-down version of the engineering cyborg toolset, designed to be installed on subject's arm. Contain advanced versions of every tool."
+	icon_state = "toolkit_engineering"
 	actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit)
 	items_to_create = list(
 		/obj/item/screwdriver/cyborg,
@@ -344,6 +350,7 @@
 /obj/item/organ/internal/cyberimp/arm/surgery
 	name = "surgical toolset implant"
 	desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
+	icon_state = "toolkit_surgical"
 	actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit)
 	items_to_create = list(
 		/obj/item/retractor/augment,
@@ -369,18 +376,24 @@
 		/obj/item/knife/combat/cyborg,
 	)
 
-/obj/item/organ/internal/cyberimp/arm/muscle
+/obj/item/organ/internal/cyberimp/arm/strongarm
 	name = "\proper Strong-Arm empowered musculature implant"
 	desc = "When implanted, this cybernetic implant will enhance the muscles of the arm to deliver more power-per-action."
 	icon_state = "muscle_implant"
 
 	zone = BODY_ZONE_R_ARM
-	slot = ORGAN_SLOT_RIGHT_ARM_AUG
+	slot = ORGAN_SLOT_RIGHT_ARM_MUSCLE
+	right_arm_organ_slot = ORGAN_SLOT_RIGHT_ARM_MUSCLE
+	left_arm_organ_slot = ORGAN_SLOT_LEFT_ARM_MUSCLE
 
 	actions_types = list()
 
 	///The amount of damage the implant adds to our unarmed attacks.
 	var/punch_damage = 5
+	///Biotypes we apply an additional amount of damage too
+	var/biotype_bonus_targets = MOB_BEAST | MOB_SPECIAL
+	///Extra damage dealt to our targeted mobs
+	var/biotype_bonus_damage = 20
 	///IF true, the throw attack will not smash people into walls
 	var/non_harmful_throw = TRUE
 	///How far away your attack will throw your oponent
@@ -391,17 +404,24 @@
 	var/throw_power_max = 4
 	///How long will the implant malfunction if it is EMP'd
 	var/emp_base_duration = 9 SECONDS
+	///How long before we get another slam punch; consider that these usually come in pairs of two
+	var/slam_cooldown_duration = 5 SECONDS
+	///Tracks how soon we can perform another slam attack
+	COOLDOWN_DECLARE(slam_cooldown)
 
-/obj/item/organ/internal/cyberimp/arm/muscle/on_mob_insert(mob/living/carbon/arm_owner)
+/obj/item/organ/internal/cyberimp/arm/strongarm/l
+	zone = BODY_ZONE_L_ARM
+
+/obj/item/organ/internal/cyberimp/arm/strongarm/on_mob_insert(mob/living/carbon/arm_owner)
 	. = ..()
 	if(ishuman(arm_owner)) //Sorry, only humans
 		RegisterSignal(arm_owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand))
 
-/obj/item/organ/internal/cyberimp/arm/muscle/on_mob_remove(mob/living/carbon/arm_owner)
+/obj/item/organ/internal/cyberimp/arm/strongarm/on_mob_remove(mob/living/carbon/arm_owner)
 	. = ..()
 	UnregisterSignal(arm_owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK)
 
-/obj/item/organ/internal/cyberimp/arm/muscle/emp_act(severity)
+/obj/item/organ/internal/cyberimp/arm/strongarm/emp_act(severity)
 	. = ..()
 	if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF)
 		return
@@ -409,11 +429,11 @@
 	organ_flags |= ORGAN_FAILING
 	addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity)
 
-/obj/item/organ/internal/cyberimp/arm/muscle/proc/reboot()
+/obj/item/organ/internal/cyberimp/arm/strongarm/proc/reboot()
 	organ_flags &= ~ORGAN_FAILING
 	owner.balloon_alert(owner, "your arm stops spasming!")
 
-/obj/item/organ/internal/cyberimp/arm/muscle/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers)
+/obj/item/organ/internal/cyberimp/arm/strongarm/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers)
 	SIGNAL_HANDLER
 
 	if(source.get_active_hand() != hand || !proximity)
@@ -422,8 +442,9 @@
 		return NONE
 	if(!isliving(target))
 		return NONE
-	var/datum/dna/dna = source.has_dna()
-	if(dna?.check_mutation(/datum/mutation/human/hulk)) //NO HULK
+	if(HAS_TRAIT(source, TRAIT_HULK)) //NO HULK
+		return NONE
+	if(!COOLDOWN_FINISHED(src, slam_cooldown))
 		return NONE
 	if(!source.can_unarmed_attack())
 		return COMPONENT_SKIP_ATTACK
@@ -454,13 +475,16 @@
 	var/obj/item/bodypart/attacking_bodypart = hand
 	potential_damage += rand(attacking_bodypart.unarmed_damage_low, attacking_bodypart.unarmed_damage_high)
 
+	var/is_correct_biotype = living_target.mob_biotypes & biotype_bonus_targets
+	if(biotype_bonus_targets && is_correct_biotype) //If we are punching one of our special biotype targets, increase the damage floor by a factor of two.
+		potential_damage += biotype_bonus_damage
+
 	source.do_attack_animation(target, ATTACK_EFFECT_SMASH)
 	playsound(living_target.loc, 'sound/weapons/punch1.ogg', 25, TRUE, -1)
 
 	var/target_zone = living_target.get_random_valid_zone(source.zone_selected)
 	var/armor_block = living_target.run_armor_check(target_zone, MELEE, armour_penetration = attacking_bodypart.unarmed_effectiveness)
-	living_target.apply_damage(potential_damage, attacking_bodypart.attack_type, target_zone, armor_block)
-	living_target.apply_damage(potential_damage*1.5, STAMINA, target_zone, armor_block)
+	living_target.apply_damage(potential_damage * 2, attacking_bodypart.attack_type, target_zone, armor_block)
 
 	if(source.body_position != LYING_DOWN) //Throw them if we are standing
 		var/atom/throw_target = get_edge_target_turf(living_target, source.dir)
@@ -478,4 +502,6 @@
 
 	log_combat(source, target, "[picked_hit_type]ed", "muscle implant")
 
+	COOLDOWN_START(src, slam_cooldown, slam_cooldown_duration)
+
 	return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index 046c84200d1eb..060499936d53d 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -1,15 +1,12 @@
 /obj/item/organ/internal/cyberimp/chest
 	name = "cybernetic torso implant"
 	desc = "Implants for the organs in your torso."
-	icon_state = "chest_implant"
-	implant_overlay = "chest_implant_overlay"
 	zone = BODY_ZONE_CHEST
 
 /obj/item/organ/internal/cyberimp/chest/nutriment
-	name = "Nutriment pump implant"
+	name = "nutriment pump implant"
 	desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
-	icon_state = "chest_implant"
-	implant_color = "#00AA00"
+	icon_state = "nutriment_implant"
 	var/hunger_threshold = NUTRITION_LEVEL_STARVING
 	var/synthesizing = 0
 	var/poison_amount = 5
@@ -37,18 +34,16 @@
 
 
 /obj/item/organ/internal/cyberimp/chest/nutriment/plus
-	name = "Nutriment pump implant PLUS"
+	name = "nutriment pump implant PLUS"
 	desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
-	icon_state = "chest_implant"
-	implant_color = "#006607"
+	icon_state = "adv_nutriment_implant"
 	hunger_threshold = NUTRITION_LEVEL_HUNGRY
 	poison_amount = 10
 
 /obj/item/organ/internal/cyberimp/chest/reviver
-	name = "Reviver implant"
+	name = "reviver implant"
 	desc = "This implant will attempt to revive and heal you if you lose consciousness. For the faint of heart!"
-	icon_state = "chest_implant"
-	implant_color = "#AD0000"
+	icon_state = "reviver_implant"
 	slot = ORGAN_SLOT_HEART_AID
 	var/revive_cost = 0
 	var/reviving = FALSE
@@ -164,7 +159,6 @@
 	slot = ORGAN_SLOT_THRUSTERS
 	icon_state = "imp_jetpack"
 	base_icon_state = "imp_jetpack"
-	implant_overlay = null
 	implant_color = null
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 	w_class = WEIGHT_CLASS_NORMAL
@@ -265,7 +259,7 @@
 	name = "\improper Herculean gravitronic spinal implant"
 	desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \
 		Contains a slot which can be upgraded with a gravity anomaly core, improving its performance."
-	implant_color = "#15704c"
+	icon_state = "herculean_implant"
 	slot = ORGAN_SLOT_SPINE
 	/// How much faster does the spinal implant improve our lifting speed, workout ability, reducing falling damage and improving climbing and standing speed
 	var/athletics_boost_multiplier = 0.8
@@ -315,5 +309,7 @@
 		name = "\improper Atlas gravitonic spinal implant"
 		desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \
 			This one has been improved through the installation of a gravity anomaly core, allowing for personal gravity manipulation."
+		icon_state = "herculean_implant_core"
+		update_appearance()
 		qdel(tool)
 		return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
index cd9de70c4e23e..d4c4b57d75f6b 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
@@ -2,7 +2,6 @@
 	name = "cybernetic eye implant"
 	desc = "Implants for your eyes."
 	icon_state = "eye_implant"
-	implant_overlay = "eye_implant_overlay"
 	slot = ORGAN_SLOT_EYES
 	zone = BODY_ZONE_PRECISE_EYES
 	w_class = WEIGHT_CLASS_TINY
@@ -13,64 +12,53 @@
 	desc = "These cybernetic eyes will display a HUD over everything you see. Maybe."
 	slot = ORGAN_SLOT_HUD
 	actions_types = list(/datum/action/item_action/toggle_hud)
-	var/HUD_type = 0
-	var/HUD_trait = null
+	var/HUD_traits = list()
 	/// Whether the HUD implant is on or off
 	var/toggled_on = TRUE
 
 
 /obj/item/organ/internal/cyberimp/eyes/hud/proc/toggle_hud(mob/living/carbon/eye_owner)
 	if(toggled_on)
-		if(HUD_type)
-			var/datum/atom_hud/hud = GLOB.huds[HUD_type]
-			hud.hide_from(eye_owner)
 		toggled_on = FALSE
+		eye_owner.add_traits(HUD_traits, ORGAN_TRAIT)
 		balloon_alert(eye_owner, "hud disabled")
-	else
-		if(HUD_type)
-			var/datum/atom_hud/hud = GLOB.huds[HUD_type]
-			hud.show_to(eye_owner)
-		toggled_on = TRUE
-		balloon_alert(eye_owner, "hud enabled")
+		return
+	toggled_on = TRUE
+	eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT)
+	balloon_alert(eye_owner, "hud enabled")
 
 /obj/item/organ/internal/cyberimp/eyes/hud/Insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags)
 	. = ..()
 	if(!.)
 		return
-	if(HUD_type)
-		var/datum/atom_hud/hud = GLOB.huds[HUD_type]
-		hud.show_to(eye_owner)
-	if(HUD_trait)
-		ADD_TRAIT(eye_owner, HUD_trait, ORGAN_TRAIT)
+	eye_owner.add_traits(HUD_traits, ORGAN_TRAIT)
 	toggled_on = TRUE
 
 /obj/item/organ/internal/cyberimp/eyes/hud/Remove(mob/living/carbon/eye_owner, special, movement_flags)
 	. = ..()
-	if(HUD_type)
-		var/datum/atom_hud/hud = GLOB.huds[HUD_type]
-		hud.hide_from(eye_owner)
-	if(HUD_trait)
-		REMOVE_TRAIT(eye_owner, HUD_trait, ORGAN_TRAIT)
+	eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT)
 	toggled_on = FALSE
 
 /obj/item/organ/internal/cyberimp/eyes/hud/medical
-	name = "Medical HUD implant"
+	name = "medical HUD implant"
 	desc = "These cybernetic eye implants will display a medical HUD over everything you see."
-	HUD_type = DATA_HUD_MEDICAL_ADVANCED
-	HUD_trait = TRAIT_MEDICAL_HUD
+	icon_state = "eye_implant_medical"
+	HUD_traits = list(TRAIT_MEDICAL_HUD)
 
 /obj/item/organ/internal/cyberimp/eyes/hud/security
-	name = "Security HUD implant"
+	name = "security HUD implant"
 	desc = "These cybernetic eye implants will display a security HUD over everything you see."
-	HUD_type = DATA_HUD_SECURITY_ADVANCED
-	HUD_trait = TRAIT_SECURITY_HUD
+	icon_state = "eye_implant_security"
+	HUD_traits = list(TRAIT_SECURITY_HUD)
 
 /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic
-	name = "Diagnostic HUD implant"
+	name = "diagnostic HUD implant"
 	desc = "These cybernetic eye implants will display a diagnostic HUD over everything you see."
-	HUD_type = DATA_HUD_DIAGNOSTIC_ADVANCED
+	icon_state = "eye_implant_diagnostic"
+	HUD_traits = list(TRAIT_DIAGNOSTIC_HUD, TRAIT_BOT_PATH_HUD)
 
 /obj/item/organ/internal/cyberimp/eyes/hud/security/syndicate
-	name = "Contraband Security HUD Implant"
+	name = "contraband security HUD implant"
 	desc = "A Cybersun Industries brand Security HUD Implant. These illicit cybernetic eye implants will display a security HUD over everything you see."
+	icon_state = "eye_implant_syndicate"
 	organ_flags = ORGAN_ROBOTIC | ORGAN_HIDDEN
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
index a50912416ef87..f71e29631b384 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
@@ -22,8 +22,6 @@
 /obj/item/organ/internal/cyberimp/brain
 	name = "cybernetic brain implant"
 	desc = "Injectors of extra sub-routines for the brain."
-	icon_state = "brain_implant"
-	implant_overlay = "brain_implant_overlay"
 	zone = BODY_ZONE_HEAD
 	w_class = WEIGHT_CLASS_TINY
 
@@ -39,9 +37,9 @@
 /obj/item/organ/internal/cyberimp/brain/anti_drop
 	name = "anti-drop implant"
 	desc = "This cybernetic brain implant will allow you to force your hand muscles to contract, preventing item dropping. Twitch ear to toggle."
+	icon_state = "brain_implant_antidrop"
 	var/active = FALSE
 	var/list/stored_items = list()
-	implant_color = "#DE7E00"
 	slot = ORGAN_SLOT_BRAIN_ANTIDROP
 	actions_types = list(/datum/action/item_action/organ_action/toggle)
 
@@ -99,9 +97,9 @@
 	stored_items -= source
 
 /obj/item/organ/internal/cyberimp/brain/anti_stun
-	name = "CNS Rebooter implant"
+	name = "CNS rebooter implant"
 	desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
-	implant_color = COLOR_YELLOW
+	icon_state = "brain_implant_rebooter"
 	slot = ORGAN_SLOT_BRAIN_ANTISTUN
 
 	var/static/list/signalCache = list(
@@ -120,6 +118,7 @@
 	. = ..()
 	UnregisterSignal(implant_owner, signalCache)
 	UnregisterSignal(implant_owner, COMSIG_LIVING_ENTER_STAMCRIT)
+	remove_stun_buffs(implant_owner)
 
 /obj/item/organ/internal/cyberimp/brain/anti_stun/on_mob_insert(mob/living/carbon/receiver)
 	. = ..()
@@ -151,10 +150,8 @@
 	sparks.set_up(5, 1, src)
 	sparks.start()
 
-	owner.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_BATON_RESISTANCE, TRAIT_STUNIMMUNE), REF(src))
-	addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_IGNOREDAMAGESLOWDOWN, REF(src)), stun_resistance_time)
-	addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_BATON_RESISTANCE, REF(src)), stun_resistance_time)
-	addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_STUNIMMUNE, REF(src)), stun_resistance_time)
+	give_stun_buffs(owner)
+	addtimer(CALLBACK(src, PROC_REF(remove_stun_buffs), owner), stun_resistance_time)
 
 	COOLDOWN_START(src, implant_cooldown, 60 SECONDS)
 	addtimer(CALLBACK(src, PROC_REF(implant_ready)),60 SECONDS)
@@ -163,6 +160,14 @@
 	if(owner)
 		to_chat(owner, span_purple("Your rebooter implant is ready."))
 
+/obj/item/organ/internal/cyberimp/brain/anti_stun/proc/give_stun_buffs(mob/living/give_to = owner)
+	give_to.add_traits(list(TRAIT_STUNIMMUNE, TRAIT_BATON_RESISTANCE), REF(src))
+	give_to.add_movespeed_mod_immunities(REF(src), /datum/movespeed_modifier/damage_slowdown)
+
+/obj/item/organ/internal/cyberimp/brain/anti_stun/proc/remove_stun_buffs(mob/living/remove_from = owner)
+	remove_from.remove_traits(list(TRAIT_STUNIMMUNE, TRAIT_BATON_RESISTANCE), REF(src))
+	remove_from.remove_movespeed_mod_immunities(REF(src), /datum/movespeed_modifier/damage_slowdown)
+
 /obj/item/organ/internal/cyberimp/brain/anti_stun/emp_act(severity)
 	. = ..()
 	if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF)
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 2773f588b24da..b0fac316ad3e3 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -18,6 +18,9 @@
 	attack_verb_continuous = list("beats", "thumps")
 	attack_verb_simple = list("beat", "thump")
 
+	// Love is stored in the heart.
+	food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/love = 2.5)
+
 	// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
 
 	/// Whether the heart is currently beating.
@@ -162,13 +165,23 @@
 	icon_state = "heart-c-on"
 	base_icon_state = "heart-c"
 	organ_flags = ORGAN_ROBOTIC
-	maxHealth = STANDARD_ORGAN_THRESHOLD*0.75 //This also hits defib timer, so a bit higher than its less important counterparts
+	maxHealth = STANDARD_ORGAN_THRESHOLD * 0.75 //This also hits defib timer, so a bit higher than its less important counterparts
 	failing_desc = "seems to be broken."
 
-	var/dose_available = FALSE
-	var/rid = /datum/reagent/medicine/epinephrine
-	var/ramount = 10
-	var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed.
+	/// Whether or not we have a stabilization available. This prevents our owner from entering softcrit for an amount of time.
+	var/stabilization_available = FALSE
+
+	/// How long our stabilization lasts for.
+	var/stabilization_duration = 10 SECONDS
+
+	/// Whether our heart suppresses bleeders and restores blood automatically.
+	var/bleed_prevention = FALSE
+
+	/// The probability that our blood replication causes toxin damage.
+	var/toxification_probability = 20
+
+	/// Chance of permanent effects if emp-ed.
+	var/emp_vulnerability = 80
 
 /obj/item/organ/internal/heart/cybernetic/emp_act(severity)
 	. = ..()
@@ -194,35 +207,63 @@
 
 /obj/item/organ/internal/heart/cybernetic/on_life(seconds_per_tick, times_fired)
 	. = ..()
-	if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid))
-		used_dose()
 
-/obj/item/organ/internal/heart/cybernetic/proc/used_dose()
-	owner.reagents.add_reagent(rid, ramount)
-	dose_available = FALSE
+	if(organ_flags & ORGAN_EMP)
+		return
+
+	if(stabilization_available && owner.health <= owner.crit_threshold)
+		stabilize_heart()
+
+	if(bleed_prevention && ishuman(owner) && owner.blood_volume < BLOOD_VOLUME_NORMAL)
+		var/mob/living/carbon/human/wounded_owner = owner
+		wounded_owner.blood_volume += 2 * seconds_per_tick
+		if(toxification_probability && prob(toxification_probability))
+			wounded_owner.adjustToxLoss(1 * seconds_per_tick, updating_health = FALSE)
+
+		var/datum/wound/bloodiest_wound
+
+		for(var/datum/wound/iter_wound as anything in wounded_owner.all_wounds)
+			if(iter_wound.blood_flow && iter_wound.blood_flow > bloodiest_wound?.blood_flow)
+				bloodiest_wound = iter_wound
+
+		if(bloodiest_wound)
+			bloodiest_wound.adjust_blood_flow(-1 * seconds_per_tick)
+
+/obj/item/organ/internal/heart/cybernetic/proc/stabilize_heart()
+	ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT)
+	stabilization_available = FALSE
+
+	addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT), stabilization_duration)
+
+	addtimer(VARSET_CALLBACK(src, stabilization_available, TRUE), 5 MINUTES, TIMER_DELETE_ME)
+
+// Largely a sanity check
+/obj/item/organ/internal/heart/cybernetic/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE)
+	. = ..()
+	if(HAS_TRAIT_FROM(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT))
+		REMOVE_TRAIT(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT)
 
 /obj/item/organ/internal/heart/cybernetic/tier2
 	name = "cybernetic heart"
-	desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma."
+	desc = "An electronic device designed to mimic the functions of an organic human heart. In case of lacerations or haemorrhaging, the heart rapidly begins self-replicating \
+		artificial blood. However, this can cause toxins to build up in the bloodstream to the imperfect replication process."
 	icon_state = "heart-c-u-on"
 	base_icon_state = "heart-c-u"
 	maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
-	dose_available = TRUE
+	bleed_prevention = TRUE
 	emp_vulnerability = 40
 
 /obj/item/organ/internal/heart/cybernetic/tier3
 	name = "upgraded cybernetic heart"
-	desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
+	desc = "An electronic device designed to mimic the functions of an organic human heart. In case of physical trauma, the heart has temporary failsafes to maintain patient stability \
+		and mobility for a brief moment. In addition, the heart is able to safely self-replicate blood without risk of toxin buildup."
 	icon_state = "heart-c-u2-on"
 	base_icon_state = "heart-c-u2"
 	maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
-	dose_available = TRUE
+	stabilization_available = TRUE
+	toxification_probability = 0
 	emp_vulnerability = 20
 
-/obj/item/organ/internal/heart/cybernetic/tier3/used_dose()
-	. = ..()
-	addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
-
 /obj/item/organ/internal/heart/cybernetic/surplus
 	name = "surplus prosthetic heart"
 	desc = "A fragile mockery of a human heart that resembles a water pump more than an actual heart. \
diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
index e9da6197ed273..5cdb27942358b 100644
--- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
@@ -7,6 +7,8 @@
 	name = "Voltaic Combat Cyberheart"
 	desc = "A cutting-edge cyberheart, originally designed for Nanotrasen killsquad usage but later declassified for normal research. Voltaic technology allows the heart to keep the body upright in dire circumstances, alongside redirecting anomalous flux energy to fully shield the user from shocks and electro-magnetic pulses. Requires a refined Flux core as a power source."
 	icon_state = "anomalock_heart"
+	bleed_prevention = TRUE
+	toxification_probability = 0
 
 	COOLDOWN_DECLARE(survival_cooldown)
 	///Cooldown for the activation of the organ
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
index dd996a91f14c1..ef21595faf0fd 100755
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/internal/liver/_liver.dm
@@ -132,6 +132,7 @@
 	. = ..()
 	//If your liver is failing, then we use the liverless version of metabolize
 	if((organ_flags & ORGAN_FAILING) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM))
+		owner.reagents.end_metabolization(keep_liverless = TRUE)
 		owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE)
 		return
 
diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm
index b3427db9291ba..47078bfc8038e 100644
--- a/code/modules/surgery/organs/internal/lungs/_lungs.dm
+++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm
@@ -537,7 +537,7 @@
 	n2o_euphoria = EUPHORIA_INACTIVE
 	breather.clear_alert(ALERT_TOO_MUCH_N2O)
 
-// Breath in nitrium. It's helpful, but has nasty side effects
+// Breathe in nitrium. It's helpful, but has nasty side effects
 /obj/item/organ/internal/lungs/proc/too_much_nitrium(mob/living/carbon/breather, datum/gas_mixture/breath, nitrium_pp, old_nitrium_pp)
 	breathe_gas_volume(breath, /datum/gas/nitrium)
 
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index d0d3d95f287a9..fa034acf22bd7 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm
@@ -94,11 +94,15 @@
 /obj/item/organ/internal/tongue/proc/handle_speech(datum/source, list/speech_args)
 	SIGNAL_HANDLER
 
+	if(should_modify_speech(source, speech_args))
+		modify_speech(source, speech_args)
+
+/obj/item/organ/internal/tongue/proc/should_modify_speech(datum/source, list/speech_args)
 	if(speech_args[SPEECH_LANGUAGE] in languages_native) // Speaking a native language?
 		return FALSE // Don't modify speech
 	if(HAS_TRAIT(source, TRAIT_SIGN_LANG)) // No modifiers for signers - I hate this but I simply cannot get these to combine into one statement
 		return FALSE // Don't modify speech
-	modify_speech(source, speech_args)
+	return TRUE
 
 /obj/item/organ/internal/tongue/proc/modify_speech(datum/source, list/speech_args)
 	return speech_args[SPEECH_MESSAGE]
@@ -195,7 +199,7 @@
 
 /obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut)
 	. = ..()
-	AddComponent(/datum/component/speechmod, replacements = speech_replacements)
+	AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech)))
 
 /obj/item/organ/internal/tongue/lizard/silver
 	name = "silver tongue"
@@ -542,6 +546,7 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
 	attack_verb_simple = list("beep", "boop")
 	modifies_speech = TRUE
 	taste_sensitivity = 25 // not as good as an organic tongue
+	organ_traits = list(TRAIT_SILICON_EMOTES_ALLOWED)
 	voice_filter = "alimiter=0.9,acompressor=threshold=0.2:ratio=20:attack=10:release=50:makeup=2,highpass=f=1000"
 
 /obj/item/organ/internal/tongue/robot/could_speak_language(datum/language/language_path)
diff --git a/code/modules/surgery/organs/organ_movement.dm b/code/modules/surgery/organs/organ_movement.dm
index 2889cbe07081b..ff9f753ce18a1 100644
--- a/code/modules/surgery/organs/organ_movement.dm
+++ b/code/modules/surgery/organs/organ_movement.dm
@@ -161,6 +161,7 @@
 	UnregisterSignal(organ_owner, COMSIG_ATOM_EXAMINE)
 	SEND_SIGNAL(src, COMSIG_ORGAN_REMOVED, organ_owner)
 	SEND_SIGNAL(organ_owner, COMSIG_CARBON_LOSE_ORGAN, src, special)
+	ADD_TRAIT(src, TRAIT_USED_ORGAN, ORGAN_TRAIT)
 
 	var/list/diseases = organ_owner.get_static_viruses()
 	if(!LAZYLEN(diseases))
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index d5278c7ebd3c2..1f897edb42927 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -2,7 +2,6 @@
 	name = "Воскрешение"
 	desc = "Экспериментальная хирургическая процедура, которая предусматривает восстановление и оживление мозга пациента даже спустя долгое время после смерти. \
 		Тело должно быть способно поддерживать жизнь."
-	requires_bodypart_type = NONE
 	possible_locs = list(BODY_ZONE_CHEST)
 	target_mobtypes = list(/mob/living)
 	surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_MORBID_CURIOSITY
@@ -16,6 +15,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/revival/mechanic
+	name = "Full System Reboot"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/prepare_electronics,
+		/datum/surgery_step/revive,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/revival/can_start(mob/user, mob/living/target)
 	if(!..())
 		return FALSE
diff --git a/code/modules/surgery/sleeper_protocol.dm b/code/modules/surgery/sleeper_protocol.dm
index fc83df9bffc4c..9a733687929b4 100644
--- a/code/modules/surgery/sleeper_protocol.dm
+++ b/code/modules/surgery/sleeper_protocol.dm
@@ -1,11 +1,15 @@
 /obj/item/disk/surgery/sleeper_protocol
 	name = "Suspicious Surgery Disk"
 	desc = "На диске содержатся инструкции о том, как превратить кого-либо в спящего агента Синдиката."
-	surgeries = list(/datum/surgery/advanced/brainwashing_sleeper)
+	surgeries = list(
+		/datum/surgery/advanced/brainwashing_sleeper,
+		/datum/surgery/advanced/brainwashing_sleeper/mechanic,
+		)
 
 /datum/surgery/advanced/brainwashing_sleeper
 	name = "Sleeper Agent Surgery"
 	desc = "Хирургическая процедура, которая имплантирует протокол сна в мозг пациента, что делает его абсолютным приоритетом. Его можно очистить с помощью импланта защиты разума."
+	requires_bodypart_type = NONE
 	possible_locs = list(BODY_ZONE_HEAD)
 	steps = list(
 		/datum/surgery_step/incise,
@@ -16,6 +20,19 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/advanced/brainwashing_sleeper/mechanic
+	name = "Sleeper Agent Reprogramming"
+	desc = "Malware which directly implants the sleeper protocol directive into the robotic patient's operating system, making it their absolute priority. It can be cleared using a mindshield implant."
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/brainwash/sleeper_agent/mechanic,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/advanced/brainwashing_sleeper/can_start(mob/user, mob/living/carbon/target)
 	. = ..()
 	if(!.)
@@ -42,6 +59,17 @@
 		"Киборги и искусственный интеллект преследуют вас. Что они планируют?",
 	)
 
+/datum/surgery_step/brainwash/sleeper_agent/mechanic
+	name = "reprogram (multitool)"
+	implements = list(
+		TOOL_MULTITOOL = 85,
+		TOOL_HEMOSTAT = 50,
+		TOOL_WIRECUTTER = 50,
+		/obj/item/stack/package_wrap = 35,
+		/obj/item/stack/cable_coil = 15)
+	preop_sound = 'sound/surgery/hemostat1.ogg'
+	success_sound = 'sound/surgery/hemostat1.ogg'
+
 /datum/surgery_step/brainwash/sleeper_agent/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	objective = pick(possible_objectives)
 	display_results(
diff --git a/code/modules/surgery/stomachpump.dm b/code/modules/surgery/stomachpump.dm
index b4494cee832cb..d7d187ed944a7 100644
--- a/code/modules/surgery/stomachpump.dm
+++ b/code/modules/surgery/stomachpump.dm
@@ -10,6 +10,18 @@
 		/datum/surgery_step/close,
 	)
 
+/datum/surgery/stomach_pump/mechanic
+	name = "Nutrient Processing Purge"
+	requires_bodypart_type = BODYTYPE_ROBOTIC
+	steps = list(
+		/datum/surgery_step/mechanic_open,
+		/datum/surgery_step/open_hatch,
+		/datum/surgery_step/mechanic_unwrench,
+		/datum/surgery_step/stomach_pump,
+		/datum/surgery_step/mechanic_wrench,
+		/datum/surgery_step/mechanic_close,
+	)
+
 /datum/surgery/stomach_pump/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/stomach/target_stomach = target.get_organ_slot(ORGAN_SLOT_STOMACH)
 	if(HAS_TRAIT(target, TRAIT_HUSK))
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index c9697b4c7b4db..800fca1fd9642 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -96,6 +96,12 @@
 	var/fail_prob = 0//100 - fail_prob = success_prob
 	var/advance = FALSE
 
+	if(!chem_check(target))
+		user.balloon_alert(user, "missing [LOWER_TEXT(get_chem_list())]!")
+		to_chat(user, span_warning("[target] is missing the [LOWER_TEXT(get_chem_list())] required to perform this surgery step!"))
+		surgery.step_in_progress = FALSE
+		return FALSE
+
 	if(preop(user, target, target_zone, tool, surgery) == SURGERY_STEP_FAIL)
 		update_surgery_mood(target, SURGERY_STATE_FAILURE)
 		surgery.step_in_progress = FALSE
@@ -134,9 +140,7 @@
 
 	if(do_after(user, modded_time, target = target, interaction_key = user.has_status_effect(/datum/status_effect/hippocratic_oath) ? target : DOAFTER_SOURCE_SURGERY)) //If we have the hippocratic oath, we can perform one surgery on each target, otherwise we can only do one surgery in total.
 
-		var/chem_check_result = chem_check(target)
-		if((prob(100-fail_prob) || (iscyborg(user) && !silicons_obey_prob)) && chem_check_result && !try_to_fail)
-
+		if((prob(100-fail_prob) || (iscyborg(user) && !silicons_obey_prob)) && !try_to_fail)
 			if(success(user, target, target_zone, tool, surgery))
 				update_surgery_mood(target, SURGERY_STATE_SUCCESS)
 				play_success_sound(user, target, target_zone, tool, surgery)
@@ -146,8 +150,6 @@
 				play_failure_sound(user, target, target_zone, tool, surgery)
 				update_surgery_mood(target, SURGERY_STATE_FAILURE)
 				advance = TRUE
-			if(chem_check_result)
-				return .(user, target, target_zone, tool, surgery, try_to_fail) //automatically re-attempt if failed for reason other than lack of required chemical
 		if(advance && !repeatable)
 			surgery.status++
 			if(surgery.status > surgery.steps.len)
diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md
index 6319028d8106d..35ca73d7e9a8e 100644
--- a/code/modules/tgs/README.md
+++ b/code/modules/tgs/README.md
@@ -1,6 +1,6 @@
 # DMAPI Internals
 
-This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
+This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
 
 - [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest.
 - The [core](./core) folder includes all code not directly part of any API version.
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 95b8edd3ee5c2..05d0dee25b3c2 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -50,7 +50,9 @@
 	version = null // we want this to be the TGS version, not the interop version
 
 	// sleep once to prevent an issue where world.Export on the first tick can hang indefinitely
+	TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]")
 	sleep(world.tick_lag)
+	TGS_DEBUG_LOG("Export bug prevention sleep complete")
 
 	var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort()))
 	if(!istype(bridge_response))
diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm
index 4b3e59a6028c7..806696dcf4f44 100644
--- a/code/modules/tgui_input/text.dm
+++ b/code/modules/tgui_input/text.dm
@@ -140,9 +140,9 @@
 	switch(action)
 		if("submit")
 			if(max_length)
-				if(length(params["entry"]) > max_length)
+				if(length_char(params["entry"]) > max_length)
 					CRASH("[usr] typed a text string longer than the max length")
-				if(encode && (length(html_encode(params["entry"])) > max_length))
+				if(encode && (length_char(html_encode(params["entry"])) > max_length))
 					to_chat(usr, span_notice("Your message was clipped due to special character usage."))
 			set_entry(params["entry"])
 			closed = TRUE
diff --git a/code/modules/transport/elevator/elev_controller.dm b/code/modules/transport/elevator/elev_controller.dm
index aae79cfe0f14b..870211ecb56d9 100644
--- a/code/modules/transport/elevator/elev_controller.dm
+++ b/code/modules/transport/elevator/elev_controller.dm
@@ -122,7 +122,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/elevator, 32)
 		return FALSE
 
 	// We can't call an elevator that's moving. You may say "you totally can do that", but that's not modelled
-	if(lift.controls_locked == LIFT_PLATFORM_LOCKED)
+	if(lift.controller_status & CONTROLS_LOCKED)
 		loc.balloon_alert(activator, "elevator is moving!")
 		return FALSE
 
diff --git a/code/modules/transport/elevator/elev_music_zone.dm b/code/modules/transport/elevator/elev_music_zone.dm
index 045407fe7819a..8379e742caea5 100644
--- a/code/modules/transport/elevator/elev_music_zone.dm
+++ b/code/modules/transport/elevator/elev_music_zone.dm
@@ -83,8 +83,6 @@ GLOBAL_LIST_EMPTY(elevator_music)
 /datum/proximity_monitor/advanced/elevator_music_area/field_turf_uncrossed(mob/exited, turf/old_location, turf/new_location)
 	if (!(exited in tracked_mobs))
 		return
-	if (exited.z == host.z && get_dist(exited, host) <= current_range)
-		return
 	qdel(tracked_mobs[exited])
 	tracked_mobs -= exited
 	UnregisterSignal(exited, COMSIG_QDELETING)
diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm
index 76b95922dfe66..0b5e99bdbb059 100644
--- a/code/modules/transport/elevator/elev_panel.dm
+++ b/code/modules/transport/elevator/elev_panel.dm
@@ -276,7 +276,7 @@
 	var/datum/transport_controller/linear/lift = lift_weakref?.resolve()
 	if(lift)
 		data["lift_exists"] = TRUE
-		data["currently_moving"] = lift.controls_locked == LIFT_PLATFORM_LOCKED
+		data["currently_moving"] = lift.controller_status & CONTROLS_LOCKED
 		data["currently_moving_to_floor"] = last_move_target
 		data["current_floor"] = lift.transport_modules[1].z
 
@@ -319,7 +319,7 @@
 				return TRUE // Something is inaccurate, update UI
 
 			var/datum/transport_controller/linear/lift = lift_weakref?.resolve()
-			if(!lift || lift.controls_locked == LIFT_PLATFORM_LOCKED)
+			if(!lift || lift.controller_status & CONTROLS_LOCKED)
 				return TRUE // We shouldn't be moving anything, update UI
 
 			INVOKE_ASYNC(lift, TYPE_PROC_REF(/datum/transport_controller/linear, move_to_zlevel), desired_z, CALLBACK(src, PROC_REF(check_panel)), usr)
diff --git a/code/modules/transport/linear_controller.dm b/code/modules/transport/linear_controller.dm
index 80c161c32918d..1b3ffd30c148f 100644
--- a/code/modules/transport/linear_controller.dm
+++ b/code/modules/transport/linear_controller.dm
@@ -1,3 +1,6 @@
+/// If anyone changes the hydraulic sound effect I sure hope they update this...
+#define HYDRAULIC_SFX_DURATION (2 SECONDS)
+
 ///coordinate and control movement across linked transport_controllers. allows moving large single multitile platforms and many 1 tile platforms.
 ///also is capable of linking platforms across linked z levels
 /datum/transport_controller/linear
@@ -10,6 +13,7 @@
 		/obj/machinery/power/supermatter_crystal,
 		/obj/structure/holosign,
 		/obj/machinery/field,
+		/obj/structure/fluff/tram_rail,
 	)
 
 	///whether the lift handled by this transport_controller datum is multitile as opposed to nxm platforms per z level
@@ -32,9 +36,6 @@
 	///bitfield of various transport states
 	var/controller_status = NONE
 
-	///if true, the platform cannot be manually moved.
-	var/controls_locked = FALSE
-
 	/// probability of being thrown hard during an emergency stop
 	var/throw_chance = 17.5
 
@@ -343,10 +344,8 @@
 	// Get the lowest or highest platform according to which direction we're moving
 	var/obj/structure/transport/linear/prime_lift = return_closest_platform_to_z(direction == UP ? world.maxz : 0)
 
-	// If anyone changes the hydraulic sound effect I sure hope they update this variable...
-	var/hydraulic_sfx_duration = 2 SECONDS
 	// ...because we use the duration of the sound effect to make it last for roughly the duration of the lift travel
-	playsound(prime_lift, 'sound/mecha/hydraulic.ogg', 25, vary = TRUE, frequency = clamp(hydraulic_sfx_duration / lift_move_duration, 0.33, 3))
+	playsound(prime_lift, 'sound/mecha/hydraulic.ogg', 25, vary = TRUE, frequency = clamp(HYDRAULIC_SFX_DURATION / lift_move_duration, 0.33, 3))
 
 	// Move the platform after a timer
 	addtimer(CALLBACK(src, PROC_REF(move_lift_vertically), direction, user), lift_move_duration, TIMER_UNIQUE)
@@ -465,6 +464,7 @@
 
 	// Close all lift doors
 	update_lift_doors(action = CYCLE_CLOSED)
+	sleep(1.1 SECONDS)
 	// Approach the desired z-level one step at a time
 	for(var/i in 1 to z_difference)
 		if(!Check_lift_move(direction))
@@ -482,7 +482,7 @@
 		if(QDELETED(src) || QDELETED(prime_lift))
 			return
 
-	addtimer(CALLBACK(src, PROC_REF(open_lift_doors_callback)), 2 SECONDS)
+	update_lift_doors(get_zs_we_are_on(), action = CYCLE_OPEN)
 	SEND_SIGNAL(src, COMSIG_LIFT_SET_DIRECTION, 0)
 	controls_lock(FALSE)
 	return TRUE
@@ -636,3 +636,5 @@
 		lift_to_reset.reset_contents(consider_anything_past, foreign_objects, foreign_non_player_mobs, consider_player_mobs)
 
 	return TRUE
+
+#undef HYDRAULIC_SFX_DURATION
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index 104601f2f6ca3..af8f4199438db 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -378,19 +378,19 @@
 			for(var/obj/structure/victim_structure in dest_turf.contents)
 				if(QDELING(victim_structure))
 					continue
-				if(!is_type_in_typecache(victim_structure, transport_controller_datum.ignored_smashthroughs) && victim_structure.layer >= LOW_OBJ_LAYER)
-
-					if(victim_structure.anchored && initial(victim_structure.anchored) == TRUE)
-						visible_message(span_danger("[src] smashes through [victim_structure]!"))
-						victim_structure.deconstruct(FALSE)
-
-					else
-						if(!throw_target)
-							throw_target = get_edge_target_turf(src, turn(travel_direction, pick(45, -45)))
-						visible_message(span_danger("[src] violently rams [victim_structure] out of the way!"))
-						victim_structure.anchored = FALSE
-						victim_structure.take_damage(rand(20, 25) * collision_lethality)
-						victim_structure.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality)
+				if(!is_type_in_typecache(victim_structure, transport_controller_datum.ignored_smashthroughs))
+					if((victim_structure.plane == FLOOR_PLANE && victim_structure.layer > TRAM_RAIL_LAYER) || (victim_structure.plane == GAME_PLANE && victim_structure.layer > LOW_OBJ_LAYER) )
+						if(victim_structure.anchored && initial(victim_structure.anchored) == TRUE)
+							visible_message(span_danger("[src] smashes through [victim_structure]!"))
+							victim_structure.deconstruct(FALSE)
+
+						else
+							if(!throw_target)
+								throw_target = get_edge_target_turf(src, turn(travel_direction, pick(45, -45)))
+							visible_message(span_danger("[src] violently rams [victim_structure] out of the way!"))
+							victim_structure.anchored = FALSE
+							victim_structure.take_damage(rand(20, 25) * collision_lethality)
+							victim_structure.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality)
 
 			for(var/obj/machinery/victim_machine in dest_turf.contents)
 				if(QDELING(victim_machine))
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 8a869071c7c48..a42c25dc94ee1 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -102,7 +102,6 @@
 #include "bespoke_id.dm"
 #include "binary_insert.dm"
 #include "bitrunning.dm"
-#include "blackmarket.dm"
 #include "blindness.dm"
 #include "bloody_footprints.dm"
 #include "breath.dm"
@@ -139,6 +138,7 @@
 #include "dummy_spawn.dm"
 #include "dynamic_ruleset_sanity.dm"
 #include "egg_glands.dm"
+#include "embedding.dm"
 #include "emoting.dm"
 #include "ensure_subtree_operational_datum.dm"
 #include "explosion_action.dm"
@@ -182,6 +182,7 @@
 #include "mapload_space_verification.dm"
 #include "mapping.dm"
 #include "mapping_nearstation_test.dm"
+#include "market.dm"
 #include "mecha_damage.dm"
 #include "medical_wounds.dm"
 #include "merge_type.dm"
diff --git a/code/modules/unit_tests/blackmarket.dm b/code/modules/unit_tests/blackmarket.dm
deleted file mode 100644
index 984e2ea815503..0000000000000
--- a/code/modules/unit_tests/blackmarket.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/// Ensures black market items have acceptable variable values.
-/datum/unit_test/blackmarket
-
-/datum/unit_test/blackmarket/Run()
-	for(var/datum/market_item/prototype as anything in subtypesof(/datum/market_item))
-		if(prototype::abstract_path == prototype) //skip abstract paths
-			continue
-		if(!prototype::category)
-			TEST_FAIL("[prototype] doesn't have a set category (or the abstract path var isn't correctly set)")
-			continue
-		if(!prototype::item)
-			TEST_FAIL("[prototype] doesn't have a set item (or the abstract path var isn't correctly set)")
-			continue
-		if(isnull(prototype::price) && prototype::price_max <= prototype::price_min)
-			TEST_FAIL("[prototype] doesn't have a correctly set random price (price_max should be higher than price_min)")
-		if(isnull(prototype::stock) && prototype::stock_max < prototype::stock_min)
-			TEST_FAIL("[prototype] doesn't have a correctly set random stock (stock_max shouldn't be lower than stock_min)")
-		if(!isnum(prototype::availability_prob))
-			TEST_FAIL("[prototype] doesn't have a set availability_prob (must be a number)")
-		if(!prototype::name)
-			TEST_FAIL("[prototype] doesn't have a set name")
-		if(!prototype::desc)
-			TEST_FAIL("[prototype] doesn't have a set desc")
diff --git a/code/modules/unit_tests/embedding.dm b/code/modules/unit_tests/embedding.dm
new file mode 100644
index 0000000000000..05e8cc8b8aa27
--- /dev/null
+++ b/code/modules/unit_tests/embedding.dm
@@ -0,0 +1,14 @@
+/datum/unit_test/embedding
+
+/datum/unit_test/embedding/Run()
+	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
+	var/mob/living/carbon/human/firer = allocate(/mob/living/carbon/human/consistent)
+	var/obj/projectile/bullet/c38/bullet = new(get_turf(firer))
+	bullet.set_embed(bullet.get_embed().generate_with_values(embed_chance = 100))
+	TEST_ASSERT_EQUAL(bullet.get_embed().embed_chance, 100, "embed_chance failed to modify")
+	bullet.preparePixelProjectile(victim, firer)
+	bullet.fire(get_angle(firer, victim), victim)
+	var/list/components = victim.GetComponents(/datum/component/embedded)
+	TEST_ASSERT_EQUAL(components.len, 1, "Projectile with 100% embed chance didn't embed, or embedded multiple times")
+	var/datum/component/embedded/comp = components[1]
+	TEST_ASSERT_EQUAL(comp.weapon.get_embed().embed_chance, 100, "embed_chance modification did not transfer to shrapnel")
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index d0d39227f43b7..5cb582ca9694a 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -96,6 +96,12 @@
 	cloner = new(src)
 	sterile = new(src)
 
+/obj/structure/aquarium/traits/Destroy()
+	crossbreeder = null
+	cloner = null
+	sterile = null
+	return ..()
+
 /obj/item/fish/testdummy/crossbreeder
 	fish_traits = list(/datum/fish_trait/crossbreeder)
 
@@ -115,6 +121,11 @@
 	evolve = new(src)
 	evolve_two = new(src)
 
+/obj/structure/aquarium/evolution/Destroy()
+	evolve = null
+	evolve_two = null
+	return ..()
+
 /obj/item/fish/testdummy/evolve
 	compatible_types = list(/obj/item/fish/testdummy/evolve_two)
 	evolution_types = list(/datum/fish_evolution/dummy)
@@ -210,5 +221,54 @@
 	run_loc_floor_bottom_left.ChangeTurf(original_turf_type, original_turf_baseturfs)
 	return ..()
 
+///Check that you can actually raise a chasm crab without errors.
+/datum/unit_test/raise_a_chasm_crab
+
+/datum/unit_test/raise_a_chasm_crab/Run()
+	var/obj/structure/aquarium/crab/aquarium = allocate(/obj/structure/aquarium/crab)
+	SEND_SIGNAL(aquarium.crabbie, COMSIG_FISH_LIFE, 1) //give the fish growth component a small push.
+	var/mob/living/basic/mining/lobstrosity/juvenile/lobster = locate() in aquarium.loc
+	TEST_ASSERT_EQUAL(lobster.loc, get_turf(aquarium), "The lobstrosity didn't spawn on the aquarium's turf")
+	TEST_ASSERT(QDELETED(aquarium.crabbie), "The test aquarium's chasm crab didn't delete itself.")
+	allocated |= lobster //make sure it's allocated and thus properly deleted when the test is over
+	//While ideally impossible to have all traits because of incompatible ones, I want to be sure they don't error out.
+	for(var/trait_type in GLOB.fish_traits)
+		var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+		trait.apply_to_mob(lobster)
+
+/obj/structure/aquarium/crab
+	allow_breeding = TRUE //needed for growing up
+	///Our test subject
+	var/obj/item/fish/chasm_crab/instant_growth/crabbie
+
+/obj/structure/aquarium/crab/Initialize(mapload)
+	. = ..()
+	crabbie = new(src)
+
+/obj/structure/aquarium/crab/Exited(atom/movable/gone)
+	. = ..()
+	if(gone == crabbie) //the fish item is deleted once it grows up
+		crabbie = null
+
+/obj/item/fish/chasm_crab/instant_growth
+	growth_rate = 100
+	fish_traits = list() //We don't want to end up applying traits twice on the resulting lobstrosity
+
+/datum/unit_test/explosive_fishing
+
+/datum/unit_test/explosive_fishing/Run()
+	var/datum/fish_source/source = GLOB.preset_fish_sources[/datum/fish_source/unit_test]
+	source.spawn_reward_from_explosion(run_loc_floor_bottom_left, 1)
+	if(length(source.fish_table))
+		TEST_FAIL("The unit test item wasn't removed/spawned from fish_table during 'spawn_reward_from_explosion'.")
+
+/datum/fish_source/unit_test
+	fish_table = list(
+		/obj/item/wrench = 1,
+	)
+	fish_counts = list(
+		/obj/item/wrench = 1,
+	)
+
 #undef TRAIT_FISH_TESTING
 
diff --git a/code/modules/unit_tests/inhands.dm b/code/modules/unit_tests/inhands.dm
index 7edda7858f87c..863bbca65636a 100644
--- a/code/modules/unit_tests/inhands.dm
+++ b/code/modules/unit_tests/inhands.dm
@@ -32,7 +32,7 @@
 
 		var/skip_left
 		var/skip_right
-		if(initial(item_path.greyscale_colors)) //greyscale stuff has it's own unit test.
+		if(initial(item_path.greyscale_colors)) //greyscale stuff has its own unit test.
 			skip_left = initial(item_path.greyscale_config_inhand_left)
 			skip_right = initial(item_path.greyscale_config_inhand_right)
 			if(skip_left && skip_right)
diff --git a/code/modules/unit_tests/knockoff_component.dm b/code/modules/unit_tests/knockoff_component.dm
index 20990a755cd24..60dd9c2225b00 100644
--- a/code/modules/unit_tests/knockoff_component.dm
+++ b/code/modules/unit_tests/knockoff_component.dm
@@ -79,7 +79,7 @@
 	shoves_the_guy.disarm(wears_the_glasses)
 	TEST_ASSERT(wears_the_glasses.glasses != glasses, "Dummy kept their glasses, even though were disarm shoved into a wall.")
 
-/// Helper to reset the glasses dummy back to it's original position, clear knockdown, and return glasses (if gone)
+/// Helper to reset the glasses dummy back to its original position, clear knockdown, and return glasses (if gone)
 /datum/unit_test/knockoff_component/proc/set_glasses_wearer(mob/living/carbon/human/wearer, turf/reset_to, obj/item/clothing/glasses/reset_worn)
 	wearer.forceMove(reset_to)
 	wearer.SetKnockdown(0 SECONDS)
diff --git a/code/modules/unit_tests/market.dm b/code/modules/unit_tests/market.dm
new file mode 100644
index 0000000000000..022f277d879c0
--- /dev/null
+++ b/code/modules/unit_tests/market.dm
@@ -0,0 +1,59 @@
+#define CATEGORY_CODERBUS "Coderbus"
+/// Ensures market items have acceptable variable values and restocking works.
+/datum/unit_test/market
+
+/datum/unit_test/market/Run()
+	for(var/datum/market_item/prototype as anything in subtypesof(/datum/market_item))
+		if(prototype::abstract_path == prototype) //skip abstract paths
+			continue
+		if(!prototype::category)
+			TEST_FAIL("[prototype] doesn't have a set category (or the abstract path var isn't correctly set)")
+			continue
+		if(!prototype::item)
+			TEST_FAIL("[prototype] doesn't have a set item (or the abstract path var isn't correctly set)")
+			continue
+		if(isnull(prototype::price) && prototype::price_max <= prototype::price_min)
+			TEST_FAIL("[prototype] doesn't have a correctly set random price (price_max should be higher than price_min)")
+		if(isnull(prototype::stock) && prototype::stock_max < prototype::stock_min)
+			TEST_FAIL("[prototype] doesn't have a correctly set random stock (stock_max shouldn't be lower than stock_min)")
+		if(!isnum(prototype::availability_prob))
+			TEST_FAIL("[prototype] doesn't have a set availability_prob (must be a number)")
+		if(!prototype::name)
+			TEST_FAIL("[prototype] doesn't have a set name")
+		if(!prototype::desc)
+			TEST_FAIL("[prototype] doesn't have a set desc")
+
+
+	var/datum/market/unit_test/market = SSmarket.markets[/datum/market/unit_test]
+	TEST_ASSERT(market, "Couldn't find the unit test market")
+	var/list/category_items = market.available_items[CATEGORY_CODERBUS]
+	var/datum/market_item/unit_test/item = category_items[category_items[1]]
+	TEST_ASSERT(item, "Couldn't find the unit test market item")
+	TEST_ASSERT_EQUAL(item.stock, 1, "The unit test market item is incorrectly stocked. Only one should be in stock")
+
+	var/mob/living/user = allocate(/mob/living)
+	var/obj/item/holochip/chip = allocate(/obj/item/holochip, run_loc_floor_bottom_left, INFINITY)
+	var/obj/machinery/ltsrbt/pad = allocate(/obj/machinery/ltsrbt)
+
+	pad.item_interaction(user, chip)
+
+	TEST_ASSERT_EQUAL(item, category_items[category_items[1]], "The unit test market item has been replaced during restock")
+	TEST_ASSERT_EQUAL(item.stock, 2, "The unit test market item is incorrectly stocked after restock. There should be two in stock")
+
+/datum/market/unit_test
+	name = "Unit Test Market"
+	shipping = list(SHIPPING_METHOD_TELEPORT = 0)
+
+/datum/market_item/unit_test
+	name = "Your Own Special Singularity"
+	desc = "ALL HAIL LORD SINGULOTH!!!"
+	category = CATEGORY_CODERBUS
+	markets = list(/datum/market/unit_test)
+	item = /obj/singularity
+	price = 42069
+	stock_min = 1
+	stock = 1
+	stock_max = 2
+	availability_prob = 100
+
+#undef CATEGORY_CODERBUS
diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm
index ec58dcedc8831..7536392e70cd4 100644
--- a/code/modules/unit_tests/say.dm
+++ b/code/modules/unit_tests/say.dm
@@ -22,6 +22,46 @@
 	TEST_ASSERT(!expected_mods.len,
 		"Some message mods were expected, but were not returned by get_message_mods: [json_encode(expected_mods)]. Message: [message]")
 
+/// Test to ensure native tongue languages properly impact speech
+/datum/unit_test/speech_modifiers
+	var/mob/living/carbon/human/talking_lizard
+	var/list/handle_speech_result = null
+
+/datum/unit_test/speech_modifiers/proc/handle_speech(datum/source, list/speech_args)
+	SIGNAL_HANDLER
+
+	TEST_ASSERT(speech_args[SPEECH_MESSAGE], "Handle speech signal does not have a message arg")
+	TEST_ASSERT(speech_args[SPEECH_LANGUAGE], "Handle speech signal does not have a language arg")
+
+	// saving hearing_args directly via handle_speech_result = speech_args won't work since the arg list
+	// is a temporary variable that gets garbage collected after it's done being used by procs
+	// therefore we need to create a new list and transfer the args
+	handle_speech_result = list()
+	handle_speech_result += speech_args
+
+/datum/unit_test/speech_modifiers/Run()
+	talking_lizard = allocate(/mob/living/carbon/human/consistent)
+	talking_lizard.set_species(/datum/species/lizard)
+	var/hissed_quote = "SSShe isss ssso sssasssy"
+	var/unhissed_quote = "She is so sassy"
+
+	RegisterSignal(talking_lizard, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+
+	// lizard's forked tongue causes hissing when speaking common
+	talking_lizard.set_active_language(/datum/language/common)
+	talking_lizard.say(unhissed_quote)
+	TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired")
+	TEST_ASSERT_EQUAL(hissed_quote, handle_speech_result[SPEECH_MESSAGE], "Speech modifier test failed: [handle_speech_result[SPEECH_LANGUAGE]] did not equal [hissed_quote] when spoken by a lizard in language [handle_speech_result[SPEECH_LANGUAGE]]")
+
+	handle_speech_result = null
+
+	// lizard's forked tongue does not cause hissing when speaking native draconic
+	talking_lizard.set_active_language(/datum/language/draconic)
+	talking_lizard.say(unhissed_quote)
+	TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired")
+	TEST_ASSERT_EQUAL(unhissed_quote, handle_speech_result[SPEECH_MESSAGE], "Speech modifier test failed: [handle_speech_result[SPEECH_LANGUAGE]] did not equal [unhissed_quote] when spoken by a lizard in language [handle_speech_result[SPEECH_LANGUAGE]]")
+
+
 /// Test to verify COMSIG_MOB_SAY is sent the exact same list as the message args, as they're operated on
 /datum/unit_test/say_signal
 
@@ -76,7 +116,7 @@
 	TEST_ASSERT(speech_args[SPEECH_LANGUAGE], "Handle speech signal does not have a language arg")
 	TEST_ASSERT(speech_args[SPEECH_RANGE], "Handle speech signal does not have a range arg")
 
-	// saving hearing_args directly via handle_speech_result = speech_args won't work since the arg list
+	// saving speech_args directly via handle_speech_result = speech_args won't work since the arg list
 	// is a temporary variable that gets garbage collected after it's done being used by procs
 	// therefore we need to create a new list and transfer the args
 	handle_speech_result = list()
@@ -126,7 +166,7 @@
 	var/datum/client_interface/mock_client = new()
 	listener.mock_client = mock_client
 
-	RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+	RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech)) //
 	RegisterSignal(speaker_radio, COMSIG_RADIO_NEW_MESSAGE, PROC_REF(handle_radio_hearing))
 
 	RegisterSignal(listener, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
diff --git a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png
index 6af26b48f78bd..47061552e62a8 100644
Binary files a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png and b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png
new file mode 100644
index 0000000000000..08ff8c889d2fe
Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png
new file mode 100644
index 0000000000000..78962671d1192
Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png differ
diff --git a/code/modules/unit_tests/worn_icons.dm b/code/modules/unit_tests/worn_icons.dm
index 32c0b2e8fe6d9..5b308d9a4ff25 100644
--- a/code/modules/unit_tests/worn_icons.dm
+++ b/code/modules/unit_tests/worn_icons.dm
@@ -53,65 +53,51 @@
 			continue
 
 		var/icon_file //checks against all the default icon locations if one isn't defined.
-		var/fail_reasons
-		var/spacer
 		if(cached_slot_flags & ITEM_SLOT_BACK)
 			icon_file = 'icons/mob/clothing/back.dmi'
 
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_ID)
 			icon_file = 'icons/mob/clothing/id.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_GLOVES)
 			icon_file = 'icons/mob/clothing/hands.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_EYES)
 			icon_file = 'icons/mob/clothing/eyes.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_EARS)
 			icon_file = 'icons/mob/clothing/ears.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_NECK)
 			icon_file = 'icons/mob/clothing/neck.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_MASK)
 			icon_file = 'icons/mob/clothing/mask.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
 
 		if(cached_slot_flags & ITEM_SLOT_BELT)
 			icon_file = 'icons/mob/clothing/belt.dmi'
 			if(!(icon_state in icon_states(icon_file, 1)))
 				already_warned_icons += icon_state
-				fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
-				spacer = "\n\t"
-
-		if(fail_reasons)
-			TEST_FAIL(fail_reasons)
-
+				TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index 596ea9e1ffad4..3c31ddf647f88 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -48,7 +48,7 @@
 	hidden_uplink.uplink_handler.debug_mode = TRUE
 
 /obj/item/uplink/nuclear
-	uplink_flag = UPLINK_ALL_SYNDIE_OPS
+	uplink_flag = UPLINK_NUKE_OPS
 
 /obj/item/uplink/nuclear/debug
 	name = "debug nuclear uplink"
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index bf963587ae1cc..7e501217eb68c 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -2,9 +2,17 @@
 /// Selects a set number of unique items from the uplink, and deducts a percentage discount from them
 /proc/create_uplink_sales(num, datum/uplink_category/category, limited_stock, list/sale_items)
 	var/list/sales = list()
-	var/list/sale_items_copy = sale_items.Copy()
+	var/list/per_category = list()
+
+	for (var/datum/uplink_item/possible_sale as anything in sale_items)
+		if (!(possible_sale.category in per_category))
+			per_category[possible_sale.category] = list()
+		per_category[possible_sale.category] += possible_sale
+
 	for (var/i in 1 to num)
-		var/datum/uplink_item/taken_item = pick_n_take(sale_items_copy)
+		var/datum/uplink_category/item_category = pick(per_category)
+		var/datum/uplink_item/taken_item = pick(per_category[item_category])
+		per_category -= item_category
 		var/datum/uplink_item/uplink_item = new taken_item.type()
 		var/discount = uplink_item.get_discount()
 		var/static/list/disclaimer = list(
diff --git a/code/modules/uplink/uplink_items/bundle.dm b/code/modules/uplink/uplink_items/bundle.dm
index f92435f379532..dae6166d49ceb 100644
--- a/code/modules/uplink/uplink_items/bundle.dm
+++ b/code/modules/uplink/uplink_items/bundle.dm
@@ -135,7 +135,7 @@
 
 	podspawn(list(
 		"target" = get_turf(user),
-		"style" = STYLE_SYNDICATE,
+		"style" = /datum/pod_style/syndicate,
 		"spawn" = surplus_crate,
 	))
 	return source //For log icon
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index d9bcce6411f5f..bfb9aa3f332cd 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -148,7 +148,7 @@
 
 /datum/uplink_item/role_restricted/rebarxbowsyndie
 	name = "Syndicate Rebar Crossbow"
-	desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
+	desc = "A much more professional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
 	item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie
 	cost = 10
 	restricted_roles = list(JOB_STATION_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)
@@ -336,7 +336,7 @@
 	desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
 			withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
 			blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
-			disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. It's simple design makes it easy to conceal."
+			disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. Its simple design makes it easy to conceal."
 	progression_minimum = 30 MINUTES
 	item = /obj/item/gun/blastcannon
 	cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index fa42be0d54d0e..80df9de47cfbc 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -373,16 +373,18 @@
 //Meme weapons: Literally just weapons used as a joke, shouldn't be particularly expensive.
 
 /datum/uplink_item/weapon_kits/surplus_smg
-	name = "Surplus SMG Case (Flukie)"
-	desc = "A horribly outdated automatic weapon. Why would you want to use this? Comes with...rations."
-	item = /obj/item/gun/ballistic/automatic/plastikov
+	name = "Surplus Smart-SMG (Flukie)"
+	desc = "An outdated smart-SMG with limited stopping power, however it's bullets will gradually track towards whatever \
+		the gun was shot at. This does require you to actually aim at the person you are shooting at before firing, but \
+		surely a highly trained operative such as yourself can manage that."
+	item = /obj/item/gun/ballistic/automatic/smartgun
 	cost = 2
 	purchasable_from = UPLINK_SERIOUS_OPS
 
 /datum/uplink_item/ammo_nuclear/surplus_smg
-	name = "Surplus SMG Magazine (Surplus)"
-	desc = "A cylindrical magazine designed for the PP-95 SMG."
-	item = /obj/item/ammo_box/magazine/plastikov9mm
+	name = "Surplus Smart-SMG Magazine (Smartgun)"
+	desc = "A large box magazine made for use in the Abielle smart-SMG."
+	item = /obj/item/ammo_box/magazine/smartgun
 	cost = 1
 	purchasable_from = UPLINK_SERIOUS_OPS
 	uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
@@ -394,6 +396,7 @@
 	cost = 15
 	surplus = 35
 	purchasable_from = UPLINK_ALL_SYNDIE_OPS
+
 /datum/uplink_item/explosives/grenades/buzzkill
 	name = "Buzzkill Grenade Box"
 	desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm
index 48c25e638deb7..40e5df8febdf9 100644
--- a/code/modules/uplink/uplink_items/stealthy_tools.dm
+++ b/code/modules/uplink/uplink_items/stealthy_tools.dm
@@ -87,7 +87,7 @@
 /datum/uplink_item/stealthy_tools/smugglersatchel
 	name = "Smuggler's Satchel"
 	desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
-			your stolen goods. Comes with a crowbar, a floor tile and some contraband inside."
+			your stolen goods. Comes with a crowbar, a floor tile and some contraband inside. Its contents cannot be detected by contraband scanners."
 	item = /obj/item/storage/backpack/satchel/flat/with_tools
 	cost = 1
 	surplus = 30
diff --git a/code/modules/uplink/uplink_items/suits.dm b/code/modules/uplink/uplink_items/suits.dm
index d940d4eb06769..b66cce4eaece7 100644
--- a/code/modules/uplink/uplink_items/suits.dm
+++ b/code/modules/uplink/uplink_items/suits.dm
@@ -79,3 +79,4 @@
 	purchasable_from = ~UPLINK_ALL_SYNDIE_OPS
 	progression_minimum = 90 MINUTES
 	cost = 16
+	cant_discount = TRUE
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 30e01b3219edc..2cd85f786fc48 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -49,7 +49,7 @@
 	initialize_controller_action_type(/datum/action/vehicle/sealed/thank, VEHICLE_CONTROL_KIDNAPPED)
 
 /obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
-	if(ishuman(M))
+	if(ishuman(M) && driver_amount() < max_drivers)
 		var/mob/living/carbon/human/H = M
 		if(is_clown_job(H.mind?.assigned_role) || !enforce_clown_role) //Ensures only clowns can drive the car. (Including more at once)
 			add_control_flags(H, VEHICLE_CONTROL_DRIVE)
diff --git a/code/modules/vehicles/cars/vim.dm b/code/modules/vehicles/cars/vim.dm
index 221c9268febbb..dfcd604ef144d 100644
--- a/code/modules/vehicles/cars/vim.dm
+++ b/code/modules/vehicles/cars/vim.dm
@@ -18,6 +18,7 @@
 	light_power = 1.5
 	light_on = FALSE
 	engine_sound = 'sound/effects/servostep.ogg'
+	interaction_flags_mouse_drop = NONE
 	///Maximum size of a mob trying to enter the mech
 	var/maximum_mob_size = MOB_SIZE_SMALL
 	COOLDOWN_DECLARE(sound_cooldown)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index d35df3126636e..d28b510328a98 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -304,7 +304,6 @@
 	QDEL_NULL(ui_view)
 	QDEL_NULL(trackers)
 	QDEL_NULL(chassis_camera)
-	QDEL_NULL(wires)
 
 	GLOB.mechas_list -= src //global mech list
 	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm
index 83934244638aa..39c5ef1d0e8c4 100644
--- a/code/modules/vehicles/mecha/combat/honker.dm
+++ b/code/modules/vehicles/mecha/combat/honker.dm
@@ -29,6 +29,10 @@
 	fire = 100
 	acid = 100
 
+/obj/vehicle/sealed/mecha/honker/Initialize(mapload, built_manually)
+	. = ..()
+	AddElementTrait(TRAIT_WADDLING, REF(src), /datum/element/waddling)
+
 /obj/vehicle/sealed/mecha/honker/play_stepsound()
 	if(squeak)
 		playsound(src, SFX_CLOWN_STEP, 70, 1)
diff --git a/code/modules/vehicles/mecha/combat/justice.dm b/code/modules/vehicles/mecha/combat/justice.dm
index babdb8af17b99..00b0543dbd865 100644
--- a/code/modules/vehicles/mecha/combat/justice.dm
+++ b/code/modules/vehicles/mecha/combat/justice.dm
@@ -57,8 +57,9 @@
 
 /obj/vehicle/sealed/mecha/justice/update_icon_state()
 	. = ..()
-	if(LAZYLEN(occupants))
-		icon_state = weapons_safety ? "[base_icon_state]" : "[base_icon_state]-angry"
+	if(!LAZYLEN(occupants))
+		return
+	icon_state = weapons_safety ? "[base_icon_state]" : "[base_icon_state]-angry"
 	if(!has_gravity())
 		icon_state = "[icon_state]-fly"
 
@@ -169,10 +170,10 @@
 	. = ..()
 	RegisterSignal(chassis, COMSIG_MECH_SAFETIES_TOGGLE, PROC_REF(on_toggle_safety))
 
-/// update button icon when toggle safety.
+/// update button icon when toggle safety and turns invisibility off.
 /datum/action/vehicle/sealed/mecha/invisibility/proc/on_toggle_safety()
 	SIGNAL_HANDLER
-
+	invisibility_off()
 	build_all_button_icons(UPDATE_BUTTON_STATUS)
 
 /datum/action/vehicle/sealed/mecha/invisibility/Trigger(trigger_flags)
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index a0f50622e06d1..123cfef903581 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -332,7 +332,7 @@
 	S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_MISSILE_STRIKE, strike_cooldown_time)
 	podspawn(list(
 		"target" = target_turf,
-		"style" = STYLE_MISSILE,
+		"style" = /datum/pod_style/missile,
 		"effectMissile" = TRUE,
 		"explosionSize" = list(0,0,1,2)
 	))
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index 755f45d52b4be..00d0a955d7b87 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -148,12 +148,13 @@
 		return FALSE
 	if(equipment_slot == MECHA_WEAPON)
 		if(attach_right)
-			if(mech.equip_by_category[MECHA_R_ARM] && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
-				to_chat(user, span_warning("\The [mech]'s right arm is full![mech.equip_by_category[MECHA_L_ARM] ? "" : " Try left arm!"]"))
+			// We need to check for length in case a mech doesn't support any arm attachments at all
+			if((!isnull(mech.equip_by_category[MECHA_R_ARM]) || !mech.max_equip_by_category[MECHA_R_ARM]) && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
+				to_chat(user, span_warning("\The [mech]'s right arm is full![mech.equip_by_category[MECHA_L_ARM] || !mech.max_equip_by_category[MECHA_L_ARM] ? "" : " Try left arm!"]"))
 				return FALSE
 		else
-			if(mech.equip_by_category[MECHA_L_ARM] && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
-				to_chat(user, span_warning("\The [mech]'s left arm is full![mech.equip_by_category[MECHA_R_ARM] ? "" : " Try right arm!"]"))
+			if((!isnull(mech.equip_by_category[MECHA_L_ARM]) || !mech.max_equip_by_category[MECHA_L_ARM]) && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
+				to_chat(user, span_warning("\The [mech]'s left arm is full![mech.equip_by_category[MECHA_R_ARM] || !mech.max_equip_by_category[MECHA_R_ARM] ? "" : " Try right arm!"]"))
 				return FALSE
 		return TRUE
 	if(length(mech.equip_by_category[equipment_slot]) == mech.max_equip_by_category[equipment_slot])
diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
index f7a866bdffe90..95def3ef9b07c 100644
--- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
@@ -117,12 +117,12 @@
 			drill_mob(target, source)
 			playsound(src,'sound/weapons/drill.ogg',40,TRUE)
 		else if(isobj(target))
-			var/obj/O = target
-			if(istype(O, /obj/item/boulder))
-				var/obj/item/boulder/nu_boulder = O
+			var/obj/obj_target = target
+			if(istype(obj_target, /obj/item/boulder))
+				var/obj/item/boulder/nu_boulder = obj_target
 				nu_boulder.manual_process(src, source)
 			else
-				O.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target))
+				obj_target.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target))
 			playsound(src,'sound/weapons/drill.ogg', 40, TRUE)
 
 		// If we caused a qdel drilling the target, we can stop drilling them.
@@ -149,24 +149,21 @@
 		to_chat(user, "[icon2html(src, user)][span_danger("[src] is too durable to drill through.")]")
 
 /turf/closed/mineral/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill, mob/user)
-	for(var/turf/closed/mineral/M in range(drill.chassis,1))
-		if(get_dir(drill.chassis,M)&drill.chassis.dir)
-			M.gets_drilled()
+	for(var/turf/closed/mineral/wall in range(drill.chassis, 1))
+		if(get_dir(drill.chassis, wall) & drill.chassis.dir)
+			wall.gets_drilled()
 	drill.log_message("[user] drilled through [src]", LOG_MECHA)
 	drill.move_ores()
 
 /turf/open/misc/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
-	for(var/turf/open/misc/asteroid/M in range(1, drill.chassis))
-		if((get_dir(drill.chassis,M) & drill.chassis.dir) && !M.dug)
-			M.getDug()
+	for(var/turf/open/misc/asteroid/floor in range(1, drill.chassis))
+		if((get_dir(drill.chassis, floor) & drill.chassis.dir) && !floor.dug)
+			floor.getDug()
 	drill.log_message("Drilled through [src]", LOG_MECHA)
 	drill.move_ores()
 
-
 /obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores()
-	if(istype(chassis, /obj/vehicle/sealed/mecha/ripley) && (locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.flat_equipment))
-		var/obj/vehicle/sealed/mecha/ripley/R = chassis //we could assume that it's a ripley because it has a clamp, but that's ~unsafe~ and ~bad practice~
-		R.collect_ore()
+	chassis.collect_ore()
 
 /obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/living/user)
 	target.visible_message(span_danger("[chassis] is drilling [target] with [src]!"), \
@@ -179,21 +176,24 @@
 		else
 			target.investigate_log("has been gibbed by [src] (attached to [chassis]).", INVESTIGATE_DEATHS)
 			target.gib(DROP_ALL_REMAINS)
+		return
+
+	//drill makes a hole
+	var/def_zone = target.get_random_valid_zone(BODY_ZONE_CHEST)
+	var/obj/item/bodypart/target_part = target.get_bodypart(def_zone)
+	var/blocked = target.run_armor_check(def_zone, MELEE)
+	target.apply_damage(10, BRUTE, def_zone, blocked)
+
+	//blood splatters
+	var/splatter_dir = get_dir(chassis, target)
+	if(isalien(target))
+		new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir)
 	else
-		//drill makes a hole
-		var/obj/item/bodypart/target_part = target.get_bodypart(target.get_random_valid_zone(BODY_ZONE_CHEST))
-		target.apply_damage(10, BRUTE, BODY_ZONE_CHEST, target.run_armor_check(target_part, MELEE))
-
-		//blood splatters
-		var/splatter_dir = get_dir(chassis, target)
-		if(isalien(target))
-			new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir)
-		else
-			new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir)
+		new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir)
 
-		//organs go everywhere
-		if(target_part && prob(10 * drill_level))
-			target_part.dismember(BRUTE)
+	//organs go everywhere
+	if(target_part && blocked < 100 && prob(10 * drill_level))
+		target_part.dismember(BRUTE)
 
 /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
 	name = "diamond-tipped exosuit drill"
@@ -205,7 +205,6 @@
 	force = 15
 	toolspeed = 0.7
 
-
 /obj/item/mecha_parts/mecha_equipment/mining_scanner
 	name = "exosuit mining scanner"
 	desc = "Equipment for working exosuits. It will automatically check surrounding rock for useful minerals."
diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
index 276afc0f3d6c7..c8e77f2e888e4 100644
--- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
@@ -37,6 +37,7 @@
 		return
 	if(!workmech.cargo_hold)
 		CRASH("Mech [chassis] has a clamp device, but no internal storage. This should be impossible.")
+
 	if(ismecha(target))
 		var/obj/vehicle/sealed/mecha/M = target
 		var/have_ammo
@@ -44,24 +45,21 @@
 			if(istype(box, /obj/item/mecha_ammo) && box.rounds)
 				have_ammo = TRUE
 				if(M.ammo_resupply(box, source, TRUE))
-					return
+					return ..()
 		if(have_ammo)
 			to_chat(source, "No further supplies can be provided to [M].")
 		else
 			to_chat(source, "No providable supplies found in cargo hold")
+		return
+
+	if(istype(target, /obj/machinery/door/firedoor) || istype(target, /obj/machinery/door/airlock))
+		var/obj/machinery/door/target_door = target
+		playsound(chassis, clampsound, 50, FALSE, -6)
+		target_door.try_to_crowbar(src, source)
+		return ..()
 
-	else if(isobj(target))
+	if(isobj(target))
 		var/obj/clamptarget = target
-		if(istype(clamptarget, /obj/machinery/door/firedoor))
-			var/obj/machinery/door/firedoor/targetfiredoor = clamptarget
-			playsound(chassis, clampsound, 50, FALSE, -6)
-			targetfiredoor.try_to_crowbar(src, source)
-			return
-		if(istype(clamptarget, /obj/machinery/door/airlock/))
-			var/obj/machinery/door/airlock/targetairlock = clamptarget
-			playsound(chassis, clampsound, 50, FALSE, -6)
-			targetairlock.try_to_crowbar(src, source, TRUE)
-			return
 		if(clamptarget.anchored)
 			to_chat(source, "[icon2html(src, source)][span_warning("[target] is firmly secured!")]")
 			return
@@ -72,66 +70,63 @@
 		chassis.visible_message(span_notice("[chassis] lifts [target] and starts to load it into cargo compartment."))
 		clamptarget.set_anchored(TRUE)
 		if(!do_after_cooldown(target, source))
-			clamptarget.set_anchored(initial(clamptarget.anchored))
+			clamptarget.set_anchored(FALSE)
 			return
-		clamptarget.forceMove(workmech.cargo_hold)
 		clamptarget.set_anchored(FALSE)
+		clamptarget.forceMove(workmech.cargo_hold)
 		if(!chassis.ore_box && istype(clamptarget, /obj/structure/ore_box))
 			chassis.ore_box = clamptarget
 		to_chat(source, "[icon2html(src, source)][span_notice("[target] successfully loaded.")]")
 		log_message("Loaded [clamptarget]. Cargo compartment capacity: [workmech.cargo_hold.cargo_capacity - workmech.cargo_hold.contents.len]", LOG_MECHA)
+		return ..()
 
-	else if(isliving(target))
-		var/mob/living/M = target
-		if(M.stat == DEAD)
-			return
+	if(!isliving(target))
+		return ..()
 
-		if(!source.combat_mode)
-			step_away(M,chassis)
-			if(killer_clamp)
-				target.visible_message(span_danger("[chassis] tosses [target] like a piece of paper!"), \
-					span_userdanger("[chassis] tosses you like a piece of paper!"))
-			else
-				to_chat(source, "[icon2html(src, source)][span_notice("You push [target] out of the way.")]")
-				chassis.visible_message(span_notice("[chassis] pushes [target] out of the way."), \
-				span_notice("[chassis] pushes you aside."))
-			return ..()
-		else if(LAZYACCESS(modifiers, RIGHT_CLICK) && iscarbon(M))//meme clamp here
-			if(!killer_clamp)
-				to_chat(source, span_notice("You longingly wish to tear [M]'s arms off."))
-				return
-			var/mob/living/carbon/C = target
-			var/torn_off = FALSE
-			var/obj/item/bodypart/affected = C.get_bodypart(BODY_ZONE_L_ARM)
-			if(affected != null)
-				affected.dismember(damtype)
-				torn_off = TRUE
-			affected = C.get_bodypart(BODY_ZONE_R_ARM)
-			if(affected != null)
-				affected.dismember(damtype)
-				torn_off = TRUE
-			if(!torn_off)
-				to_chat(source, span_notice("[M]'s arms are already torn off, you must find a challenger worthy of the kill clamp!"))
-				return
+	var/mob/living/victim = target
+	if(victim.stat == DEAD)
+		return
+
+	if(!source.combat_mode)
+		step_away(victim, chassis)
+		if(killer_clamp)
+			target.visible_message(span_danger("[chassis] tosses [target] like a piece of paper!"), \
+				span_userdanger("[chassis] tosses you like a piece of paper!"))
+		else
+			to_chat(source, "[icon2html(src, source)][span_notice("You push [target] out of the way.")]")
+			chassis.visible_message(span_notice("[chassis] pushes [target] out of the way."), \
+			span_notice("[chassis] pushes you aside."))
+		return ..()
+
+	if(iscarbon(victim) && killer_clamp)//meme clamp here
+		var/mob/living/carbon/carbon_victim = target
+		var/torn_off = FALSE
+		var/obj/item/bodypart/affected = carbon_victim.get_bodypart(BODY_ZONE_L_ARM)
+		if(affected != null)
+			affected.dismember(damtype)
+			torn_off = TRUE
+		affected = carbon_victim.get_bodypart(BODY_ZONE_R_ARM)
+		if(affected != null)
+			affected.dismember(damtype)
+			torn_off = TRUE
+		if(torn_off)
 			playsound(src, get_dismember_sound(), 80, TRUE)
-			target.visible_message(span_danger("[chassis] rips [target]'s arms off!"), \
+			carbon_victim.visible_message(span_danger("[chassis] rips [carbon_victim]'s arms off!"), \
 						span_userdanger("[chassis] rips your arms off!"))
-			log_combat(source, M, "removed both arms with a real clamp,", "[name]", "(COMBAT MODE: [uppertext(source.combat_mode)] (DAMTYPE: [uppertext(damtype)])")
+			log_combat(source, carbon_victim, "removed both arms with a real clamp,", "[name]", "(COMBAT MODE: [uppertext(source.combat_mode)] (DAMTYPE: [uppertext(damtype)])")
 			return ..()
 
-		M.take_overall_damage(clamp_damage)
-		if(!M) //get gibbed stoopid
-			return
-		M.adjustOxyLoss(round(clamp_damage/2))
-		M.updatehealth()
-		target.visible_message(span_danger("[chassis] squeezes [target]!"), \
-							span_userdanger("[chassis] squeezes you!"),\
-							span_hear("You hear something crack."))
-		log_combat(source, M, "attacked", "[name]", "(Combat mode: [source.combat_mode ? "On" : "Off"]) (DAMTYPE: [uppertext(damtype)])")
+	victim.take_overall_damage(clamp_damage)
+	if(isnull(victim)) //get gibbed stoopid
+		return ..()
+	victim.adjustOxyLoss(round(clamp_damage/2))
+	victim.updatehealth()
+	victim.visible_message(span_danger("[chassis] squeezes [victim]!"), \
+						span_userdanger("[chassis] squeezes you!"),\
+						span_hear("You hear something crack."))
+	log_combat(source, victim, "attacked", "[name]", "(Combat mode: [source.combat_mode ? "On" : "Off"]) (DAMTYPE: [uppertext(damtype)])")
 	return ..()
 
-
-
 //This is pretty much just for the death-ripley
 /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
 	name = "\improper KILL CLAMP"
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index c2d37ee6e8348..b4c292202542e 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -149,8 +149,9 @@
 /obj/machinery/mecha_part_fabricator/emag_act(mob/user, obj/item/card/emag/emag_card)
 	if(obj_flags & EMAGGED)
 		return FALSE
-	if(user.job != JOB_ROBOTICIST)
-		to_chat(user, span_warning("You clicking and typing but don’t understand what to do with it"))
+	if(!HAS_TRAIT(user, TRAIT_KNOW_ROBO_WIRES))
+		to_chat(user, span_warning("You're unsure about [emag_card ? "where to swipe [emag_card] over" : "how to override"] [src] for any effect. Maybe if you had more knowledge of robotics..."))
+
 		return FALSE
 	obj_flags |= EMAGGED
 	for(var/found_illegal_mech_nods in SSresearch.techweb_nodes)
@@ -179,6 +180,9 @@
 		if(design.build_type & MECHFAB)
 			cached_designs |= design
 
+	for(var/datum/design/illegal_disign in illegal_local_designs)
+		cached_designs |= illegal_disign
+
 	var/design_delta = cached_designs.len - previous_design_count
 
 	if(design_delta > 0)
diff --git a/code/modules/vehicles/mecha/mech_melee_attack.dm b/code/modules/vehicles/mecha/mech_melee_attack.dm
index 655a2f3533936..f37d092b83f32 100644
--- a/code/modules/vehicles/mecha/mech_melee_attack.dm
+++ b/code/modules/vehicles/mecha/mech_melee_attack.dm
@@ -12,11 +12,11 @@
 	SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_MECH, mecha_attacker, user)
 	if(!isnull(user))
 		log_combat(user, src, "attacked", mecha_attacker, "(COMBAT MODE: [uppertext(user?.combat_mode)] (DAMTYPE: [uppertext(mecha_attacker.damtype)])")
-	return 0
+	return
 
 /turf/closed/wall/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
 	if(!user.combat_mode)
-		return 0
+		return
 
 	mecha_attacker.do_attack_animation(src)
 	switch(mecha_attacker.damtype)
@@ -25,7 +25,7 @@
 		if(BURN)
 			playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
 		else
-			return 0
+			return
 	mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
 	if(prob(hardness + mecha_attacker.force) && mecha_attacker.force > 20)
 		dismantle_wall(1)
@@ -46,14 +46,14 @@
 		if(BURN)
 			playsound(src, 'sound/items/welder.ogg', 50, TRUE)
 		else
-			return 0
+			return
 	mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
 	..()
 	return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
 
 /obj/machinery/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
 	if(!user.combat_mode)
-		return 0
+		return
 
 	mecha_attacker.do_attack_animation(src)
 	switch(mecha_attacker.damtype)
@@ -62,16 +62,32 @@
 		if(BURN)
 			playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
 		else
-			return 0
+			return
 	mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
 	..()
 	return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
 
 /obj/structure/window/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
 	if(!can_be_reached())
-		return 0
+		return
 	return ..()
 
+/obj/vehicle/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+	if(!user.combat_mode)
+		return FALSE
+
+	mecha_attacker.do_attack_animation(src)
+	switch(mecha_attacker.damtype)
+		if(BRUTE)
+			playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
+		if(BURN)
+			playsound(src, 'sound/items/welder.ogg', 50, TRUE)
+		else
+			return
+	mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
+	..()
+	return take_damage(mecha_attacker.force, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker))
+
 /mob/living/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
 	if(istype(user) && !user.combat_mode)
 		step_away(src, mecha_attacker)
@@ -79,43 +95,46 @@
 		visible_message(span_warning("[mecha_attacker] pushes [src] out of the way."), \
 						span_warning("[mecha_attacker] pushes you out of the way."), span_hear("You hear aggressive shuffling!"), 5, list(mecha_attacker))
 		to_chat(mecha_attacker, span_danger("You push [src] out of the way."))
-		return 0
+		return
 
 	if(!isnull(user) && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, span_warning("You don't want to harm other living beings!"))
-		return 0
+		return
 	mecha_attacker.do_attack_animation(src)
 	if(mecha_attacker.damtype == BRUTE)
 		step_away(src, mecha_attacker, 15)
-	var/obj/item/bodypart/selected_zone = get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_HEAD))
-	var/dmg = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
 	switch(mecha_attacker.damtype)
 		if(BRUTE)
 			if(mecha_attacker.force > 35) // durand and other heavy mechas
 				mecha_attacker.melee_attack_effect(src, heavy = TRUE)
 			else if(mecha_attacker.force > 20 && !IsKnockdown()) // lightweight mechas like gygax
 				mecha_attacker.melee_attack_effect(src, heavy = FALSE)
-			if(selected_zone)
-				selected_zone.receive_damage(dmg, 0, updating_health = TRUE)
-			else
-				apply_damage(dmg, BRUTE)
 			playsound(src, mecha_attacker.brute_attack_sound, 50, TRUE)
 		if(FIRE)
-			if(selected_zone)
-				selected_zone.receive_damage(0, dmg, updating_health = TRUE)
-			else
-				apply_damage(dmg, BURN)
 			playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
 		if(TOX)
 			playsound(src, mecha_attacker.tox_attack_sound, 50, TRUE)
-			if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force*2)
-				reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force/2)
-			if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force*2)
-				reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force/2.5)
+			var/bio_armor = (100 - run_armor_check(attack_flag = BIO, silent = TRUE)) / 100
+			if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force * 2)
+				reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force / 2 * bio_armor)
+			if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force * 2)
+				reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force / 2.5 * bio_armor)
 		else
-			return 0
-	. = dmg
+			return
+
+	var/damage = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
+	if (mecha_attacker.damtype == BRUTE || mecha_attacker.damtype == FIRE)
+		var/def_zone = get_random_valid_zone(user.zone_selected, even_weights = TRUE)
+		var/zone_readable = parse_zone_with_bodypart(def_zone)
+		apply_damage(damage, mecha_attacker.damtype, def_zone, run_armor_check(
+			def_zone = def_zone,
+			attack_flag = MELEE,
+			absorb_text = span_notice("Your armor has protected your [zone_readable]!"),
+			soften_text = span_warning("Your armor has softened a hit to your [zone_readable]!")
+		))
+
 	visible_message(span_danger("[mecha_attacker.name] [mecha_attacker.attack_verbs[1]] [src]!"), \
 		span_userdanger("[mecha_attacker.name] [mecha_attacker.attack_verbs[2]] you!"), span_hear("You hear a sickening sound of flesh [mecha_attacker.attack_verbs[3]] flesh!"), COMBAT_MESSAGE_RANGE, list(mecha_attacker))
 	to_chat(mecha_attacker, span_danger("You [mecha_attacker.attack_verbs[1]] [src]!"))
 	..()
+	return damage
diff --git a/code/modules/vehicles/mecha/mecha_ai_interaction.dm b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
index 3a681cac97db5..cec3d867e2b6a 100644
--- a/code/modules/vehicles/mecha/mecha_ai_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
@@ -12,7 +12,7 @@
 		to_chat(user, "<a href='?src=[REF(user)];ai_take_control=[REF(src)]'>[span_userdanger("ASSUME DIRECT CONTROL?")]</a><br>")
 		return
 	examine(user)
-	if(length(return_drivers()) > 0)
+	if(length(return_occupants()) >= max_occupants)
 		to_chat(user, span_warning("This exosuit has a pilot and cannot be controlled."))
 		return
 	var/can_control_mech = FALSE
@@ -103,6 +103,7 @@
 	AI.controlled_equipment = src
 	AI.remote_control = src
 	AI.ShutOffDoomsdayDevice()
+	add_occupant(AI)
 	to_chat(AI, AI.can_dominate_mechs ? span_greenannounce("Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!") :\
 		span_notice("You have been uploaded to a mech's onboard computer."))
 	to_chat(AI, "<span class='reallybig boldnotice'>Use Middle-Mouse or the action button in your HUD to toggle equipment safety. Clicks with safety enabled will pass AI commands.</span>")
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index e72d5505cb6fc..7a9141e80c1a7 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -41,7 +41,6 @@
 		return FALSE
 	if(ishuman(newoccupant) && !Adjacent(newoccupant))
 		return FALSE
-	add_occupant(newoccupant)
 	mecha_flags &= ~PANEL_OPEN //Close panel if open
 	newoccupant.forceMove(src)
 	newoccupant.update_mouse_pointer()
diff --git a/code/modules/vehicles/mecha/medical/odysseus.dm b/code/modules/vehicles/mecha/medical/odysseus.dm
index 90a46f54f5864..162858bc3105a 100644
--- a/code/modules/vehicles/mecha/medical/odysseus.dm
+++ b/code/modules/vehicles/mecha/medical/odysseus.dm
@@ -15,20 +15,14 @@
 /obj/vehicle/sealed/mecha/odysseus/moved_inside(mob/living/carbon/human/H)
 	. = ..()
 	if(. && !HAS_TRAIT(H, TRAIT_MEDICAL_HUD))
-		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
-		hud.show_to(H)
 		ADD_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
 
 /obj/vehicle/sealed/mecha/odysseus/remove_occupant(mob/living/carbon/human/H)
 	if(isliving(H) && HAS_TRAIT_FROM(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT))
-		var/datum/atom_hud/med_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
-		med_hud.hide_from(H)
 		REMOVE_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
 	return ..()
 
 /obj/vehicle/sealed/mecha/odysseus/mmi_moved_inside(obj/item/mmi/M, mob/user)
 	. = ..()
 	if(. && !HAS_TRAIT(M, TRAIT_MEDICAL_HUD))
-		var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
-		var/mob/living/brain/B = M.brainmob
-		hud.show_to(B)
+		ADD_TRAIT(M, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm
index cecf6b815e249..6a38f65e3bf09 100644
--- a/code/modules/vehicles/motorized_wheelchair.dm
+++ b/code/modules/vehicles/motorized_wheelchair.dm
@@ -100,7 +100,6 @@
 /obj/vehicle/ridden/wheelchair/motorized/attack_hand(mob/living/user, list/modifiers)
 	if(!power_cell || !panel_open)
 		return ..()
-	power_cell.update_appearance()
 	to_chat(user, span_notice("You remove [power_cell] from [src]."))
 	user.put_in_hands(power_cell)
 	power_cell = null
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index 7ef79cb89cf04..441a1263a3ea0 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -64,7 +64,7 @@
 		installed_upgrade = null
 		update_appearance()
 	else if(trash_bag && (!is_key(I) || is_key(inserted_key))) // don't put a key in the trash when we need it
-		trash_bag.attackby(I, user)
+		trash_bag.atom_storage.attempt_insert(I, user)
 	else
 		return ..()
 
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 08edbf7886799..82146976ad1f8 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -212,14 +212,13 @@
 	board_item_type = /obj/item/melee/skateboard/holyboard
 	instability = 3
 	icon_state = "hoverboard_holy"
-/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_buckle_mob(mob/living/M)
-	M.AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
-	return ..()
 
-/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_unbuckle_mob(mob/living/M)
-	if(!has_buckled_mobs())
-		qdel (M.GetComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY))
-		return ..()
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/make_ridable()
+	AddElement(/datum/element/ridable, /datum/component/riding/vehicle/scooter/skateboard/hover/holy)
+
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
 
 /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
 	name = "\improper Board Of Directors"
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index c378009996618..208f664971c56 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -306,7 +306,7 @@
 		to_chat(owner, span_danger("You prepare to thank the driver, only to realize that they don't exist."))
 		return
 	var/mob/clown = pick(drivers)
-	owner.say("Thank you for the fun ride, [clown.name]!")
+	owner.say("Спасибо за веселую поездку, [clown.name]!")
 	clown_car.increment_thanks_counter()
 
 /datum/action/vehicle/ridden/wheelchair/bell
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 336f3b72ce1f7..6e63000951cbc 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -283,7 +283,6 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
 	register_context()
 
 /obj/machinery/vending/Destroy()
-	QDEL_NULL(wires)
 	QDEL_NULL(coin)
 	QDEL_NULL(bill)
 	QDEL_NULL(sec_radio)
@@ -397,7 +396,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
 				return
 
 /**
- * Build the inventory of the vending machine from it's product and record lists
+ * Build the inventory of the vending machine from its product and record lists
  *
  * This builds up a full set of /datum/data/vending_products from the product list of the vending machine type
  * Arguments:
@@ -833,7 +832,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
  * * turf/target: The turf to fall onto. Cannot be null.
  * * damage: The raw numerical damage to do by default.
  * * chance_to_crit: The percent chance of a critical hit occuring. Default: 0
- * * forced_crit_case: If given a value from crushing.dm, [target] and it's contents will always be hit with that specific critical hit. Default: null
+ * * forced_crit_case: If given a value from crushing.dm, [target] and its contents will always be hit with that specific critical hit. Default: null
  * * paralyze_time: The time, in deciseconds, a given mob/living will be paralyzed for if crushed.
  * * crush_dir: The direction the crush is coming from. Default: dir of src to [target].
  * * damage_type: The type of damage to do. Default: BRUTE
@@ -1257,6 +1256,15 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
 			ref = REF(record),
 		)
 
+		var/atom/printed = record.product_path
+		// If it's not GAGS and has no innate colors we have to care about, we use DMIcon
+		if(ispath(printed, /atom) \
+			&& (!initial(printed.greyscale_config) || !initial(printed.greyscale_colors)) \
+			&& !initial(printed.color) \
+		)
+			static_record["icon"] = initial(printed.icon)
+			static_record["icon_state"] = initial(printed.icon_state)
+
 		var/list/category = record.category || default_category
 		if (!isnull(category))
 			if (!(category["name"] in categories))
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index c1cffea115fd8..7a3d3a671bcc5 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -32,7 +32,7 @@
 	)
 
 	refill_canister = /obj/item/vending_refill/assist
-	product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
+	product_ads = "Только самое лучшее!;Приобретите себе инструменты.;Самое робастное снаряжение.;Лучшее снаряжение в космосе!"
 	default_price = PAYCHECK_CREW * 0.7 //Default of 35.
 	extra_price = PAYCHECK_CREW
 	payment_department = NO_FREEBIES
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 17555e66a879b..8b9f704569545 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -1,3 +1,222 @@
+
+GLOBAL_LIST_INIT(autodrobe_costumes_items, list(
+	/obj/item/clothing/under/costume/gladiator = 3,
+	/obj/item/clothing/head/helmet/gladiator = 3,
+	/obj/item/clothing/suit/toggle/labcoat/mad = 3,
+	/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3,
+	/obj/item/clothing/head/bio_hood/plague = 3,
+	/obj/item/clothing/mask/gas/plaguedoctor = 3,
+	/obj/item/clothing/under/rank/medical/doctor/nurse = 3,
+	/obj/item/clothing/suit/toggle/owlwings = 1,
+	/obj/item/clothing/under/costume/owl = 1,
+	/obj/item/clothing/mask/gas/owl_mask = 1,
+	/obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
+	/obj/item/clothing/under/costume/griffin = 1,
+	/obj/item/clothing/shoes/griffin = 1,
+	/obj/item/clothing/head/costume/griffin = 1,
+	/obj/item/clothing/under/costume/pirate = 3,
+	/obj/item/clothing/suit/costume/pirate = 3,
+	/obj/item/clothing/head/costume/pirate = 3,
+	/obj/item/clothing/head/costume/pirate/bandana = 3,
+	/obj/item/clothing/shoes/pirate = 3,
+	/obj/item/clothing/under/costume/soviet = 3,
+	/obj/item/clothing/head/costume/ushanka = 3,
+	/obj/item/clothing/accessory/vest_sheriff = 1,
+	/obj/item/clothing/head/cowboy/brown = 3,
+	/obj/item/clothing/head/cowboy/red = 3,
+	/obj/item/clothing/head/cowboy/black = 3,
+	/obj/item/clothing/head/costume/sombrero/green = 3,
+	/obj/item/clothing/suit/costume/poncho = 3,
+	/obj/item/clothing/suit/costume/poncho/green = 3,
+	/obj/item/clothing/suit/costume/poncho/red = 3,
+	/obj/item/clothing/suit/costume/snowman = 3,
+	/obj/item/clothing/head/costume/snowman = 3,
+	/obj/item/clothing/under/costume/referee = 1,
+	/obj/item/clothing/mask/whistle = 1,
+	/obj/item/storage/backpack/henchmen = 5,
+	/obj/item/clothing/under/costume/henchmen = 5,
+	/obj/item/clothing/head/costume/jackbros = 5,
+	/obj/item/clothing/under/costume/jackbros = 5,
+	/obj/item/clothing/under/costume/deckers = 5,
+	/obj/item/clothing/under/costume/sailor = 3,
+	/obj/item/clothing/head/costume/delinquent = 1,
+	/obj/item/clothing/suit/costume/dracula = 3,
+	/obj/item/clothing/under/costume/draculass = 3,
+	/obj/item/clothing/suit/costume/gothcoat = 3,
+	/obj/item/clothing/glasses/eyepatch = 3,
+	/obj/item/clothing/glasses/eyepatch/medical = 3,
+	/obj/item/clothing/under/costume/gi = 4,
+	/obj/item/clothing/head/soft/propeller_hat = 3,
+	/obj/item/clothing/neck/bowtie/rainbow = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_supernatural_items, list(
+	/obj/item/clothing/suit/costume/imperium_monk = 3,
+	/obj/item/clothing/suit/chaplainsuit/holidaypriest = 3,
+	/obj/item/clothing/suit/chaplainsuit/habit = 3,
+	/obj/item/clothing/head/chaplain/habit_veil = 3,
+	/obj/item/clothing/suit/chaplainsuit/whiterobe = 3,
+	/obj/item/clothing/head/wizard/marisa/fake = 3,
+	/obj/item/clothing/suit/wizrobe/marisa/fake = 3,
+	/obj/item/clothing/head/costume/witchwig = 3,
+	/obj/item/staff/broom = 3,
+	/obj/item/clothing/suit/wizrobe/fake = 3,
+	/obj/item/clothing/head/wizard/fake = 3,
+	/obj/item/staff = 3,
+	/obj/item/clothing/head/costume/shrine_wig = 1,
+	/obj/item/clothing/suit/costume/shrine_maiden = 1,
+	/obj/item/gohei = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_entretainers_items, list(
+	/obj/item/clothing/under/rank/civilian/clown/blue = 3,
+	/obj/item/clothing/under/rank/civilian/clown/green = 3,
+	/obj/item/clothing/under/rank/civilian/clown/yellow = 3,
+	/obj/item/clothing/under/rank/civilian/clown/orange = 3,
+	/obj/item/clothing/under/rank/civilian/clown/purple = 3,
+	/obj/item/clothing/mask/gas/sexyclown = 3,
+	/obj/item/clothing/under/rank/civilian/clown/sexy = 3,
+	/obj/item/clothing/head/beret = 6,
+	/obj/item/clothing/mask/gas/sexymime = 3,
+	/obj/item/clothing/under/rank/civilian/mime/sexy = 3,
+	/obj/item/clothing/under/rank/civilian/mime/skirt = 3,
+	/obj/item/clothing/under/rank/civilian/clown/jester = 3,
+	/obj/item/clothing/head/costume/jester = 3,
+	/obj/item/clothing/shoes/jester_shoes = 3,
+	/obj/item/clothing/under/costume/villain = 3,
+	/obj/item/clothing/suit/costume/joker = 3,
+	/obj/item/clothing/under/costume/joker = 3,
+	/obj/item/clothing/shoes/singery = 1,
+	/obj/item/clothing/under/costume/singer/yellow = 1,
+	/obj/item/clothing/shoes/singerb = 1,
+	/obj/item/clothing/under/costume/singer/blue = 1,
+	/obj/item/clothing/head/costume/cueball = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_fancy_items, list(
+	/obj/item/clothing/under/rank/captain/suit = 1,
+	/obj/item/clothing/under/rank/captain/suit/skirt = 1,
+	/obj/item/clothing/under/costume/schoolgirl = 3,
+	/obj/item/clothing/under/costume/schoolgirl/red = 3,
+	/obj/item/clothing/under/costume/schoolgirl/green = 3,
+	/obj/item/clothing/under/costume/schoolgirl/orange = 3,
+	/obj/item/clothing/under/dress/skirt = 3,
+	/obj/item/clothing/neck/tie = 3,
+	/obj/item/clothing/head/hats/tophat = 3,
+	/obj/item/clothing/under/costume/kilt = 3,
+	/obj/item/clothing/glasses/monocle = 3,
+	/obj/item/clothing/head/hats/bowler = 3,
+	/obj/item/cane = 3,
+	/obj/item/clothing/under/dress/sundress = 3,
+	/obj/item/clothing/suit/costume/whitedress = 3,
+	/obj/item/clothing/suit/costume/changshan_red = 3,
+	/obj/item/clothing/suit/costume/changshan_blue = 3,
+	/obj/item/clothing/suit/costume/cheongsam_red = 3,
+	/obj/item/clothing/suit/costume/cheongsam_blue = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_animal_items, list(
+	/obj/item/clothing/head/costume/kitty = 3,
+	/obj/item/clothing/head/costume/rabbitears = 3,
+	/obj/item/clothing/suit/costume/chickensuit = 3,
+	/obj/item/clothing/head/costume/chicken = 3,
+	/obj/item/clothing/suit/hooded/carp_costume = 3,
+	/obj/item/clothing/suit/hooded/ian_costume = 3,
+	/obj/item/clothing/suit/hooded/bee_costume = 3,
+	/obj/item/clothing/mask/animal/small/bat = 3,
+	/obj/item/clothing/mask/animal/small/bee = 3,
+	/obj/item/clothing/mask/animal/small/bear = 3,
+	/obj/item/clothing/mask/animal/small/raven = 3,
+	/obj/item/clothing/mask/animal/small/jackal = 3,
+	/obj/item/clothing/mask/animal/small/fox = 3,
+	/obj/item/clothing/mask/animal/frog = 3,
+	/obj/item/clothing/mask/animal/small/rat = 3,
+	/obj/item/clothing/mask/animal/pig = 3,
+	/obj/item/clothing/mask/animal/cowmask = 3,
+	/obj/item/clothing/mask/animal/horsehead = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_service_items, list(
+	/obj/item/clothing/under/costume/buttondown/slacks/service = 3,
+	/obj/item/clothing/under/costume/buttondown/skirt/service = 3,
+	/obj/item/clothing/neck/bowtie = 6,
+	/obj/item/clothing/accessory/waistcoat = 4,
+	/obj/item/clothing/under/suit/waiter = 4,
+	/obj/item/clothing/suit/apron = 3,
+	/obj/item/clothing/suit/apron/overalls = 3,
+	/obj/item/clothing/head/costume/maidheadband = 3,
+	/obj/item/clothing/under/costume/maid = 3,
+	/obj/item/clothing/gloves/maid = 3,
+	/obj/item/clothing/neck/maid = 3,
+	/obj/item/clothing/under/rank/civilian/janitor/maid = 3,
+	/obj/item/clothing/accessory/maidapron = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_other_items, list(
+	/obj/item/clothing/head/wig/random = 6,
+	/obj/item/clothing/head/flatcap = 3,
+	/obj/item/clothing/suit/jacket/miljacket = 3,
+	/obj/item/clothing/shoes/jackboots = 3,
+	/obj/item/clothing/mask/fakemoustache = 3,
+	/obj/item/clothing/glasses/cold= 3,
+	/obj/item/clothing/glasses/heat= 3,
+	/obj/item/clothing/mask/gas/cyborg = 3,
+	/obj/item/clothing/mask/joy = 3,
+	/obj/item/clothing/mask/gas/prop = 4,
+	/obj/item/clothing/mask/gas/atmosprop = 3,
+	/obj/item/clothing/mask/animal/small/tribal = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_premium_items, list(
+	/obj/item/clothing/suit/costume/pirate/captain = 2,
+	/obj/item/clothing/head/costume/pirate/captain = 2,
+	/obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
+	/obj/item/clothing/head/helmet/roman/fake = 3,
+	/obj/item/clothing/head/helmet/roman/legionnaire/fake = 3,
+	/obj/item/clothing/under/costume/roman = 3,
+	/obj/item/clothing/shoes/roman = 3,
+	/obj/item/shield/roman/fake = 3,
+	/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
+	/obj/item/clothing/head/chaplain/clownmitre = 1,
+	/obj/item/skub = 1,
+	/obj/item/clothing/suit/hooded/mysticrobe = 1,
+	/obj/item/clothing/under/dress/wedding_dress = 1,
+	/obj/item/clothing/under/suit/tuxedo = 1,
+	/obj/item/clothing/head/costume/weddingveil = 1,
+	/obj/item/storage/belt/fannypack/cummerbund = 1,
+	/obj/item/clothing/suit/costume/drfreeze_coat = 1,
+	/obj/item/clothing/under/costume/drfreeze = 1,
+	/obj/item/clothing/head/costume/drfreezehat = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_contraband_items, list(
+	/obj/item/clothing/glasses/blindfold = 1,
+	/obj/item/clothing/glasses/sunglasses/gar = 2,
+	/obj/item/clothing/head/costume/powdered_wig = 1,
+	/obj/item/clothing/head/costume/tv_head = 1,
+	/obj/item/clothing/mask/muzzle = 2,
+	/obj/item/clothing/shoes/ducky_shoes = 1,
+	/obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
+	/obj/item/clothing/shoes/clown_shoes/moffers = 1,
+	/obj/item/clothing/suit/costume/judgerobe = 1,
+	/obj/item/clothing/head/costume/lobsterhat = 1,
+	/obj/item/clothing/under/costume/lobster = 1,
+	/obj/item/gun/magic/wand/nothing = 2,
+	/obj/item/storage/box/tape_wizard = 1,
+))
+
+GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
+	autodrobe_costumes_items +\
+	autodrobe_supernatural_items +\
+	autodrobe_entretainers_items +\
+	autodrobe_fancy_items +\
+	autodrobe_animal_items +\
+	autodrobe_service_items +\
+	autodrobe_other_items +\
+	autodrobe_premium_items +\
+	autodrobe_contraband_items \
+))
+
 /obj/machinery/vending/autodrobe
 	name = "\improper AutoDrobe"
 	desc = "A vending machine for costumes."
@@ -7,244 +226,63 @@
 	req_access = list(ACCESS_THEATRE)
 	product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
 	vend_reply = "Thank you for using AutoDrobe!"
+
+	/**
+	 * Categories are filled in Initialize!
+	 */
+
+	refill_canister = /obj/item/vending_refill/autodrobe
+	default_price = PAYCHECK_CREW * 0.8 //Default of 40.
+	extra_price = PAYCHECK_COMMAND
+	payment_department = ACCOUNT_SRV
+	light_mask="theater-light-mask"
+
+/obj/machinery/vending/autodrobe/Initialize(mapload)
 	product_categories = list(
 		list(
 			"name" = "Costumes",
 			"icon" = "mask",
-			"products" = list(
-				/obj/item/clothing/under/costume/gladiator = 1,
-				/obj/item/clothing/head/helmet/gladiator = 1,
-				/obj/item/clothing/suit/toggle/labcoat/mad = 1,
-				/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
-				/obj/item/clothing/head/bio_hood/plague = 1,
-				/obj/item/clothing/mask/gas/plaguedoctor = 1,
-				/obj/item/clothing/under/rank/medical/doctor/nurse = 1,
-				/obj/item/clothing/suit/toggle/owlwings = 1,
-				/obj/item/clothing/under/costume/owl = 1,
-				/obj/item/clothing/mask/gas/owl_mask = 1,
-				/obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
-				/obj/item/clothing/under/costume/griffin = 1,
-				/obj/item/clothing/shoes/griffin = 1,
-				/obj/item/clothing/head/costume/griffin = 1,
-				/obj/item/clothing/under/costume/pirate = 1,
-				/obj/item/clothing/suit/costume/pirate = 1,
-				/obj/item/clothing/head/costume/pirate = 1,
-				/obj/item/clothing/head/costume/pirate/bandana = 1,
-				/obj/item/clothing/shoes/pirate = 1,
-				/obj/item/clothing/under/costume/soviet = 1,
-				/obj/item/clothing/head/costume/ushanka = 1,
-				/obj/item/clothing/accessory/vest_sheriff =1,
-				/obj/item/clothing/head/cowboy/brown =1,
-				/obj/item/clothing/head/cowboy/red =1,
-				/obj/item/clothing/head/cowboy/black =1,
-				/obj/item/clothing/head/costume/sombrero/green = 1,
-				/obj/item/clothing/suit/costume/poncho = 1,
-				/obj/item/clothing/suit/costume/poncho/green = 1,
-				/obj/item/clothing/suit/costume/poncho/red = 1,
-				/obj/item/clothing/suit/costume/snowman = 1,
-				/obj/item/clothing/head/costume/snowman = 1,
-				/obj/item/clothing/under/costume/referee = 1,
-				/obj/item/clothing/mask/whistle = 1,
-				/obj/item/storage/backpack/henchmen = 5,
-				/obj/item/clothing/under/costume/henchmen = 5,
-				/obj/item/clothing/head/costume/jackbros = 5,
-				/obj/item/clothing/under/costume/jackbros = 5,
-				/obj/item/clothing/under/costume/deckers = 5,
-				/obj/item/clothing/under/costume/sailor = 1,
-				/obj/item/clothing/head/costume/delinquent = 1,
-				/obj/item/clothing/suit/costume/dracula = 1,
-				/obj/item/clothing/under/costume/draculass = 1,
-				/obj/item/clothing/suit/costume/gothcoat = 1,
-				/obj/item/clothing/glasses/eyepatch = 1,
-				/obj/item/clothing/glasses/eyepatch/medical = 1,
-				/obj/item/clothing/under/costume/gi = 4,
-				/obj/item/clothing/head/soft/propeller_hat = 1,
-				/obj/item/clothing/neck/bowtie/rainbow = 1,
-			),
+			"products" = GLOB.autodrobe_costumes_items
 		),
 		list(
 			"name" = "Supernatural",
 			"icon" = "hand-sparkles",
-			"products" = list(
-				/obj/item/clothing/suit/costume/imperium_monk = 1,
-				/obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
-				/obj/item/clothing/suit/chaplainsuit/habit = 1,
-				/obj/item/clothing/head/chaplain/habit_veil = 1,
-				/obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
-				/obj/item/clothing/head/wizard/marisa/fake = 1,
-				/obj/item/clothing/suit/wizrobe/marisa/fake = 1,
-				/obj/item/clothing/head/costume/witchwig = 1,
-				/obj/item/staff/broom = 1,
-				/obj/item/clothing/suit/wizrobe/fake = 1,
-				/obj/item/clothing/head/wizard/fake = 1,
-				/obj/item/staff = 3,
-				/obj/item/clothing/head/costume/shrine_wig = 1,
-				/obj/item/clothing/suit/costume/shrine_maiden = 1,
-				/obj/item/gohei = 1,
-			),
+			"products" = GLOB.autodrobe_supernatural_items
 		),
 		list(
 			"name" = "Entertainers",
 			"icon" = "masks-theater",
-			"products" = list(
-				/obj/item/clothing/under/rank/civilian/clown/blue = 1,
-				/obj/item/clothing/under/rank/civilian/clown/green = 1,
-				/obj/item/clothing/under/rank/civilian/clown/yellow = 1,
-				/obj/item/clothing/under/rank/civilian/clown/orange = 1,
-				/obj/item/clothing/under/rank/civilian/clown/purple = 1,
-				/obj/item/clothing/mask/gas/sexyclown = 1,
-				/obj/item/clothing/under/rank/civilian/clown/sexy = 1,
-				/obj/item/clothing/head/beret = 6,
-				/obj/item/clothing/mask/gas/sexymime = 1,
-				/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
-				/obj/item/clothing/under/rank/civilian/mime/skirt = 1,
-				/obj/item/clothing/under/rank/civilian/clown/jester = 1,
-				/obj/item/clothing/head/costume/jester = 1,
-				/obj/item/clothing/shoes/jester_shoes = 1,
-				/obj/item/clothing/under/costume/villain = 1,
-				/obj/item/clothing/suit/costume/joker = 1,
-				/obj/item/clothing/under/costume/joker = 1,
-				/obj/item/clothing/shoes/singery = 1,
-				/obj/item/clothing/under/costume/singer/yellow = 1,
-				/obj/item/clothing/shoes/singerb = 1,
-				/obj/item/clothing/under/costume/singer/blue = 1,
-				/obj/item/clothing/head/costume/cueball = 1,
-			),
+			"products" = GLOB.autodrobe_entretainers_items
 		),
 		list(
 			"name" = "Fancy",
 			"icon" = "user-tie",
-			"products" = list(
-				/obj/item/clothing/under/rank/captain/suit = 1,
-				/obj/item/clothing/under/rank/captain/suit/skirt = 1,
-				/obj/item/clothing/under/costume/schoolgirl = 1,
-				/obj/item/clothing/under/costume/schoolgirl/red = 1,
-				/obj/item/clothing/under/costume/schoolgirl/green = 1,
-				/obj/item/clothing/under/costume/schoolgirl/orange = 1,
-				/obj/item/clothing/under/dress/skirt = 1,
-				/obj/item/clothing/neck/tie = 3,
-				/obj/item/clothing/head/hats/tophat = 1,
-				/obj/item/clothing/under/costume/kilt = 1,
-				/obj/item/clothing/glasses/monocle =1,
-				/obj/item/clothing/head/hats/bowler = 1,
-				/obj/item/cane = 1,
-				/obj/item/clothing/under/dress/sundress = 1,
-				/obj/item/clothing/suit/costume/whitedress = 1,
-				/obj/item/clothing/suit/costume/changshan_red = 1,
-				/obj/item/clothing/suit/costume/changshan_blue = 1,
-				/obj/item/clothing/suit/costume/cheongsam_red = 1,
-				/obj/item/clothing/suit/costume/cheongsam_blue = 1,
-			),
+			"products" = GLOB.autodrobe_fancy_items
 		),
 		list(
 			"name" = "Animals",
 			"icon" = "paw",
-			"products" = list(
-				/obj/item/clothing/head/costume/kitty = 1,
-				/obj/item/clothing/head/costume/rabbitears =1,
-				/obj/item/clothing/suit/costume/chickensuit = 1,
-				/obj/item/clothing/head/costume/chicken = 1,
-				/obj/item/clothing/suit/hooded/carp_costume = 1,
-				/obj/item/clothing/suit/hooded/ian_costume = 1,
-				/obj/item/clothing/suit/hooded/bee_costume = 1,
-				/obj/item/clothing/mask/animal/small/bat = 1,
-				/obj/item/clothing/mask/animal/small/bee = 1,
-				/obj/item/clothing/mask/animal/small/bear = 1,
-				/obj/item/clothing/mask/animal/small/raven = 1,
-				/obj/item/clothing/mask/animal/small/jackal = 1,
-				/obj/item/clothing/mask/animal/small/fox = 1,
-				/obj/item/clothing/mask/animal/frog = 1,
-				/obj/item/clothing/mask/animal/small/rat = 1,
-				/obj/item/clothing/mask/animal/pig = 1,
-				/obj/item/clothing/mask/animal/cowmask = 1,
-				/obj/item/clothing/mask/animal/horsehead = 1,
-			),
+			"products" = GLOB.autodrobe_animal_items
 		),
 		list(
 			"name" = "Service",
 			"icon" = "kitchen-set",
-			"products" = list(
-				/obj/item/clothing/under/costume/buttondown/slacks/service = 1,
-				/obj/item/clothing/under/costume/buttondown/skirt/service = 1,
-				/obj/item/clothing/neck/bowtie = 2,
-				/obj/item/clothing/accessory/waistcoat = 1,
-				/obj/item/clothing/under/suit/waiter = 1,
-				/obj/item/clothing/suit/apron = 1,
-				/obj/item/clothing/suit/apron/overalls = 1,
-				/obj/item/clothing/head/costume/maidheadband = 1,
-				/obj/item/clothing/under/costume/maid = 1,
-				/obj/item/clothing/gloves/maid = 1,
-				/obj/item/clothing/neck/maid = 1,
-				/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
-				/obj/item/clothing/accessory/maidapron = 1,
-			),
+			"products" = GLOB.autodrobe_service_items
 		),
 		list(
 			"name" = "Other",
 			"icon" = "star",
-			"products" = list(
-				/obj/item/clothing/head/wig/random = 3,
-				/obj/item/clothing/head/flatcap = 1,
-				/obj/item/clothing/suit/jacket/miljacket = 1,
-				/obj/item/clothing/shoes/jackboots = 1,
-				/obj/item/clothing/mask/fakemoustache = 1,
-				/obj/item/clothing/glasses/cold=1,
-				/obj/item/clothing/glasses/heat=1,
-				/obj/item/clothing/mask/gas/cyborg = 1,
-				/obj/item/clothing/mask/joy = 1,
-				/obj/item/clothing/mask/gas/prop = 4,
-				/obj/item/clothing/mask/gas/atmosprop = 3,
-				/obj/item/clothing/mask/animal/small/tribal = 1,
-			),
+			"products" = GLOB.autodrobe_other_items
 		),
 	)
+	premium = GLOB.autodrobe_premium_items
+	contraband = GLOB.autodrobe_contraband_items
 
-	contraband = list(
-		/obj/item/clothing/glasses/blindfold = 1,
-		/obj/item/clothing/glasses/sunglasses/gar = 2,
-		/obj/item/clothing/head/costume/powdered_wig = 1,
-		/obj/item/clothing/head/costume/tv_head = 1,
-		/obj/item/clothing/mask/muzzle = 2,
-		/obj/item/clothing/shoes/ducky_shoes = 1,
-		/obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
-		/obj/item/clothing/shoes/clown_shoes/moffers = 1,
-		/obj/item/clothing/suit/costume/judgerobe = 1,
-		/obj/item/clothing/head/costume/lobsterhat = 1,
-		/obj/item/clothing/under/costume/lobster = 1,
-		/obj/item/gun/magic/wand/nothing = 2,
-		/obj/item/storage/box/tape_wizard = 1,
-	)
-	premium = list(
-		/obj/item/clothing/suit/costume/pirate/captain = 2,
-		/obj/item/clothing/head/costume/pirate/captain = 2,
-		/obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
-		/obj/item/clothing/head/helmet/roman/fake = 1,
-		/obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
-		/obj/item/clothing/under/costume/roman = 1,
-		/obj/item/clothing/shoes/roman = 1,
-		/obj/item/shield/roman/fake = 1,
-		/obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
-		/obj/item/clothing/head/chaplain/clownmitre = 1,
-		/obj/item/skub = 1,
-		/obj/item/clothing/suit/hooded/mysticrobe = 1,
-		/obj/item/clothing/under/dress/wedding_dress = 1,
-		/obj/item/clothing/under/suit/tuxedo = 1,
-		/obj/item/clothing/head/costume/weddingveil = 1,
-		/obj/item/storage/belt/fannypack/cummerbund = 1,
-		/obj/item/clothing/suit/costume/drfreeze_coat = 1,
-		/obj/item/clothing/under/costume/drfreeze = 1,
-		/obj/item/clothing/head/costume/drfreezehat = 1,
-	)
-	refill_canister = /obj/item/vending_refill/autodrobe
-	default_price = PAYCHECK_CREW * 0.8 //Default of 40.
-	extra_price = PAYCHECK_COMMAND
-	payment_department = ACCOUNT_SRV
-	light_mask="theater-light-mask"
+	. = ..()
 
 /obj/machinery/vending/autodrobe/all_access
 	desc = "A vending machine for costumes. This model appears to have no access restrictions."
 	req_access = null
-
 /obj/item/vending_refill/autodrobe
 	machine_name = "AutoDrobe"
 	icon_state = "refill_costume"
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 791b1c6f71562..e8856f9d53414 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -83,8 +83,8 @@
 		/obj/item/reagent_containers/cup/glass/bottle/bitters = 5,
 	)
 
-	product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
-	product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
+	product_slogans = "Надеюсь, никто не попросит меня о чёртовой кружке чая...;Алкоголь - друг человека. Вы же не бросите друга?;Очень рад вас обслужить!;Никто на этой станции не хочет выпить?"
+	product_ads = "Выпьем!;Бухло пойдёт вам на пользу!;Алкоголь - друг человека.;Очень рад вас обслужить!;Хотите отличного холодного пива?;Ничто так не лечит, как бухло!;Пригубите!;Выпейте!;Возьмите пивка!;Пиво пойдёт вам на пользу!;Только лучший алкоголь!;Бухло лучшего качества с 2053 года!;Вино со множеством наград!;Максимум алкоголя!;Твоё любимое пиво.;Тост: «За прогресс!»"
 	req_access = list(ACCESS_BAR)
 	refill_canister = /obj/item/vending_refill/boozeomat
 	default_price = PAYCHECK_CREW * 0.9
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 61379e5635468..537a4d12a724f 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/cigarette
 	name = "\improper ShadyCigs Deluxe"
 	desc = "If you want to get cancer, might as well do it in style."
-	product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
-	product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
+	product_slogans = "Космосигареты хороши на вкус, какими они и должны быть.;Курение убивает, но не сегодня!;Курите!;Не верьте исследованиям - курите сегодня!"
+	product_ads = "Наверняка не вредно!;Не верьте ученым!;На здоровье!;Не бросайте курить, купите ещё!;Курите!;Никотиновый рай.;Лучшие сигареты с 2150 года.;Сигареты с множеством наград."
 	icon_state = "cigs"
 	panel_type = "panel5"
 	products = list(
@@ -51,8 +51,8 @@
 /obj/machinery/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin
 	name = "\improper ShadyCigs Ultra"
 	desc = "Now with extra premium products!"
-	product_ads = "Probably not bad for you!;Dope will get you through times of no money better than money will get you through times of no dope!;It's good for you!"
-	product_slogans = "Turn on, tune in, drop out!;Better living through chemistry!;Toke!;Don't forget to keep a smile on your lips and a song in your heart!"
+	product_ads = "Наверняка не вредно!;Допинг проведёт через безденежье лучше, чем деньги через бездопингье!;На здоровье!"
+	product_slogans = "Включи, настрой, получи!;С химией жить веселей!;Затянитесь!;Сохраняй улыбку на устах и песню в своём сердце!"
 	products = list(
 		/obj/item/storage/fancy/cigarettes = 5,
 		/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index bf260ab76bc44..738ba83e15819 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -33,11 +33,11 @@
 				/obj/item/clothing/head/hats/tophat = 3,
 				/obj/item/clothing/head/fedora = 3,
 				/obj/item/clothing/head/hats/bowler = 3,
-				/obj/item/clothing/head/cowboy/white = 1,
-				/obj/item/clothing/head/cowboy/grey = 1,
-				/obj/item/clothing/head/costume/sombrero/green = 1,
-				/obj/item/clothing/head/costume/nightcap/blue = 2,
-				/obj/item/clothing/head/costume/nightcap/red = 2,
+				/obj/item/clothing/head/cowboy/white = 3,
+				/obj/item/clothing/head/cowboy/grey = 3,
+				/obj/item/clothing/head/costume/sombrero/green = 3,
+				/obj/item/clothing/head/costume/nightcap/blue = 3,
+				/obj/item/clothing/head/costume/nightcap/red = 3,
 			),
 		),
 
@@ -49,12 +49,12 @@
 				/obj/item/clothing/accessory/waistcoat = 4,
 				/obj/item/clothing/suit/toggle/suspenders = 4,
 				/obj/item/clothing/neck/tie/horrible = 3,
-				/obj/item/clothing/glasses/regular = 2,
-				/obj/item/clothing/glasses/regular/jamjar = 1,
-				/obj/item/clothing/glasses/orange = 1,
-				/obj/item/clothing/glasses/red = 1,
-				/obj/item/clothing/glasses/monocle = 1,
-				/obj/item/clothing/gloves/fingerless = 2,
+				/obj/item/clothing/glasses/regular = 3,
+				/obj/item/clothing/glasses/regular/jamjar = 3,
+				/obj/item/clothing/glasses/orange = 3,
+				/obj/item/clothing/glasses/red = 3,
+				/obj/item/clothing/glasses/monocle = 3,
+				/obj/item/clothing/gloves/fingerless = 3,
 				/obj/item/storage/belt/fannypack = 3,
 				/obj/item/storage/belt/fannypack/blue = 3,
 				/obj/item/storage/belt/fannypack/red = 3,
@@ -72,19 +72,19 @@
 				/obj/item/clothing/under/costume/buttondown/slacks = 4,
 				/obj/item/clothing/under/costume/buttondown/shorts = 4,
 				/obj/item/clothing/under/costume/buttondown/skirt = 4,
-				/obj/item/clothing/under/dress/sundress = 2,
-				/obj/item/clothing/under/dress/tango = 2,
+				/obj/item/clothing/under/dress/sundress = 3,
+				/obj/item/clothing/under/dress/tango = 3,
 				/obj/item/clothing/under/dress/skirt/plaid = 4,
 				/obj/item/clothing/under/dress/skirt/turtleskirt = 4,
-				/obj/item/clothing/under/misc/overalls = 2,
-				/obj/item/clothing/under/pants/camo = 2,
-				/obj/item/clothing/under/pants/track = 2,
-				/obj/item/clothing/under/costume/kilt = 1,
-				/obj/item/clothing/under/dress/striped = 1,
-				/obj/item/clothing/under/dress/sailor = 1,
-				/obj/item/clothing/under/dress/eveninggown = 1,
-				/obj/item/clothing/under/misc/pj/blue = 2,
-				/obj/item/clothing/under/misc/pj/red = 2,
+				/obj/item/clothing/under/misc/overalls = 3,
+				/obj/item/clothing/under/pants/camo = 3,
+				/obj/item/clothing/under/pants/track = 3,
+				/obj/item/clothing/under/costume/kilt = 3,
+				/obj/item/clothing/under/dress/striped = 3,
+				/obj/item/clothing/under/dress/sailor = 3,
+				/obj/item/clothing/under/dress/eveninggown = 3,
+				/obj/item/clothing/under/misc/pj/blue = 3,
+				/obj/item/clothing/under/misc/pj/red = 3,
 			),
 		),
 
@@ -96,29 +96,29 @@
 				/obj/item/clothing/suit/jacket/oversized = 4,
 				/obj/item/clothing/suit/jacket/fancy = 4,
 				/obj/item/clothing/suit/toggle/lawyer/greyscale = 4,
-				/obj/item/clothing/suit/hooded/wintercoat/custom = 2,
-				/obj/item/clothing/suit/hooded/wintercoat = 2,
-				/obj/item/clothing/under/suit/navy = 1,
-				/obj/item/clothing/under/suit/black_really = 1,
-				/obj/item/clothing/under/suit/burgundy = 1,
-				/obj/item/clothing/under/suit/charcoal = 1,
-				/obj/item/clothing/under/suit/white = 1,
+				/obj/item/clothing/suit/hooded/wintercoat/custom = 3,
+				/obj/item/clothing/suit/hooded/wintercoat = 3,
+				/obj/item/clothing/under/suit/navy = 3,
+				/obj/item/clothing/under/suit/black_really = 3,
+				/obj/item/clothing/under/suit/burgundy = 3,
+				/obj/item/clothing/under/suit/charcoal = 3,
+				/obj/item/clothing/under/suit/white = 3,
 				/obj/item/clothing/under/costume/buttondown/slacks/service = 4,
 				/obj/item/clothing/under/costume/buttondown/skirt/service = 4,
-				/obj/item/clothing/suit/jacket/bomber = 2,
-				/obj/item/clothing/suit/jacket/puffer/vest = 2,
-				/obj/item/clothing/suit/jacket/puffer = 2,
-				/obj/item/clothing/suit/jacket/letterman = 2,
-				/obj/item/clothing/suit/jacket/letterman_red = 2,
+				/obj/item/clothing/suit/jacket/bomber = 3,
+				/obj/item/clothing/suit/jacket/puffer/vest = 3,
+				/obj/item/clothing/suit/jacket/puffer = 3,
+				/obj/item/clothing/suit/jacket/letterman = 3,
+				/obj/item/clothing/suit/jacket/letterman_red = 3,
 				/obj/item/clothing/suit/costume/hawaiian = 4,
-				/obj/item/clothing/suit/costume/poncho = 1,
-				/obj/item/clothing/under/dress/skirt = 2,
-				/obj/item/clothing/under/suit/white/skirt = 2,
+				/obj/item/clothing/suit/costume/poncho = 3,
+				/obj/item/clothing/under/dress/skirt = 3,
+				/obj/item/clothing/under/suit/white/skirt = 3,
 				/obj/item/clothing/under/rank/captain/suit/skirt = 2,
 				/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
 				/obj/item/clothing/under/rank/civilian/purple_bartender = 2,
-				/obj/item/clothing/suit/jacket/miljacket = 1,
-				/obj/item/clothing/suit/apron/overalls = 2,
+				/obj/item/clothing/suit/jacket/miljacket = 3,
+				/obj/item/clothing/suit/apron/overalls = 3,
 				/obj/item/clothing/suit/costume/wellworn_shirt = 2,
 				/obj/item/clothing/suit/costume/wellworn_shirt/graphic = 2,
 				/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 2,
@@ -137,13 +137,13 @@
 			"products" = list(
 				/obj/item/clothing/shoes/sneakers/black = 4,
 				/obj/item/clothing/shoes/sneakers/white = 4,
-				/obj/item/clothing/shoes/sandal = 2,
-				/obj/item/clothing/shoes/laceup = 2,
+				/obj/item/clothing/shoes/sandal = 3,
+				/obj/item/clothing/shoes/laceup = 3,
 				/obj/item/clothing/shoes/winterboots = 2,
 				/obj/item/clothing/shoes/glow = 2,
-				/obj/item/clothing/shoes/cowboy = 2,
-				/obj/item/clothing/shoes/cowboy/white = 2,
-				/obj/item/clothing/shoes/cowboy/black = 2,
+				/obj/item/clothing/shoes/cowboy = 3,
+				/obj/item/clothing/shoes/cowboy/white = 3,
+				/obj/item/clothing/shoes/cowboy/black = 3,
 			),
 		),
 
@@ -165,6 +165,14 @@
 				/obj/item/clothing/mask/kitsune = 3,
 				/obj/item/clothing/mask/rebellion = 6,
 				/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 1,
+				/obj/item/clothing/head/costume/hairpin = 2,
+				/obj/item/clothing/under/costume/yukata = 2,
+				/obj/item/clothing/under/costume/yukata/green = 2,
+				/obj/item/clothing/under/costume/yukata/white = 2,
+				/obj/item/clothing/under/costume/kimono = 2,
+				/obj/item/clothing/under/costume/kimono/red = 2,
+				/obj/item/clothing/under/costume/kimono/purple = 2,
+				/obj/item/clothing/shoes/sandal/alt = 4,
 				/obj/item/clothing/suit/costume/irs = 20,
 				/obj/item/clothing/head/costume/irs = 20,
 				/obj/item/clothing/head/costume/tmc = 20,
@@ -190,25 +198,25 @@
 	)
 
 	contraband = list(
-		/obj/item/clothing/under/syndicate/tacticool = 1,
-		/obj/item/clothing/under/syndicate/tacticool/skirt = 1,
-		/obj/item/clothing/mask/balaclava = 1,
-		/obj/item/clothing/head/costume/ushanka = 1,
-		/obj/item/clothing/under/costume/soviet = 1,
+		/obj/item/clothing/under/syndicate/tacticool = 2,
+		/obj/item/clothing/under/syndicate/tacticool/skirt = 2,
+		/obj/item/clothing/mask/balaclava = 3,
+		/obj/item/clothing/head/costume/ushanka = 3,
+		/obj/item/clothing/under/costume/soviet = 3,
 		/obj/item/storage/belt/fannypack/black = 2,
-		/obj/item/clothing/suit/jacket/letterman_syndie = 1,
-		/obj/item/clothing/under/costume/jabroni = 1,
-		/obj/item/clothing/under/costume/geisha = 1,
-		/obj/item/clothing/under/rank/centcom/officer/replica = 1,
-		/obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1,
+		/obj/item/clothing/suit/jacket/letterman_syndie = 3,
+		/obj/item/clothing/under/costume/jabroni = 3,
+		/obj/item/clothing/under/costume/geisha = 3,
+		/obj/item/clothing/under/rank/centcom/officer/replica = 2,
+		/obj/item/clothing/under/rank/centcom/officer_skirt/replica = 2,
 	)
-	premium = list(/obj/item/clothing/under/suit/checkered = 1,
-		/obj/item/clothing/head/costume/mailman = 1,
-		/obj/item/clothing/under/misc/mailman = 1,
-		/obj/item/clothing/suit/jacket/leather = 1,
-		/obj/item/clothing/suit/jacket/leather/biker = 1,
+	premium = list(/obj/item/clothing/under/suit/checkered = 3,
+		/obj/item/clothing/head/costume/mailman = 3,
+		/obj/item/clothing/under/misc/mailman = 3,
+		/obj/item/clothing/suit/jacket/leather = 3,
+		/obj/item/clothing/suit/jacket/leather/biker = 3,
 		/obj/item/clothing/neck/necklace/dope = 3,
-		/obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
+		/obj/item/clothing/suit/jacket/letterman_nanotrasen = 3,
 		/obj/item/clothing/under/costume/swagoutfit = 1,
 		/obj/item/clothing/shoes/swagshoes = 1,
 		/obj/item/instrument/piano_synth/headphones/spacepods = 1,
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index 10b895d1367f7..7431070389e0b 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/coffee
 	name = "\improper Solar's Best Hot Drinks"
 	desc = "A vending machine which dispenses hot drinks."
-	product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies"
+	product_ads = "Выпейте!;Выпьем!;На здоровье!;Не хотите горячего супчику?;Я бы убил за чашечку кофе!;Лучшие зёрна в галактике.;Для вас — только лучшие напитки.;М-м-м-м… Ничто не сравнится с кофе.;Я люблю кофе, а вы?;Кофе помогает работать!;Возьмите немного чайку.;Надеемся, вы предпочитаете лучшее!;Отведайте наш новый шоколад!;Admin conspiracies"
 	icon_state = "coffee"
 	icon_vend = "coffee-vend"
 	panel_type = "panel9"
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index dd4a4dd4b99b5..0592c4e291414 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -4,8 +4,8 @@
 	desc = "A softdrink vendor provided by Robust Industries, LLC."
 	icon_state = "Cola_Machine"
 	panel_type = "panel2"
-	product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!"
-	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
+	product_slogans = "Робаст Софтдринкс: крепче, чем тулбоксом по голове!"
+	product_ads = "Освежает!;Надеюсь, вас одолела жажда!;Продано больше миллиона бутылок!;Хотите пить? Почему бы не взять колы?;Пей на здоровье!;Освежись!;Лучшие напитки в космосе."
 	products = list(
 		/obj/item/reagent_containers/cup/soda_cans/cola = 10,
 		/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind = 10,
@@ -106,7 +106,7 @@
 		/obj/item/reagent_containers/cup/soda_cans/wellcheers = 5,
 		)
 	product_slogans = "~Shake me up some of that Shambler's Juice!~"
-	product_ads = "Refreshing!;Thirsty for DNA? Satiate your craving!;Over 1 trillion souls drank!;Made with real DNA!;The hivemind demands your thirst!;Drink up!;Absorb your thirst."
+	product_ads = "Освежает!;Жажда ДНК? Утолите свою жажду!;Выпито более триллиона душ!;Сделано с использованием настоящей ДНК!;Коллективный разум требует вашей жажды!;Пей на здоровье!;Поглотите свою жажду."
 	light_mask = "shamblers-light-mask"
 	light_color = COLOR_MOSTLY_PURE_PINK
 
diff --git a/code/modules/vending/donk.dm b/code/modules/vending/donk.dm
new file mode 100644
index 0000000000000..8814745d6b85b
--- /dev/null
+++ b/code/modules/vending/donk.dm
@@ -0,0 +1,42 @@
+/obj/machinery/vending/donksnack
+	name = "\improper Donk Co Vendor"
+	desc = "A snack machine courtesy of Donk Co."
+	product_slogans = "Just microwave and eat!;The original home of the Donk Pocket!"
+	product_ads = "The original!;You wanna put a bangin' Donk on it!;The best!;The seasoned traitor's food of choice!;Now with 12% more omnizine!;Eat DONK or DIE!;The galaxy's most popular microwavable snack food!*;Try our NEW Ready-Donk Meals!"
+	icon_state = "snackdonk"
+	panel_type = "panel18"
+	light_mask = "donksoft-light-mask"
+	circuit = /obj/item/circuitboard/machine/vending/donksnackvendor
+	products = list(
+		/obj/item/food/donkpocket = 6,
+		/obj/item/food/donkpocket/berry = 6,
+		/obj/item/food/donkpocket/honk = 6,
+		/obj/item/food/donkpocket/pizza = 6,
+		/obj/item/food/donkpocket/spicy = 6,
+		/obj/item/food/donkpocket/teriyaki = 6,
+		/obj/item/food/tatortot = 12,
+	)
+	contraband = list(
+		/obj/item/food/waffles = 2,
+		/obj/item/food/dankpocket = 2,
+		/obj/item/food/donkpocket/gondola = 1,
+	)
+	premium = list(
+		/obj/item/storage/box/donkpockets = 3,
+		/obj/item/storage/box/donkpockets/donkpocketberry = 3,
+		/obj/item/storage/box/donkpockets/donkpockethonk = 3,
+		/obj/item/storage/box/donkpockets/donkpocketpizza = 3,
+		/obj/item/storage/box/donkpockets/donkpocketspicy = 3,
+		/obj/item/storage/box/donkpockets/donkpocketteriyaki = 3,
+		/obj/item/storage/belt/military/snack = 2,
+		/obj/item/mod/module/microwave_beam = 1,
+	)
+	initial_language_holder = /datum/language_holder/syndicate
+	refill_canister = /obj/item/vending_refill/donksnackvendor
+	default_price = PAYCHECK_CREW * 1.4
+	extra_price = PAYCHECK_CREW * 5
+	payment_department = NO_FREEBIES
+
+/obj/item/vending_refill/donksnackvendor
+	machine_name = "Donk Co Snack Vendor"
+	icon_state = "refill_donksnack"
diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm
index c37750a2d3d8e..3ef36b71011e2 100644
--- a/code/modules/vending/drinnerware.dm
+++ b/code/modules/vending/drinnerware.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/dinnerware
 	name = "\improper Plasteel Chef's Dinnerware Vendor"
 	desc = "A kitchen and restaurant equipment vendor."
-	product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
+	product_ads = "М-м-м... формочки для еды!;Еда и формочки для еды!;Возьмите тарелки!;Любите вилки?;Я люблю вилки.;Ууу, столовые приборы.;Вам на самом деле это не нужно..."
 	icon_state = "dinnerware"
 	panel_type = "panel4"
 	product_categories = list(
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 33fefd08d2e79..1ca063972a591 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/games
 	name = "\improper Good Clean Fun"
 	desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..."
-	product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
+	product_ads = "Спрячьтесь в фантастическом мире!;Подпитай свою лудоманию!;Лишитесь своих друзей!;Бросайте кубики на инициативу!;Эльфы и гномы!;Параноидальные компьютеры!;Совсем не сатанинское!;Скучно не будет!"
 	icon_state = "games"
 	panel_type = "panel4"
 	product_categories = list(
diff --git a/code/modules/vending/hotdog.dm b/code/modules/vending/hotdog.dm
index 094beccb41331..55f3d8fb964ce 100644
--- a/code/modules/vending/hotdog.dm
+++ b/code/modules/vending/hotdog.dm
@@ -5,9 +5,9 @@
 	icon_state = "hotdog-vendor"
 	icon_deny = "hotdog-vendor-deny"
 	panel_type = "panel17"
-	product_slogans = "Meatier than ever!;Now with 20% more MSG!;HOTDOGS!;Now Tirizan-friendly!"
-	product_ads = "Your best and only automatic hotdog dispenser!;Serving you the finest buns since 2469!;Comes in 12 different flavors!"
-	vend_reply = "Have a scrumptious meal!"
+	product_slogans = "Мяснее не бывает!;Теперь на 20% больше глутамата натрия!;ХОТ-ДОГИ!;Теперь подходит для Тиризана!"
+	product_ads = "Ваш лучший и единственный автоматический раздатчик хот-догов!;Подаем вам лучшие булочки с 2469 года!;Доступно 12 разных вкусов!"
+	vend_reply = "Приятного аппетита!"
 	light_mask = "hotdog-vendor-light-mask"
 	default_price = PAYCHECK_LOWER
 	product_categories = list(
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index a23ea87c4ef88..a76a139120abf 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -2,9 +2,9 @@
 	name = "\improper Liberation Station"
 	desc = "An overwhelming amount of <b>ancient patriotism</b> washes over you just by looking at the machine."
 	icon_state = "liberationstation"
-	product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!"
-	product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
-	vend_reply = "Remember the name: Liberation Station!"
+	product_slogans = "Liberation Station: Ваш универсальный магазин для всех вещей, связанных со второй поправкой!;Будь сегодня патриотом, возьми оружие!;Качественное оружие по низким ценам!;Лучше мёртвый, чем красный!"
+	product_ads = "Пари как космонавт, жаль как пуля!;Воспользуйтесь второй поправкой уже сегодня!;Оружие не убивает людей, но вы можете!;Кому нужна ответственность, когда есть оружие?"
+	vend_reply = "Запомни нас: Liberation Station!"
 	panel_type = "panel17"
 	products = list(
 		/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index ef89e916bf30b..50406995d1836 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -3,8 +3,8 @@
 	desc = "A magic vending machine."
 	icon_state = "MagiVend"
 	panel_type = "panel10"
-	product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!"
-	vend_reply = "Have an enchanted evening!"
+	product_slogans = "Колдуйте правильно с помощью MagiVend!;Станьте сами себе Гудини! Используйте MagiVend!"
+	vend_reply = "Волшебного вечера!"
 	product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!"
 	products = list(
 		/obj/item/clothing/head/wizard = 1,
@@ -21,7 +21,7 @@
 	contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
 	armor_type = /datum/armor/vending_magivend
 	resistance_flags = FIRE_PROOF
-	default_price = 0 //Just in case, since it's primary use is storage.
+	default_price = 0 //Just in case, since its primary use is storage.
 	extra_price = PAYCHECK_COMMAND
 	payment_department = ACCOUNT_SRV
 	light_mask = "magivend-light-mask"
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 2209f550fce28..cac09bf30906c 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -4,7 +4,7 @@
 	icon_state = "med"
 	icon_deny = "med-deny"
 	panel_type = "panel11"
-	product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
+	product_ads = "Спасите пару жизней!;Лучшие вещи для вашего меда.;Только самые лучшие инструменты.;Натуральные химикаты!;Эти вещи спасают жизни.;Разве вы не хотите это?;Пинг!"
 	req_access = list(ACCESS_MEDICAL)
 	products = list(
 		/obj/item/stack/medical/gauze = 8,
@@ -74,7 +74,7 @@
 	icon_state = "drug"
 	icon_deny = "drug-deny"
 	panel_type = "panel11"
-	product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
+	product_ads = "Спасите пару жизней!;Лучшие вещи для вашего меда.;Только самые лучшие инструменты.;Натуральные химикаты!;Эти вещи спасают жизни.;Разве вы не хотите это?;Пинг!"
 	req_access = list(ACCESS_MEDICAL)
 	products = list(
 		/obj/item/reagent_containers/pill/patch/libital = 5,
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index 130a0921a43a4..74476f27c94a2 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/hydroseeds
 	name = "\improper MegaSeed Servitor"
 	desc = "When you need seeds fast!"
-	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
-	product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
+	product_slogans = "ЗДЕСЬ ЖИВУТ СЕМЕНА! ВОЗЬМИТЕ СЕБЕ НЕМНОГО!;Лучший выбор семян на станции!;Доступны разнообразные сорта грибов для специалистов! Станьте им уже сегодня!"
+	product_ads = "Мы любим растения!;Вырасти урожай!;Расти, малыш, расти-и-и-и!;Ды-а, сына!"
 	icon_state = "seeds"
 	panel_type = "panel2"
 	light_mask = "seeds-light-mask"
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
index 415329366c7d4..25d7f0e6de648 100644
--- a/code/modules/vending/modularpc.dm
+++ b/code/modules/vending/modularpc.dm
@@ -5,8 +5,8 @@
 	icon_deny = "modularpc-deny"
 	panel_type = "panel21"
 	light_mask = "modular-light-mask"
-	product_ads = "Get your gamer gear!;The best GPUs for all of your space-crypto needs!;The most robust cooling!;The finest RGB in space!"
-	vend_reply = "Game on!"
+	product_ads = "Получите свои геймперские приблуды!;Лучшие видеокарты для всех ваших нужд в космо-крипте!;Самое надёжное охлаждение!;Лучшая RGB-подсветка в космосе!"
+	vend_reply = "Игра начинается!"
 	products = list(
 		/obj/item/computer_disk = 8,
 		/obj/item/modular_computer/laptop = 4,
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index de08b8c458f07..ca14590d97b18 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/hydronutrients
 	name = "\improper NutriMax"
 	desc = "A plant nutrients vendor."
-	product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!"
-	product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..."
+	product_slogans = "Вам не надо удобрять почву естественным путём — разве это не чудесно?;Теперь на 50% меньше вони!;Растения тоже люди!"
+	product_ads = "Мы любим растения!;Может сами примете?;Самые зелёные кнопки на свете.;Мы любим большие растения.;Мягкая почва..."
 	icon_state = "nutri"
 	icon_deny = "nutri-deny"
 	panel_type = "panel2"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index ebecb03e1302c..1842b7306fa45 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/security
 	name = "\improper SecTech"
 	desc = "A security equipment vendor."
-	product_ads = "Crack communist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"
+	product_ads = "Круши черепа капиталистов!;Отбей несколько голов!;Не забывай, вредительство - полезно!;Твое оружие здесь.;Наручники!;Стоять, подонок!;Не бей меня, брат!;Убей их, брат.;Почему бы не съесть пончик?"
 	icon_state = "sec"
 	icon_deny = "sec-deny"
 	panel_type = "panel6"
@@ -17,6 +17,7 @@
 		/obj/item/flashlight/seclite = 4,
 		/obj/item/restraints/legcuffs/bola/energy = 7,
 		/obj/item/clothing/gloves/tackler = 5,
+		/obj/item/holosign_creator/security = 2,
 	)
 	contraband = list(
 		/obj/item/clothing/glasses/sunglasses = 2,
@@ -26,6 +27,7 @@
 		/obj/item/storage/belt/security/webbing = 5,
 		/obj/item/coin/antagtoken = 1,
 		/obj/item/clothing/head/helmet/blueshirt = 1,
+		/obj/item/clothing/gloves/color/black/security/blu = 1,
 		/obj/item/clothing/suit/armor/vest/blueshirt = 1,
 		/obj/item/grenade/stingbang = 1,
 		/obj/item/watertank/pepperspray = 2,
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index 1e81679135b3f..2b81da84c30cd 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/snack
 	name = "\improper Getmore Chocolate Corp"
 	desc = "A snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars."
-	product_slogans = "Try our new nougat bar!;Twice the calories for half the price!"
-	product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
+	product_slogans = "Попробуйте наш новый батончик с нугой!;Вдвое больше калорий за полцены!"
+	product_ads = "Самые полезные!;Удостоенные наград шоколадные плитки!;Ммм! Как вкусно!;Боже мой, какой сочный!;Перекуси!;Закуски полезны для вас!;Запаситесь закусками Getmore!;Самые качественные закуски прямо с Марса.;Мы любим шоколад!;Попробуйте наше новое вяленое мясо!"
 	icon_state = "snack"
 	panel_type = "panel2"
 	light_mask = "snack-light-mask"
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index ba997941a3735..bd314fc2faf08 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -4,7 +4,7 @@
 	icon_state = "sovietsoda"
 	panel_type = "panel8"
 	light_mask = "soviet-light-mask"
-	product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
+	product_ads = "За Царя и Родину.;Вы выполнили свою норму питания сегодня?;Очень хорошо!;Мы простые люди, это всё что мы едим.;Если есть человек, есть проблема. Если нет человека, нет проблемы."
 	products = list(
 		/obj/item/reagent_containers/cup/glass/drinkingglass/filled/soda = 30,
 	)
diff --git a/code/modules/vending/subtype.dm b/code/modules/vending/subtype.dm
index 9b4f212224ea7..3a1a04ff6e764 100644
--- a/code/modules/vending/subtype.dm
+++ b/code/modules/vending/subtype.dm
@@ -10,6 +10,7 @@
 	circuit = null
 	product_slogans = "Spawn \" too annoying? Too lazy to open game panel? This one's for you!;Subtype vendor, for all your debugging woes!"
 	default_price = 0
+	onstation = FALSE
 	/// Spawns coders by default
 	var/type_to_vend = /obj/item/food/grown/citrus
 
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index a1d11c307277e..86a3912babbd0 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -1,8 +1,8 @@
 /obj/machinery/vending/sustenance
 	name = "\improper Sustenance Vendor"
 	desc = "A vending machine which vends food, as required by section 47-C of the NT's Prisoner Ethical Treatment Agreement."
-	product_slogans = "Enjoy your meal.;Enough calories to support strenuous labor."
-	product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Even prisoners deserve their daily bread!;Have some more candy corn!;Try our new ice cups!"
+	product_slogans = "Наслаждайся своей стряпнёй.;Достаточно калорий чтоб не сдохнуть."
+	product_ads = "Достаточно здоровое.;Эффективно произведённый тофу!;Ммм! Так вкусно!;Наслаждайся своей стряпнёй.;Вам нужна еда, чтобы жить!;Даже заключённые заслуживают свой ежедневный хлеб!;Возьмите ещё кукурузных конфет!;Попробуйте наш новый лёд в стаканчике!"
 	light_mask = "snack-light-mask"
 	icon_state = "sustenance"
 	panel_type = "panel2"
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index e3f3b3316f244..2ba9f282ff18e 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -3,9 +3,9 @@
 	desc = "Ages 8 and up approved vendor that dispenses toys."
 	icon_state = "nt-donk"
 	panel_type = "panel18"
-	product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!"
-	product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!"
-	vend_reply = "Come back for more!"
+	product_slogans = "Получите свои крутые игрушки уже сегодня!;Легализируйте охоту уже сегодня!;Качественное игрушечное оружие по низким ценам!;Отдайте их ГП за полный доступ!;Отдайте их ХоСу, чтобы вас отправили в перму!"
+	product_ads = "Почувствуй себя робастом с нашими игрушками!;Вернитесь в детство уже сегодня!;Игрушечное оружие не убивает, но вы можете попробовать!;Кому нужна ответственность, когда есть игрушечное оружие?;Сделайте своё следующее убийство ВЕСЕЛЫМ!"
+	vend_reply = "Возвращайтесь за добавкой!"
 	light_mask = "donksoft-light-mask"
 	circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor
 	products = list(
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 3f82a219e56c9..3b962490347a3 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -50,10 +50,11 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
 		/obj/item/clothing/under/rank/security/officer/grey = 3,
 		/obj/item/clothing/under/pants/slacks = 3,
 		/obj/item/clothing/under/rank/security/officer/blueshirt = 3,
+		/obj/item/clothing/gloves/color/black/security/blu = 3,
 		/obj/item/clothing/suit/armor/vest/secjacket = 3,
 		/obj/item/clothing/suit/hooded/wintercoat/security = 3,
 		/obj/item/clothing/suit/armor/vest = 3,
-		/obj/item/clothing/gloves/color/black = 3,
+		/obj/item/clothing/gloves/color/black/security = 3,
 		/obj/item/clothing/shoes/jackboots/sec = 3,
 		/obj/item/storage/backpack/security = 3,
 		/obj/item/storage/backpack/satchel/sec = 3,
@@ -183,12 +184,14 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
 		/obj/item/clothing/head/beret/cargo = 3,
 		/obj/item/clothing/mask/bandana/striped/cargo = 3,
 		/obj/item/clothing/head/soft = 3,
+		/obj/item/clothing/head/utility/hardhat/orange = 3,
 		/obj/item/clothing/under/rank/cargo/tech = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skirt = 3,
 		/obj/item/clothing/under/rank/cargo/tech/alt = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skirt/alt = 3,
 		/obj/item/clothing/suit/toggle/cargo_tech = 3,
 		/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
+		/obj/item/clothing/suit/hazardvest = 3,
 		/obj/item/clothing/gloves/fingerless = 3,
 		/obj/item/clothing/shoes/sneakers/black = 3,
 		/obj/item/storage/backpack = 3,
@@ -199,13 +202,13 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
 		/obj/item/storage/bag/mail = 3,
 		/obj/item/radio/headset/headset_cargo = 3,
 		/obj/item/clothing/accessory/pocketprotector = 3,
-		/obj/item/clothing/head/utility/hardhat/orange = 3,
-		/obj/item/clothing/suit/hazardvest = 3,
 	)
 	premium = list(
 		/obj/item/clothing/head/costume/mailman = 1,
 		/obj/item/clothing/under/misc/mailman = 1,
 		/obj/item/clothing/under/rank/cargo/miner = 3,
+		/obj/item/clothing/under/rank/cargo/miner/lavaland = 3,
+		/obj/item/clothing/under/rank/cargo/bitrunner = 3,
 	)
 	refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
 	payment_department = ACCOUNT_CAR
@@ -343,19 +346,18 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
 	product_ads = "Any day above ground is a good one!;My day starts when yours ends!;And they call this a dying business!;See you when you're dead!"
 	vend_reply = "Don't forget your \"Buy one get one free\" burial deal!"
 	products = list(
-		/obj/item/cautery/cruel = 1,
-		/obj/item/clothing/gloves/latex/coroner = 1,
 		/obj/item/clothing/head/utility/surgerycap/black = 1,
 		/obj/item/clothing/mask/surgical = 1,
-		/obj/item/clothing/shoes/sneakers/black = 1,
 		/obj/item/clothing/suit/apron/surgical = 1,
 		/obj/item/clothing/suit/hooded/wintercoat/medical/coroner = 1,
 		/obj/item/clothing/suit/toggle/labcoat/coroner = 1,
 		/obj/item/clothing/under/rank/medical/coroner = 1,
 		/obj/item/clothing/under/rank/medical/coroner/skirt = 1,
 		/obj/item/clothing/under/rank/medical/scrubs/coroner = 1,
+		/obj/item/clothing/shoes/sneakers/black = 1,
+		/obj/item/clothing/gloves/latex/coroner = 1,
+		/obj/item/cautery/cruel = 1,
 		/obj/item/hemostat/cruel = 1,
-		/obj/item/radio/headset/headset_srvmed = 2,
 		/obj/item/retractor/cruel = 1,
 		/obj/item/scalpel/cruel = 1,
 		/obj/item/storage/backpack/coroner = 1,
@@ -363,6 +365,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
 		/obj/item/storage/backpack/messenger/coroner = 1,
 		/obj/item/storage/backpack/satchel/coroner = 1,
 		/obj/item/storage/box/bodybags = 3,
+		/obj/item/radio/headset/headset_srvmed = 2,
 		/obj/item/toy/crayon/white = 2,
 	)
 	contraband = list(
diff --git a/config/bandastation/bandastation_config.txt b/config/bandastation/bandastation_config.txt
index de1681f429ba1..2925f6c37cb00 100644
--- a/config/bandastation/bandastation_config.txt
+++ b/config/bandastation/bandastation_config.txt
@@ -5,3 +5,8 @@
 #TTS_API_URL_SILERO
 
 #WHITELIST220
+
+## A minimum amount of security required on roundstart
+## If there is less security than this value, a percent of roundstart threat will be pushed to midround
+## Example: with value of 5, if there is 2 security members out of 5, then 3/5 of roundstart threat will be moved to midround
+#ROUNDSTART_SECURITY_FOR_THREAT 5
diff --git a/config/game_options.txt b/config/game_options.txt
index 28a50266ff814..0f3ba8e9e801b 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -99,6 +99,11 @@ TRAITOR_SCALING_COEFF 6
 BROTHER_SCALING_COEFF 6
 CHANGELING_SCALING_COEFF 6
 
+## Global scaling for traitor progression.
+## Higher values will accelerate traitor progression, while lower values will decrease it.
+## Bypasses an upper limit of 1 MINUTE
+#TRAITOR_SCALING_MULTIPLIER 1
+
 ## Variables calculate how number of open security officer positions will scale to population.
 ## Used as (Officers = Population / Coeff)
 ## Set to 0 to disable scaling and use default numbers instead.
@@ -179,6 +184,10 @@ ROUNDSTART_AWAY
 ## 600 is one minute.
 GATEWAY_DELAY 18000
 
+## Overrides to gateway delay for specific away mission start points.
+GATEWAY_DELAYS_BY_ID AWAYSTART_BEACH 6000
+GATEWAY_DELAYS_BY_ID AWAYSTART_MUSEUM 9000
+
 ## The probability of the gateway mission being a config one
 CONFIG_GATEWAY_CHANCE 0
 
@@ -249,7 +258,7 @@ DEFAULT_LAWS 4
 ## See datums\ai_laws.dm for the full law lists
 ## IE, SPECIFIED_LAWS asimovpp, SPECIFIED_LAWS robocop, SPECIFIED_LAWS antimov
 
-SPECIFIED_LAWS nt_default
+SPECIFIED_LAWS crewsimovpp
 
 ## RANDOM LAWS ##
 ## ------------------------------------------------------------------------------------------
@@ -263,6 +272,7 @@ RANDOM_LAWS paladin
 RANDOM_LAWS robocop
 RANDOM_LAWS corporate
 RANDOM_LAWS nt_default
+RANDOM_LAWS crewsimovpp
 
 ## Quirky laws. Shouldn't cause too much harm
 #RANDOM_LAWS hippocratic
@@ -544,4 +554,4 @@ MAX_POSITIVE_QUIRKS 6
 # A config that skews with the random spawners weights
 # If the value is lower than 1, it'll tend to even out the odds
 # If higher than 1, it'll lean toward common spawns even more.
-RANDOM_LOOT_WEIGHT_MODIFIER 1
\ No newline at end of file
+RANDOM_LOOT_WEIGHT_MODIFIER 1
diff --git a/config/spaceruinblacklist.txt b/config/spaceruinblacklist.txt
index c33d85b54abc9..f2ff777c1c07f 100644
--- a/config/spaceruinblacklist.txt
+++ b/config/spaceruinblacklist.txt
@@ -44,6 +44,7 @@
 #_maps/RandomRuins/SpaceRuins/garbagetruck3.dmm
 #_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
 #_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm
+#_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
 #_maps/RandomRuins/SpaceRuins/hellfactory.dmm
 #_maps/RandomRuins/SpaceRuins/hilbertsresearchfacility.dmm
 #_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
diff --git a/cutter_templates/bitmask/cardinal_32x32.toml b/cutter_templates/bitmask/cardinal_32x32.toml
index 9d3d4097e78ce..987e9126b2d8b 100644
--- a/cutter_templates/bitmask/cardinal_32x32.toml
+++ b/cutter_templates/bitmask/cardinal_32x32.toml
@@ -10,7 +10,7 @@ smooth_diagonally = false
 x = 32
 y = 32
 
-# Output our stuff at the same level as it's input
+# Output our stuff at the same level as its input
 [output_icon_pos]
 x = 0
 y = 0
diff --git a/dependencies.sh b/dependencies.sh
index 772ff347f5e1f..60753e1411c8d 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -22,11 +22,11 @@ export SPACEMAN_DMM_VERSION=suite-1.8
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.9.0
 
-#auxlua repo
-export AUXLUA_REPO=tgstation/auxlua
+#dreamluau repo
+export DREAMLUAU_REPO="tgstation/dreamluau"
 
-#auxlua git tag
-export AUXLUA_VERSION=1.4.4
+#dreamluau git tag
+export DREAMLUAU_VERSION=0.1.0
 
 #hypnagogic repo
 export CUTTER_REPO=spacestation13/hypnagogic
diff --git a/dreamluau.dll b/dreamluau.dll
new file mode 100644
index 0000000000000..7d49f0742d8f8
Binary files /dev/null and b/dreamluau.dll differ
diff --git a/html/changelogs/AutoChangeLog-pr-84697.yml b/html/changelogs/AutoChangeLog-pr-84697.yml
deleted file mode 100644
index 86f6b12f9626a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84697.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EuSouAFazer"
-delete-after: True
-changes:
-  - rscadd: "Cytology Lab has been added to Icebox"
-  - rscadd: "Delta now has soy seeds on the Cytology Lab"
-  - bugfix: "Cytology is playable again on Icebox"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84897.yml b/html/changelogs/AutoChangeLog-pr-84897.yml
deleted file mode 100644
index dada0c150bcbe..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84897.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "carlarctg"
-delete-after: True
-changes:
-  - bugfix: "Fixed new charger power not working fior strange objects"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85443.yml b/html/changelogs/AutoChangeLog-pr-85443.yml
new file mode 100644
index 0000000000000..e3459099c07d1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85443.yml
@@ -0,0 +1,5 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+  - bugfix: "Bamboo staves can now be wielded"
+  - bugfix: "Bostaff no longer disappears forever when wielded"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85445.yml b/html/changelogs/AutoChangeLog-pr-85445.yml
new file mode 100644
index 0000000000000..918cfdb676eb6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85445.yml
@@ -0,0 +1,4 @@
+author: "FlufflesTheDog"
+delete-after: True
+changes:
+  - bugfix: "Existing gas flow meters have been recalled and replaced due to a faulty screen connection, and once again convey pressure and temperature"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85448.yml b/html/changelogs/AutoChangeLog-pr-85448.yml
new file mode 100644
index 0000000000000..270d19314e31a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85448.yml
@@ -0,0 +1,4 @@
+author: "carlarctg"
+delete-after: True
+changes:
+  - rscadd: "Adds a bronze dimensional theme"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85454.yml b/html/changelogs/AutoChangeLog-pr-85454.yml
new file mode 100644
index 0000000000000..f6b0ce36ed377
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85454.yml
@@ -0,0 +1,4 @@
+author: "Majkl-J"
+delete-after: True
+changes:
+  - bugfix: "Flashdarks now broduce darkness upon toggling"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85457.yml b/html/changelogs/AutoChangeLog-pr-85457.yml
new file mode 100644
index 0000000000000..9fdd6e881a532
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85457.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+  - bugfix: "Rice hat no longer disappears upon being toggled and can be raised back up. Toggling sprites is now done by alt-clicking"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-85462.yml b/html/changelogs/AutoChangeLog-pr-85462.yml
new file mode 100644
index 0000000000000..2f30fe9f45dba
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-85462.yml
@@ -0,0 +1,4 @@
+author: "Jacquerel"
+delete-after: True
+changes:
+  - admin: "Adds some missing traits to the mob trait list in VV"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
index 6bfb5de9c300e..632d897df753a 100644
--- a/html/changelogs/archive/2024-07.yml
+++ b/html/changelogs/archive/2024-07.yml
@@ -786,3 +786,722 @@
   vinylspiders:
   - bugfix: password doors and shutters will now play their sound effects again instead
       of just silently opening/closing
+2024-07-14:
+  EuSouAFazer:
+  - rscadd: Cytology Lab has been added to Icebox
+  - rscadd: Delta now has soy seeds on the Cytology Lab
+  - bugfix: Cytology is playable again on Icebox
+  MTandi:
+  - rscadd: Added airlock pump atmos device to create cycling airlocks
+  carlarctg:
+  - bugfix: Fixed new charger power not working fior strange objects
+2024-07-15:
+  Thedragmeme:
+  - bugfix: Fixes the Plague hat having what the Plague mask should have
+2024-07-16:
+  00-Steven:
+  - rscadd: Love is now stored in the heart.
+  - balance: Characters with the Friendly quirk now have physically bigger hearts.
+  Ben10Omintrix:
+  - bugfix: mothroaches will no longer be crawling out of bags every minute
+  FearfulFurnishing:
+  - bugfix: fixing speech modifiers being applied to a tongue's native languages.
+  FlufflesTheDog:
+  - bugfix: Attachment points on toolset implants have been improved, to prevent against
+      recycler related decouplings.
+  GPeckman:
+  - bugfix: You can't attach guns/drills/etc. to the Justice traitor mech anymore.
+  Ghommie:
+  - balance: Grinding fish no longer gives you uselessly high amount of blood and
+      gibs (unless they're very big)
+  - balance: tweaked the Linked Closets station trait.
+  - rscadd: Megaphones now affect text-to-speech.
+  - rscadd: Examining high-value paintings now can give a positive moodlet.
+  - qol: Observers can now zoom paintings in and out in the UI.
+  - bugfix: ACTUALLY fixed hoverboards being able to be used in space.
+  - balance: However, you can soar space with the holy skateboard. at a slower speed.
+  - qol: removed a redundant, annoying reach check that prevents casting a fishing
+      rod before the projectile is generated.
+  - qol: You can now unhook the currently hooked item of a fishing rod with right-click.
+  - balance: reduced the prices of some blackmarket items across the board.
+  - balance: the thermite bottle (from the contraband spawner and the blackmarket),
+      now spawns with 50u of thermite vs 30, enough to melt one reinforced wall.
+  - rscadd: Replaced the science googles from the blackmarket with a security + health
+      scanner HUD.
+  - rscadd: Replaced the single shotgun dart from the blackmarket with a box of XL
+      shotgun darts.
+  - rscadd: The donk pocket box from the blackmarket now comes in different flavors.
+  Hardly3D:
+  - bugfix: Added a preview assistant outfit, allowing assistant jumpskirts to be
+      previewed again on character preferences.
+  MTandi:
+  - qol: Research nodes can be queued, one per player. RDs can place their node at
+      the beginning of the queue.
+  Melbert:
+  - qol: Lattices now make the same footstep sound as catwalks
+  - qol: If you're in oxycrit (>50 oxy damage) or otherwise made unconscious through
+      other means, blood loss will only kill you if you're *actually* missing a lethal
+      amount of blood.
+  MrDas:
+  - bugfix: Clown operative reinforcements' uplink no longer break the syndicates'
+      economy by creating TC from nothingness.
+  Profakos:
+  - bugfix: Fixes dead raptors getting excited when petted or groomed
+  Sadboysuss:
+  - sound: all materials now have a sound for picking up and dropping
+  - code_imp: items now have pitch vary sound support for dropping and picking up
+      items
+  - bugfix: Wawastation xenobio is no longer filled with BZ
+  SmArtKar:
+  - admin: Ghosts can no longer create deathmatch lobbies or join existing ones when
+      admins disable minigames
+  - admin: Outfit manager UI no longer harddels after closing and thus is usable more
+      than once
+  - qol: Pathfinder MODule can now be triggered while wearing the MODsuit to implant
+      yourself without having to pull it out of the suit.
+  - spellcheck: Firelocks no longer output their full name in their balloon alert.
+  - spellcheck: Failure message when a xenomorph tries to force open a welded firelock
+      is now a balloon alert.
+  - bugfix: You can no longer fit an infinite amount of drivers into a clown car -
+      making spy-acquired clown cars usable!
+  - bugfix: Accelerator cannon projectiles no longer grow to absurd sizes after a
+      bit of travel.
+  - bugfix: Fixes overwatch glasses not adding HUDs
+  TheBoondock:
+  - sound: added pickup, dropping and opening sound for pill bottle
+  Xackii:
+  - rscadd: new wizard spells category - perks.
+  - rscadd: adds 9 wizard perks.
+  itseasytosee:
+  - image: Changed some default options in the character creator.
+  larentoun:
+  - bugfix: Correct emote plays when a human scream. Should have sound now.
+  lizardqueenlexi:
+  - bugfix: The Icebox ordnance lab is now once again a habitable temperature.
+  - bugfix: Icebox cytology now has cameras in it.
+  - bugfix: Atmosphere can no longer flow through closed necropolis gates.
+  - bugfix: You can no longer cause a bluescreen by attempting to recolor non-recolorable
+      loadout items.
+  necromanceranne:
+  - rscadd: Pipe pistols now magdump their entire magazine when fired.
+  - rscadd: Pipeguns and their subtypes have a knockback effect.
+  - bugfix: Pipe pistols cannot be bayoneted, as intended.
+  - bugfix: Junk rounds now actually do their extra damage effects against certain
+      mob types. Borgs across the Spinward tremble at the knowledge that these junk
+      weapons can obliterate them with ease.
+  paganiy:
+  - rscadd: If you can't shoot a gun, then... JUST TOSS IT AT THEM (for 0.5 seconds
+      of knockdown and 10-20 an additional brute damage)
+  r3dj4ck0424:
+  - bugfix: Destroying the jungle grass tiles in Tramstation's science wing should
+      no longer open a chasm.
+2024-07-17:
+  00-Steven:
+  - rscadd: Having a robotic voicebox installed now lets you use silicon emotes.
+  - balance: MMI'd brains/posibrains can now use silicon emotes.
+  - balance: Simple and basic bots can actually beep.
+  - bugfix: MMI'd brains/posibrains are no longer both allowed AND blocked from beeping,
+      now just being allowed to beep.
+  JohnFulpWillard:
+  - balance: Human AIs no longer have a teleport blocking implant or borg costume,
+      but now has a portable crew monitor.
+  Melbert:
+  - bugfix: Using hulk (and a myriad of similar effects) now properly updates your
+      movespeed to ignore the damage movespeed penalty
+  - bugfix: Some things which temporarily make you fly don't make you fly forever
+  - bugfix: MODsuit ball module now properly makes you immune to damage movespeed
+      penalty when in ball form
+  - bugfix: Adding Hulk via VV dropdown doesn't default to adding the strongest hulk
+      available (that which is used by the medieval pirates)
+  SmArtKar:
+  - bugfix: Ghosts can no longer move chairs
+  - bugfix: You can attack bookshelves in a variety of states once more
+  - bugfix: Style meter text is no longer blurry and doesnt overlap with UI anymore.
+  - qol: You can fire PKAs/plasma cutters point blank at turfs.
+  Thedragmeme:
+  - qol: re-maps the raptor barn to not stick out like a sore thumb
+  - bugfix: Miners and the public both can access the raptor barn without having to
+      make a bridge themselves
+2024-07-18:
+  Artemchik542:
+  - bugfix: Justice mech invisibility fix
+  Ben10Omintrix:
+  - bugfix: fixes sentient firebots mauling things from a distance
+  DATA-xPUNGED:
+  - bugfix: Plague Doctor Mask can now be used with internals again, and is no longer
+      unintentionally pepperproof.
+  DeltaFire15:
+  - bugfix: cold- & heat protection no longer have decimal precision issues.
+  MTandi:
+  - bugfix: Fixed emitters, shield gens and other wired machinery having lower power
+      consumption priority than APCs
+  - qol: Made APCs charge more evenly to ensure that environment and lights are working
+      everywhere before giving the power for equipment
+  NewyearnewmeUwu:
+  - image: the smoking pipe east/west sprites are now more consistent
+  Pickle-Coding:
+  - bugfix: Fixes space heater cell relative consumption inadvertently being changed
+      from the introduction of megacells.
+  - qol: The improvised chemical heater gives a more accurate description of its heating
+      power on examine.
+  - qol: Improved feedback when attempting to turn on a space heater that is lacking
+      a cell, has no charge or is broken.
+  - code_imp: Space heater relative cell consumption is consistent regardless of the
+      cell charge scale.
+  Rhials:
+  - bugfix: Xenos have a "resist" ui element now. Cool!
+  Sadboysuss:
+  - bugfix: added a missing cable to Wawastation perma
+  SmArtKar:
+  - bugfix: Fixes hulks being able to activate dualsabers despite not being able to
+      actually do anything with them
+  - qol: Ghost orbit menu now always displays person's real name and their roundstart
+      job and cannot be fooled by disguises.
+  - qol: You can properly aim mining bombs at turfs now
+  - bugfix: Point blank piercing shots no longer fly directly north after hitting
+      their intended target
+  - qol: Stopping orbiting now automatically breaks you out of autoobserve
+  SmArtKar, Kapu:
+  - balance: Projectiles now can hit border objects on other turfs instead of passing
+      through them
+  SyncIt21:
+  - bugfix: fixes runtime in storage datums when hiding the ui
+  - bugfix: you can insert the withdrawal beaker into the portable chem mixer when
+      locked
+  - bugfix: acid/base buffers should update your target & source holder
+  - bugfix: remove reagent operations won't trigger excessive workload
+  - bugfix: borgs can't put their integrated tools into the reagent grinder
+  Yobrocharlie:
+  - bugfix: Removed bitrunning beach brawl fax machine
+  afonamos2:
+  - bugfix: malf ai voice changer no longer accepts dangerous inputs
+  grungussuss:
+  - rscadd: You can now buckle to bar stools
+  grungususs:
+  - spellcheck: fixed a typo for carrot sword description
+  imedial:
+  - rscadd: standing on a closed crate now gives loud mode
+  - spellcheck: fixed a typo in borg research
+  larentoun:
+  - bugfix: Free items in research queue will now correctly be researched automatically.
+  norsvenska:
+  - spellcheck: Removed an unnecessary apostrophe in DeltaStation's genetics monkey
+      pen door.
+  xXPawnStarrXx:
+  - qol: made fish better quality when butchered, smushy koibeans and useable gunner
+      jellyfish.
+  zoomachina:
+  - bugfix: deleting reagents from the chemmaster buffer works without a beaker inserted
+2024-07-19:
+  Ghommie:
+  - bugfix: Fixed beyblade *flipping.
+  Kocma-san:
+  - bugfix: fixed a table in the mining office at the metastation
+  L0pz:
+  - image: Added new unique sprites for cyborg upgrade modules
+  MTandi:
+  - bugfix: APC icon properly turns green on full charge
+  - bugfix: APC shows correct charging rate in UI
+  - code_imp: Added early machine process for shield generators and emitters to prioritize
+      power draw
+  - code_imp: Added late machine process for power monitors to gather accurate powernet
+      load
+  Melbert:
+  - qol: Monkeys that pray are given bonana
+  - bugfix: When Monkified or Humanified, you are no longer knocked down.
+  - bugfix: When cured of Monkified, you get the cure text now.
+  - bugfix: The text shown when cured / given Monkification now has color.
+  - bugfix: Being humanified now tells you what species you become rather than assuming
+      you are a human.
+  - bugfix: Fixes xenos being able to do that one mechanic that involves mouse-dragging
+      people to you
+  - bugfix: Non-humans should look less transparent while in space
+  Momo8289:
+  - qol: Tweaked the colour of orange atmos pipes to be more distinct from the red
+      pipes, especially in darkness.
+  SmArtKar:
+  - bugfix: Revenge of the Pun Pun no longer runtimes on init
+  - bugfix: Fixed kinesis runtime due to un-unregistered signals
+  - bugfix: Removed some rogue decals and added a wall to Birdshot atmos storage,
+      and added cycling to upload/telecommunication entrances.
+  - bugfix: Elevator music no longer haunts you endlessly if you step off mid-transit
+  - refactor: HUD traits now apply their corresponding hud automatically
+  TheNobodyofimportance:
+  - qol: Holofan and two thermomachine and emitter boards in lavaland syndicate base.
+  carlarctg:
+  - qol: Moths that pray get a moffin
+  - bugfix: Fixed sometimes obtaining the nodrop highlander kilt with relics
+  - bugfix: Fixed bioscramble function not working for strange objects unless dropped
+  - bugfix: Fixed the disguiser cardboard ID not overlaying properly
+  kawaiinick:
+  - qol: secmods jetpacks are now pinned by default
+  vinylspiders:
+  - bugfix: fixed a hard del with soapboxes
+2024-07-20:
+  AyIong:
+  - bugfix: Announcement subheader will no longer overlap the header if the second
+      one is very long
+  DrDiasyl aka DrTuxedo:
+  - rscadd: Security and Engineering holosigns can now be opened with their projector
+      by clicking them from afar
+  - rscadd: SecVendor starts with 2 Security holosigns
+  - qol: Holosigns don't block projectiles anymore
+  - qol: Security holosigns now take 2 seconds to create instead of 3
+  - image: Janitor, Security, Medical, and Engineering holosigns now have cleaner
+      sprites
+  - code_imp: Holosigns now use proper cooldowns instead of the world.time
+  - spellcheck: Holosigns and holosign creators' descriptions give more information
+      now
+  GPeckman:
+  - rscadd: Added the civilian modsuit module as a standalone model. It offers no
+      slowdown while activated but does NOT protect you from the void of space. You
+      can print the plating from an exosuit fabricator and build it like a normal
+      modsuit.
+  - rscdel: Removed the civilian skin from the standard modsuit, as it is now a standalone
+      model.
+  - image: Tweaked the sprites for the civilian modsuit head, both in-hand and on
+      the mob. Also added a civilian mod plating sprite.
+  Ghommie:
+  - bugfix: fixed megaphone tts filter.
+  MTandi:
+  - image: New deep fryer sprite
+  SmArtKar:
+  - refactor: Refactored parrying to be projectile-side and not user-side.
+  - rscadd: You can now parry crusher projectiles to give them some more range, add
+      damage and make the mark always count as a backstab.
+  - rscadd: Projectile parrying has been significantly improved, making parrying and
+      boosting projectiles actually possible. Includes a small grace period as lag
+      compensation for players with higher pings.
+  - balance: Crusher marks can now be detonated by any crusher, not only the one that
+      applied it, as to incentivise coop mining for crusher users.
+  - balance: Projectile boosting now gives a significantly bigger damage and speed
+      increase
+  - bugfix: Fixed a signal reg error caused by add_occupant being called twice
+  - bugfix: Sentient floorbots can now rip up tiles when emagged
+  - code_imp: Slight cleanup in floorbot code
+  - image: Brainwashing victims now have smoothed out brain sprites without those
+      pesky wrinkles
+  - bugfix: Blob victory no longer spams spore zombie notifications to ghosts
+  paganiy:
+  - qol: Moving the light bulb removal function from the left mouse button to the
+      right one.
+  - qol: Added & improved tips related to the light fixture
+  san7890:
+  - admin: Ticking "Job Playtime Exempt" on a player's Job Playtime Tracker panel
+      will also exempt them from BYOND Account Age restrictions now. It previously
+      only exempted them from actual living playtime minutes - this is for the BYOND
+      Account Age in days.
+  thegrb93:
+  - qol: Allow custom borg hat placement for custom borg skins
+  theselfish:
+  - rscadd: Bitrunning and (spawn) Miner jumpsuits are now in their drobe.
+  - qol: The Coroner Drobe got sorted into less 'shove everything in' and more 'in
+      a sane format'.
+  zoomachina:
+  - qol: chem dispenser displays units instead of kilowatts
+2024-07-21:
+  DrDiasyl aka DrTuxedo:
+  - rscadd: Scanner gates now blare into the chat the reason why it got triggered
+  - rscadd: Scanner gates now can have false positives/negatives, and the chance of
+      them being reduced when they are upgraded
+  - rscadd: Brig entrances now have scanner gates preset to detect GUNS
+  - rscadd: You can now scan people with N-Spector for contraband
+  - image: Scanner gates now have a better sprite with dirs
+  - qol: Scanner gates description now tells to what mode they are set
+  - bugfix: You no longer can remove N-Spector from scanner gates without unlocking
+      them first
+  Inari-Whitebear:
+  - spellcheck: Fixed a typo in the description for the Syndicate Rebar Crossbow in
+      the Uplink.
+  MTandi:
+  - qol: Mod UI is narrow again
+  Melbert:
+  - bugfix: Fixed roundstart monkeys not having monkified
+  - bugfix: Fixed being "de-monkified" while dead making it difficult to actually
+      de-monkey you going forward
+  - bugfix: Fixed genetic scanner showing dead mobs as "transforming"
+  SmArtKar:
+  - bugfix: Closing mind transfer popup does not transfer your mind anymore
+  - bugfix: Recalling lantern wisp now properly removes its effects from you
+  - bugfix: Context maptext now properly dynamically adjusts itself instead of using
+      hardcoded pixel values
+  - bugfix: Fixes organizer sometimes deleting brains
+  Time-Green:
+  - rscadd: Gives voidwalker telepathy
+  - bugfix: Fixes the Unsettle ability ignoring line of sight (which was it's sole
+      gimmick, im just dumb)
+  - balance: Voidwalkers cannot break windows anymore or throw objects
+  - balance: Voidwalkers can no longer harm people in crit
+  - balance: Voidwalkers can only pull mobs
+  - balance: Voidwalkers' space dive enter has been increased by 1 seconds, but dive
+      exit decreased by 1 second
+  - balance: Void eater becomes blunt during use. Kidnap people to refresh it
+  - balance: Removes voidwalker glasses slot
+  - balance: Gives voidwalkers chunky fingers
+  - balance: Voidwalker applies NODEATH on hit
+  - balance: Voided victims get dumped in safer places
+  carlarctg:
+  - bugfix: Fixed null description in cerulean regenerative extract
+2024-07-22:
+  00-Steven:
+  - refactor: Refactored table item interactions, please report any issues.
+  - bugfix: Fixed being unable to use decks to draw cards directly onto tables.
+  - qol: Right clicking a table with a tray puts it down regardless of it having contents.
+  Ical92:
+  - bugfix: general bitrunning fixes and 102% faster loading times
+  - bugfix: bitrunning domains are no longer affected by nebulas in the real world
+  Jackriip:
+  - refactor: refactored global set_basalt_light proc into object proc
+  JoshAdamPowell:
+  - admin: 'Nanotrasen has brought Central Command kicking and screaming into the
+      20th Century by providing them with a real fax machine.
+
+      :cl:'
+  MTandi:
+  - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps'
+  - qol: Updated smart fridge UI
+  Melbert:
+  - rscadd: Fox infusion has more content related to it now
+  - refactor: Refactored how vending machine icons are displayed, please report if
+      you see any broken icons. Also if all the icons look like missing file icons
+      for you, you gotta update byond man, you're like a year out of date.
+  SmArtKar:
+  - refactor: Pod code now uses datums instead of being a huge nested list
+  - qol: Self-respiration no longer sends misleading messages and instead tells about
+      lack of need to breathe once it actually gives you the effect
+  Thedragmeme:
+  - image: Adds a series of traditional yukata's and kimono's
+  - image: Adds in black sandals and a traditional hairpin for the back of the hair
+  carlarctg:
+  - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie
+      jackboots, summon shoes to untie, and become completely silent!
+  - spellcheck: Renamed the Crimson Focus to the Crimson Medallion
+  - bugfix: Fixed harvesters not being properly bound to their master, nor dying when
+      they do
+  - bugfix: Fixed heads totally overriding cultist sacrifice rewards
+  - rscadd: Heretic blade now converts to a nullblade
+  - rscadd: Added wooshing, shaking, and glowing to flinging around with the heretic
+      blade
+  - balance: Removed the probability to not gain a reward when sacrificing a cultist
+  - bugfix: HONK mech now waddles
+  necromanceranne:
+  - qol: There is a larger stock of roundstart clothing availalbe in the clothing
+      vendors. Now you can get your entire gang in matching outfits!
+2024-07-23:
+  AyIong:
+  - qol: Chat notifications are now at the top
+  Ben10Omintrix:
+  - refactor: mulebot UI has been refactored
+  Ghommie:
+  - bugfix: Fixes fishing rods not working on adjacent targets.
+  - rscadd: You can now fish with explosives.
+  - bugfix: Fixed an inconsistency with examining fishing spots with sufficiently
+      high fishing skill (or skillchip).
+  Holoo-1:
+  - bugfix: fixed ghost huds
+  MTandi:
+  - rscadd: Dehydrator, a machine version of drying rack, with a circuit board and
+      available on some kitchens roundstart.
+  - image: Updated the color palette of Smart Fridge
+  SmArtKar:
+  - code_imp: Removed 8 cases of double indentation
+  - bugfix: Holopads no longer suck in unsuspecting people when crowbared
+  - bugfix: Surgical tape and edagger's embedding values have been fixed
+  Time-Green:
+  - bugfix: Shuttle events meteors now dont sometimes kill everyone
+  necromanceranne:
+  - rscadd: Robotic variants of many of the standard and advanced humanoid surgeries.
+      You cannot perform self surgery with these surgeries.
+  - balance: It is easier to do robotic surgeries with normal surgery tools.
+  - qol: It is now possible to detect EMP organ failure cascades via health scanners.
+  - qol: EMP organ failure cascades can be reversed by doing organ repair surgeries
+      targeting the failing organ.
+2024-07-24:
+  AyIong:
+  - qol: Photocopier updated their UI
+  Ben10Omintrix:
+  - qol: fish analyzers now have a UI
+  DaCoolBoss:
+  - rscadd: Adds the Haunted Trading Post space ruin.
+  - rscadd: Adds 10+ unique items for the Haunted Trading Post
+  - rscadd: Adds 5 dangerous mobs for the Haunted Trading Post
+  - rscadd: Adds 4 new types of hazardous traps for the Haunted Trading Post.
+  FeenieRU:
+  - qol: Now IDs and PDAs have money-reader module for picking some cash into your
+      bank by swiping on money.
+  Ghommie:
+  - rscadd: You can raise lobstrosities from chasm chrabs inside an aquarium with
+      the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely
+      if you don't want an hostile one.
+  - rscadd: Juveline lobstrosities (from chasms, plasma rivers, or aquariums, xenobio
+      too) can be tamed with arms and lavaloop fishes.
+  - rscadd: For lobstrosities grown from aquariums, they can have additional effects
+      based on the fish traits they had in the aquarium, like being venomous or even
+      flying.
+  Jacquerel, Kok0nut, Imaginos:
+  - image: Wall-mounted and Table-mounted ID card authorisation machines now use different
+      sprites
+  - bugfix: Wall-mounted ID card authorisation devices will now be destroyed if their
+      wall is destroyed
+  Majkl-J:
+  - bugfix: fixes bitrunning breaking upon repeatedly climbing in and out the pod
+  Paxilmaniac:
+  - bugfix: Fixes bulldog shotgun unique mag display not working on the sprite
+  - image: resprites the bulldog shotgun along with inhands and new worn sprites
+  - code_imp: cleans up a little of the code surrounding the bulldog
+  SmArtKar:
+  - bugfix: Stacking machine consoles link to machinery now
+  - bugfix: You can now put dead mice into mortars/grinders properly
+  - balance: Mechs now take armor into consideration when calculating punch damage
+  - bugfix: Mechs no longer deal direct limb damage
+  - bugfix: Drills automatically pick up ore on non-ripley mechs now without having
+      to move
+  - bugfix: Drills no longer dismember people immune to melee damage
+  - bugfix: Drills now take armor from correct bodyparts when attacking
+  - code_imp: Cleaned up one-letter variables in mech drill code
+  - bugfix: You can no longer microwave kisses, slappers, and other abstract items
+  - bugfix: Having your liver fail no longer keeps drug traits active without metabolizing
+      them
+  - code_imp: Cleaned up clamp code.
+  - bugfix: Clamp no longer anchors down some objects upon failing to pick them up
+  - bugfix: Deathsquad KILL CLAMP finally works once more
+  - bugfix: Fixes Hereditary Manifold Sickness's 4th stage not updating health when
+      it should
+  - bugfix: You can no longer dupe metal by breaking walls under small light fixtures
+  Time-Green:
+  - bugfix: Animal/people skin is no longer metallic sounding
+  larentoun:
+  - config: Added an entry for TRAITOR_SCALING_MULTIPLIER, disabled by default
+  nikothedude:
+  - bugfix: Alexander no longer causes harddels
+  - bugfix: Removed a theoretical infinite block exploit from alexander
+2024-07-25:
+  Ghommie:
+  - bugfix: Fixed fishing.
+  MTandi:
+  - bugfix: Borgs and AI can now use research queue
+  Vekter:
+  - spellcheck: Reworded Voidwalker's objectives to be more descriptive of their actual
+      goals as opposed to just fluff.
+  necromanceranne:
+  - balance: Strong-arm implants go on cooldown when activated, but deal more overall
+      lethal damage on a single blow.
+  - balance: The strong-arm implant does additional damage to fauna and some other
+      dangerous mobs.
+  - qol: You can pair toolset arm implants with the strong-arm implants.
+  - balance: Quality cybernetic hearts combat bleeds and restore blood, rather than
+      inject you with epinephrine when you enter crit. This can result in mild toxin
+      buildup, however.
+  - balance: Upgraded cybernetic hearts give an extremely brief amount of action when
+      you enter softcrit (but not hardcrit).
+  - bugfix: Restores some of the items accidentally lost in the autodrobe.
+2024-07-26:
+  LT3:
+  - bugfix: Fixed elevator panel allowing conflicting inputs
+  - bugfix: Fixed elevator sound being out of sync with movement
+  SmArtKar:
+  - bugfix: Xenomorphs and door pryer basic mobs can now attack airlocks in combat
+      mode
+  - bugfix: Borgs now unequip their equipment upon module change like they should
+  YesterdaysPromise:
+  - rscadd: All the melons are now sliceable, and have inhands, instead of just watermelon
+      and holymelon respectively.
+  - rscadd: You can now hollow out melons of all kinds with a spoon to make helmets
+      or chestplates, based on the potency! If you are unlucky, you can tie up three
+      helmets into a chestplate with durathread using the crafting menu.
+  - rscadd: You can now make a bo staff out of bamboo and steelcap logs.
+  - rscadd: You can now make a moonflower buckler out of moonflowers and steelcap
+      logs.
+  - rscadd: You can also hollow out chantarelle to make mock-up wizard hat.
+  - rscadd: Parsnips, as mutation of carrots, become equaly able to be sharpaned,
+      turning into shivs, or with potency and luck, sabres.
+  - rscadd: You can now craft a durathread robe, and customize it into different variants
+      using specific plants in crafting menu.
+  - rscadd: Carrots gain a new possible mutation; cahn'root, brewable into root beer
+      and sharpanable into shivs or daggers!
+  - rscadd: Rice hat, made from bamboo, now has an alternative style, allowing you
+      to wear it in reverse and be much cooler.
+  - rscadd: Two new arrow variants appear in the crafting menu; sticky and poisonous
+      ones! If you want to make arrows at all though, remember to order bow-maker's
+      crate at cargo.
+2024-07-27:
+  00-Steven:
+  - bugfix: Fixes borgs not being able to place apparatus-held items on tables. As
+      a side-effect, they can now combat mode right click splash containers as normal
+      instead of having their own right-click floor splash.
+  Ghommie:
+  - bugfix: Centcom technicians have been trained to recognize cargo-bought fish.
+      You will no longer be able to trick the economy system by buying fish and sending
+      it right back. Also nerfed fish selling price very slightly.
+  - bugfix: Fixes projectiles facing north if ricocheting, deflected or homing
+  - rscdel: Removed a janky fish bounty
+  - rscadd: introduced exporting fish through cargo.
+  - balance: reduced the average weight of the jumpercable. Conversely, eased up the
+      requirements for the bone fish evolution.
+  Ical92:
+  - bugfix: Tram's Tool Storage now has proper lighting
+  Jacquerel:
+  - balance: If a bluespace cookie fails to teleport you then you will trip over.
+  LT3:
+  - bugfix: Fixed delam counter stuck in window near Ice Box bridge
+  - bugfix: Fixed disease outbreak announcement sometimes missing the disease name
+  - bugfix: False supermatter surge announcements are now identical to real ones
+  - bugfix: Tram will no longer eat its own rails as it travels
+  MTandi:
+  - bugfix: Janicart inserts items into the attached trash bag again (manual and vacuumed)
+  Melbert:
+  - qol: All randomly spawned monkeys (and lizardpeople) will spawn with tails. You
+      can still select to be tailless.
+  - code_imp: Cleaned up some code relating to species features (like tails, markings,
+      etc). Report any oddities
+  SmArtKar:
+  - image: Updated gas flow meter sprites
+  Thlumyn:
+  - bugfix: self-resp viruses don't spam messages as often
+  afonamos2:
+  - bugfix: Firelocks will once again respect fire alarm's thermal sensors being disabled.
+  carlarctg:
+  - bugfix: Fixed possessed blades being broken
+  - code_imp: If testing is enabled everyone is polled in ghost polls.
+  mc-oofert:
+  - bugfix: wawastation ordnance no longer has a light fixture on a window and looks
+      objectively slightly better
+  - bugfix: wawastation engineering water tanks are now highcap
+2024-07-28:
+  00-Steven:
+  - bugfix: Clicking on a table in the lootpanel with an item in-hand tries to place
+      it in the center again.
+  Axidyuwu:
+  - bugfix: now Justice invisibility turns off in non combat mode as it supposed to
+  Deadgebert:
+  - bugfix: peg limbs can now be amputated
+  DrDiasyl aka DrTuxedo:
+  - sound: Hearing and talking into the radio now produces a sound. Heads get a special
+      sound.
+  Helg2:
+  - rscadd: Emergency climbing hooks now spawn in emergency boxes on all of the multi-z
+      level stations.
+  JohnFulpWillard:
+  - bugfix: '[Mafia] The show_help button no longer shows you who the Obsessed''s
+      target is.'
+  LT3:
+  - bugfix: Players now receive a notification when trying to perform surgery steps
+      that involve chemicals
+  Rhials:
+  - bugfix: Monkey wizards can now interact with grand ritual runes.
+  - bugfix: Clown Ops gear has been returned to being available only to clown ops.
+      Whoops!
+  SmArtKar:
+  - bugfix: People with tooltips enabled no longer lag the server when they move their
+      mouse. Oops.
+  - bugfix: Mirage grenade dispensers and ionic jump jets now work
+  StrangeWeirdKitten:
+  - bugfix: Voidwalker should not run on planetary maps.
+  grungussuss:
+  - bugfix: Med sec telescreens are no longer the same item as the CMO telescreen.
+  - spellcheck: correcte name for the CMO telescreen mount
+  - bugfix: birdshot holodeck's lighting has been fixed.
+  - sound: medkits now have sounds
+  - sound: gas tanks now have sound
+  - sound: the default metal sound has been changed
+  - bugfix: lavaland no longer has roundstart atmos processing because of a passive
+      vent
+  - sound: only the scream emote can be heard through walls
+  - sound: the sneeze projectile no longer makes a sound when making contact.
+2024-07-29:
+  DaCoolBoss:
+  - spellcheck: military javelin's name is now fully uncapitalised
+  SmArtKar:
+  - rscadd: Mining headsets now allow you to make callouts via pointing. You can use
+      them to communicate with fellow miners or order your army of bots and raptors!
+  - rscadd: Mining headsets keep your voice loud and clear in low-pressure environments
+      (not vacuum!)
+  - qol: If you have auto fit viewport enabled, it will trigger upon entering or exiting
+      fullscreen
+  - bugfix: VIM no longer requires hands to enter
+  - bugfix: Recyclers no longer recycle contents of indestructible items
+  - bugfix: Grass sheath now holds parsnip sabres like its supposed to
+  - spellcheck: Fixed up parsnip sabre description grammar
+  StrangeWeirdKitten:
+  - rscadd: Cosmic Skull glows purple.
+  Time-Green:
+  - bugfix: Fixes void eater not refreshing
+  - bugfix: Fixes planetary gravity not killing voidwalkers and voideds
+  Y0SH1M4S73R:
+  - admin: Admin lua scripting uses a new library that (probably) will not break when
+      BYOND updates.
+2024-07-30:
+  13spacemen:
+  - balance: TTV bombs can be implanted into people's chest once again
+  AyIong:
+  - rscadd: Stat Panel now scales like a chat, depends on the font size. Defaults
+      from the chat font size, but you can separate it.
+  - refactor: Refactored Stat Panel styles and Byond skin theme applying. Stat Panel
+      now looks more like a TGUI
+  Bisar:
+  - bugfix: All mining mobs now properly listen to the signals sent by attackers and
+      will respond appropriately.
+  Gaxeer:
+  - refactor: replace some copypaste code for pod spawn to use `podspawn` proc instead
+  - code_imp: modify  `podspawn` proc to accept amount of item type to spawn in `spawn`
+      specification
+  Ghommie:
+  - qol: Aquariums start unanchored and don't autoconnect to plumbing. Their reproduction
+      prevention is also disabled by default.
+  - balance: Made it a tad easier to control the bait during the minigame. Buffed
+      the fishing skill. No fishing duds at all when using ANY bait.
+  - balance: Chasm Chrabs take less time to grow into Lobstrosities but need food
+      a bit more frequently.
+  - balance: '"Profound fisher" mobs will have less RNG-dependant time fishing.'
+  - bugfix: You can now ACTUALLY interact with other things while fishing if the fishing
+      rod isn't in your active hand.
+  - config: Added a config for specific gateway delays so locations like the beach
+      and the museum don't have to take 30 minutes to become available like the rest.
+  Jackriip:
+  - refactor: moves the create_all_lighting_objects proc to the lighting subsystem
+  KazooBard:
+  - rscadd: The heretic's ritual of knowledge no longer requires binoculars
+  - rscadd: Clipboards are craftable using a wood plank, an iron rod and wirecutters
+  Paxilmaniac:
+  - balance: The nukeops surplus smg, the pp-95, has been reworked into the Abielle
+      Smart-SMG. It performs nearly identically to the pp-95, however it's projectiles
+      get a slight homing ability towards whatever you click on.
+  - sound: New firing sounds for the surplus smg, credit to the m41 sound effects
+      from tgmc
+  - image: New sprites for the surplus smg, made by me
+  SmArtKar:
+  - bugfix: Fixed mapload circuit floors not drawing power and deconstructing circuit
+      floors not reducing power load
+  - bugfix: Projectile dampener, recycler and ninja stealth MOD modules now work properly
+  - bugfix: You can no longer tear peoples arms off with non-killer clamps
+  - bugfix: Mechs can no longer equip infinite amount of weapons
+  - bugfix: Mining MODsuits now can store everything that explorer suits can
+  Vekter:
+  - bugfix: Fixes an exploit that allowed players to open a Bag of Holding rift in
+      the Heretic dimension.
+  deathrobotpunch:
+  - qol: drones now have soap in their internal storage!
+  grungussuss:
+  - sound: leather, skins and cardboard have their own sound now
+  - bugfix: smuggler satchels will no longer spawn in space
+  - sound: added sniff sounds
+  - sound: added sigh sounds
+  grungussuss and Kayozz:
+  - sound: more maintenance ambience has been added
+  rroqc:
+  - bugfix: plants no longer select reagent genes they already have while cross pollinating
+  - code_imp: 'improves reagent cross pollination code
+
+      :cl:'
+2024-07-31:
+  Jacquerel:
+  - image: Big balls are now much rounder, to more easily slide down into a cannon.
+  SmArtKar:
+  - image: All implants have received a fresh coat of paint
+  rroqc:
+  - bugfix: 'fix a bug where botany reagents would dissapear from existing plants
+
+      :cl:'
+  thegrb93:
+  - bugfix: Fixes getting permanently hot or cold if wearing thermal insulation as
+      a lizard
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
new file mode 100644
index 0000000000000..7b10ef0da9589
--- /dev/null
+++ b/html/changelogs/archive/2024-08.yml
@@ -0,0 +1,101 @@
+2024-08-01:
+  00-Steven:
+  - bugfix: You no longer render on top of tall enough objects that get vertically
+      offset when anchored to a table when standing on the tile directly to the north
+      of them. Examples are soda and booze dispensers.
+  - bugfix: Removing the vertical offset some objects get when anchored to a table
+      can be done by unanchoring it at any point, rather than only on a table.
+  ArcaneMusic:
+  - qol: NODE drones summoned to tap a vent within ore vents now display a green status
+      light to show how much longer they need the vent defended for.
+  Axidyuwu:
+  - bugfix: fixes a way of duplicating iron with wallmounted sparklers and light switches
+  Bisar:
+  - qol: Machines check their parts during initialization now; this will usually apply
+      in cases such as a machine in a prefab having been varedited to be upgraded.
+  - code_imp: All machines check their parts during initialization.
+  Ghommie:
+  - rscadd: Added tadpoles, which can be scooped from puddles with right-click. Functionally
+      they're like most fish, which require an aquarium to survive, and also need
+      to be fed fairly frequently, however they quickly become frogs after about 3
+      minutes of care.
+  - rscadd: Every station now has a couple puddles. One at the public garden and the
+      other in prison.
+  - qol: Changed the name of an aquarium UI button from "Reproduction Prevention"
+      to "Reproduction and Growth", as it  controls both fish breeding and growth.
+  - rscadd: Carps, frogs and young lobstrosities now fear people wearing fishing hats!
+      Adults and megacarp favour the 'fight' part of the fear reflex however.
+  - bugfix: The hat stabilizer module now inherits the clothing traits of the attached
+      hat.
+  Helg2:
+  - bugfix: Emergency climbing hooks now shouldn't spawn on non multi-z stations.
+  Jackraxxus:
+  - bugfix: AI mech control beacons and malf AI dominate mech work again.
+  LT3:
+  - bugfix: Scanner gate now detects items thrown through it
+  - bugfix: Scanner gate does not alarm for guns on players with mindshield
+  - bugfix: Scanner gate does not alarm for guns on players with weapons ID card access
+  - sound: Reduced volume of scanner gate alarm
+  MTandi:
+  - image: Made chem master container icons not blurry
+  - bugfix: Portable atmos machine circuit boards list correct components
+  - bugfix: Portable atmos machine circuit boards accept unwrenched fittings
+  - bugfix: Portable atmos machines are movable on construction
+  - qol: smart fridge UI now groups items by type+name instead of just type
+  - qol: smart fridge UI now shows item names next to the images
+  - qol: smart fridge UI has a list view option (default for chem and viro versions)
+  - bugfix: fixed smart fridge stacking sounds when dispensing multiple items
+  - qol: Renamed seed packs to have the plant name at the beginning
+  Majkl-J:
+  - bugfix: Fixes the echolocation screen overlay not appearing with default arguments
+      due to using the wrong icon state
+  Momo8289:
+  - bugfix: The charge indicators on power cells now work properly.
+  - code_imp: Removed some now redundant power cell appearance updates
+  Rhials:
+  - qol: Sentience potions can now be used without a provided summon reason.
+  - rscadd: Spies can now pick their own custom objectives, if they so choose.
+  Sadboysuss:
+  - bugfix: The clown planet domain is now completable
+  - bugfix: rod sounds will now vary in pitch
+  - bugfix: spray can face spraying will no longer work on light-sensitives with eyewear
+      and people wearing eye covering masks
+  - bugfix: birdshot engineering feedback has been applied
+  SmArtKar:
+  - bugfix: Bank cards speak once more
+  - bugfix: Removed a rogue wall grinder on icebox
+  - bugfix: Silicons and simplemobs can also hear radio chatter now
+  - bugfix: Heart eater wizard perk no longer works activates on organs that haven't
+      been used before
+  - qol: You can now reorder items inside storages by dragging them
+  - balance: Mining MODsuits are now considered thick clothing and gained expanded
+      storage.
+  - image: Mining MODsuits got a slight glowup and hide belts now
+  - bugfix: Fixed advanced pods showing up as cultist pods
+  - admin: Subtype vendor no longer requries an ID
+  - qol: You no longer goofily swap with others trying to move in the same direction
+      as you if you're not faster than them
+  - code_imp: Moved mobswap check logic into a separate proc and made it more readable
+  - balance: Discounts now pick 4-6 items each from a unique category
+  - balance: Items that cost below 4 TC cannot get discounted anymore
+  - balance: Elite syndicate MODs for traitors can no longer get discounted
+  - bugfix: Fixed NT Frontier discounts not applying
+  Watermelon914:
+  - admin: Turfs in lua will no longer become invalid on deletion.
+  - bugfix: Fixes SS13.wait not working when called multiple times before it finishes
+      waiting.
+  Xackii:
+  - bugfix: Justice design no longer disappears
+  - bugfix: Mechs can attack other mechs in melee
+  - rscadd: RD can emag mech fabricator(like roboticist).
+  carlarctg:
+  - rscdel: Revert "Heretic spell invocations now use one dead language per path"
+  grungussuss:
+  - bugfix: the abandoned plasma research facility on icemoon no longer has an item
+      that shouldn't exist
+  mc-oofert:
+  - bugfix: wawastation pharmacy now has a hand labeller
+  rroqc:
+  - rscadd: 'durathread robes can now store botany gear
+
+      :cl:'
diff --git a/html/statbrowser.css b/html/statbrowser.css
index dc693f42f756b..cd1d63bf7c060 100644
--- a/html/statbrowser.css
+++ b/html/statbrowser.css
@@ -1,150 +1,125 @@
 body {
 	font-family: Verdana, Geneva, Tahoma, sans-serif;
-	font-size: 12px !important;
+	font-size: 12px;
 	margin: 0 !important;
 	padding: 0 !important;
-	overflow-x: hidden;
-	overflow-y: scroll;
-}
-
-body.dark {
-	background-color: #131313;
-	color: #b2c4dd;
-	scrollbar-base-color: #1c1c1c;
-	scrollbar-face-color: #3b3b3b;
-	scrollbar-3dlight-color: #252525;
-	scrollbar-highlight-color: #252525;
-	scrollbar-track-color: #1c1c1c;
-	scrollbar-arrow-color: #929292;
-	scrollbar-shadow-color: #3b3b3b;
-}
-
-#menu {
-	background-color: #F0F0F0;
-	position: fixed;
-	width: 100%;
-	z-index: 100;
-}
-
-.dark #menu {
-	background-color: #202020;
-}
-
-#statcontent {
-	padding: 7px 7px 7px 7px;
+	overflow: hidden;
 }
 
 a {
-	color: black;
-	text-decoration: none
-}
-
-.dark a {
-	color: #b2c4dd;
+	color: #003399;
+	text-decoration: none;
 }
 
-a:hover,
-.dark a:hover {
-	text-decoration: underline;
+a:hover {
+	color: #007fff;
 }
 
-ul {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-	background-color: #333;
+h3 {
+	margin: 0 -0.5em 0.25em;
+	padding: 1em 0.66em 0.5em;
+	border-bottom: 0.1667em solid;
 }
 
-li {
-	float: left;
-}
 
-li a {
-	display: block;
-	color: white;
-	text-align: center;
-	padding: 14px 16px;
-	text-decoration: none;
+img {
+	-ms-interpolation-mode: nearest-neighbor;
+	image-rendering: pixelated;
 }
 
-li a:hover:not(.active) {
-	background-color: #111;
+.stat-container {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
 }
 
-.button-container {
-	display: inline-flex;
-	flex-wrap: wrap-reverse;
-	flex-direction: row;
-	align-items: flex-start;
-	overflow-x: hidden;
-	white-space: pre-wrap;
-	padding: 0 4px;
+#menu {
+	display: flex;
+	overflow-x: auto;
+	overflow-y: hidden;
+	padding: 0.25em 0.25em 0;
+	background-color: #ffffff;
 }
 
 .button {
-	background-color: #dfdfdf;
-	border: 1px solid #cecece;
-	border-bottom-width: 2px;
-	color: rgba(0, 0, 0, 0.7);
-	padding: 6px 4px 4px;
-	text-align: center;
-	text-decoration: none;
-	font-size: 12px;
-	margin: 0;
+	display: inline-table;
 	cursor: pointer;
-	transition-duration: 100ms;
-	order: 3;
-	min-width: 40px;
-}
-
-.dark button {
-	background-color: #222222;
-	border-color: #343434;
-	color: rgba(255, 255, 255, 0.5);
+	user-select: none;
+	-ms-user-select: none; /* Remove after Byond 516 */
+	text-align: center;
+	font-size: 1em;
+	min-width: 2.9em;
+	padding: 0.5em 0.5em 0.4em;
+	background-color: transparent;
+	color: rgba(0, 0, 0, 0.5);
+	border: 0;
+	border-bottom: 0.1667em solid transparent;
+	border-radius: 0.25em 0.25em 0 0;
 }
 
 .button:hover {
 	background-color: #ececec;
-	transition-duration: 0;
-}
-
-.dark button:hover {
-	background-color: #2e2e2e;
 }
 
-.button:active,
 .button.active {
-	background-color: #ffffff;
+	background-color: #dfdfdf;
 	color: black;
-	border-top-color: #cecece;
-	border-left-color: #cecece;
-	border-right-color: #cecece;
-	border-bottom-color: #ffffff;
+	border-bottom-color: #000000;
+}
+
+#under-menu {
+	height: 0.5em;
+	background-color: #eeeeee;
 }
 
-.dark .button:active,
-.dark .button.active {
-	background-color: #444444;
-	color: white;
-	border-top-color: #343434;
-	border-left-color: #343434;
-	border-right-color: #343434;
-	border-bottom-color: #ffffff;
+#statcontent {
+	flex: 1;
+	padding: 0.75em 0.5em;
+	overflow-y: scroll;
+	overflow-x: hidden;
 }
 
 .grid-container {
-	margin: -2px;
-	margin-right: -15px;
+	margin: 0;
 }
 
 .grid-item {
+	display: inline-flex;
 	position: relative;
-	display: inline-block;
+	user-select: none;
+	-ms-user-select: none; /* Remove after Byond 516 */
 	width: 100%;
 	box-sizing: border-box;
-	overflow: visible;
-	padding: 3px 2px;
 	text-decoration: none;
+	background-color: transparent;
+	color: black;
+}
+
+.grid-item:hover {
+	color: #003399;
+	z-index: 1;
+}
+
+.grid-item-text {
+	display: inline-block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	box-sizing: border-box;
+	white-space: nowrap;
+	width: 100%;
+	padding: 0.33em 0.5em;
+	border-radius: 0.25em;
+}
+
+.grid-item-text:hover {
+	position: absolute;
+	top: -1.33em;
+	white-space: normal;
+	background-color: #ececec;
+}
+
+.grid-item-text:active {
+	background-color: #dfdfdf;
 }
 
 @media only screen and (min-width: 300px) {
@@ -171,57 +146,67 @@ li a:hover:not(.active) {
 	}
 }
 
-.grid-item:hover {
-	z-index: 1;
+.status-info {
+	margin: 0 0.33em 0.25em;
 }
 
-.grid-item:hover .grid-item-text {
-	width: auto;
-	text-decoration: underline;
+.interview_panel_stats,
+.interview_panel_controls {
+	margin-bottom: 1em;
 }
 
-.grid-item-text {
-	display: inline-block;
-	width: 100%;
-	background-color: #ffffff;
-	margin: 0 -6px;
-	padding: 0 6px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	pointer-events: none;
+/* Dark theme colors */
+body.dark {
+	background-color: #131313;
+	color: #b2c4dd;
+	scrollbar-base-color: #1c1c1c;
+	scrollbar-face-color: #3b3b3b;
+	scrollbar-3dlight-color: #252525;
+	scrollbar-highlight-color: #252525;
+	scrollbar-track-color: #1c1c1c;
+	scrollbar-arrow-color: #929292;
+	scrollbar-shadow-color: #3b3b3b;
+}
+
+.dark a {
+	color: #6699ff;
+}
+
+.dark a:hover,
+.dark .grid-item:hover {
+	color: #80bfff;
 }
 
-.dark .grid-item-text {
+.dark #menu {
 	background-color: #131313;
 }
 
-.link {
-	display: inline;
-	background: none;
-	border: none;
-	padding: 7px 14px;
-	color: black;
-	text-decoration: none;
-	cursor: pointer;
-	font-size: 13px;
-	margin: 2px 2px;
+.dark .button {
+	color: rgba(255, 255, 255, 0.5);
 }
 
-.dark .link {
-	color: #abc6ec;
+.dark .button:hover {
+	background-color: #252525;
 }
 
-.link:hover {
-	text-decoration: underline;
+.dark .button.active  {
+	background-color: #313131;
+	color: #d4dfec;
+	border-bottom-color: #d4dfec;
 }
 
-img {
-	-ms-interpolation-mode: nearest-neighbor;
-	image-rendering: pixelated;
+.dark #under-menu {
+	background-color: #202020;
+}
+
+.dark .grid-item{
+	color: #b2c4dd;
+}
+
+.dark .grid-item-text:hover {
+	background-color: #252525;
 }
 
-.interview_panel_controls,
-.interview_panel_stats {
-	margin-bottom: 10px;
+.dark  .grid-item-text:active {
+	background-color: #313131;
 }
diff --git a/html/statbrowser.html b/html/statbrowser.html
index 1aea8811d58a0..ffd7425bd2607 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -1,3 +1,5 @@
-<ul id="menu" class="button-container"></ul>
-<div id="under_menu"></div>
-<div id="statcontent"></div>
+<div class="stat-container">
+	<div id="menu" class="button-container"></div>
+	<div id="under-menu"></div>
+	<div id="statcontent"></div>
+</div>
diff --git a/html/statbrowser.js b/html/statbrowser.js
index 0d89487af5b39..f6c188c6edd61 100644
--- a/html/statbrowser.js
+++ b/html/statbrowser.js
@@ -32,7 +32,6 @@ var turfname = "";
 var imageRetryDelay = 500;
 var imageRetryLimit = 50;
 var menu = document.getElementById('menu');
-var under_menu = document.getElementById('under_menu');
 var statcontentdiv = document.getElementById('statcontent');
 var storedimages = [];
 var split_admin_tabs = false;
@@ -58,23 +57,23 @@ function createStatusTab(name) {
 	if (!verb_tabs.includes(name) && !permanent_tabs.includes(name)) {
 		return;
 	}
-	var B = document.createElement("BUTTON");
-	B.onclick = function () {
+	var button = document.createElement("DIV");
+	button.onclick = function () {
 		tab_change(name);
 		this.blur();
+		statcontentdiv.focus();
 	};
-	B.id = name;
-	B.textContent = name;
-	B.className = "button";
+	button.id = name;
+	button.textContent = name;
+	button.className = "button";
 	//ORDERING ALPHABETICALLY
-	B.style.order = name.charCodeAt(0);
+	button.style.order = name.charCodeAt(0);
 	if (name == "Status" || name == "MC") {
-		B.style.order = name == "Status" ? 1 : 2;
+		button.style.order = name == "Status" ? 1 : 2;
 	}
 	//END ORDERING
-	menu.appendChild(B);
+	menu.appendChild(button);
 	SendTabToByond(name);
-	under_menu.style.height = menu.clientHeight + 'px';
 }
 
 function removeStatusTab(name) {
@@ -88,7 +87,6 @@ function removeStatusTab(name) {
 	}
 	menu.removeChild(document.getElementById(name));
 	TakeTabFromByond(name);
-	under_menu.style.height = menu.clientHeight + 'px';
 }
 
 function sortVerbs() {
@@ -104,10 +102,6 @@ function sortVerbs() {
 	})
 }
 
-window.onresize = function () {
-	under_menu.style.height = menu.clientHeight + 'px';
-}
-
 function addPermanentTab(name) {
 	if (!permanent_tabs.includes(name)) {
 		permanent_tabs.push(name);
@@ -361,6 +355,7 @@ function draw_status() {
 		} else {
 			var div = document.createElement("div");
 			div.textContent = status_tab_parts[i];
+			div.className = "status-info";
 			document.getElementById("statcontent").appendChild(div);
 		}
 	}
@@ -717,6 +712,10 @@ function set_theme(which) {
 	}
 }
 
+function set_font_size(size) {
+	document.body.style.setProperty('font-size', size);
+}
+
 function set_style_sheet(sheet) {
 	if (document.getElementById("goonStyle")) {
 		var currentSheet = document.getElementById("goonStyle");
diff --git a/icons/_nanomaps/Birdshot Station_nanomap_z1.png b/icons/_nanomaps/Birdshot Station_nanomap_z1.png
index a8fa0d73f26da..991c567cd09fe 100644
Binary files a/icons/_nanomaps/Birdshot Station_nanomap_z1.png and b/icons/_nanomaps/Birdshot Station_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Ice Box Station_nanomap_z2.png b/icons/_nanomaps/Ice Box Station_nanomap_z2.png
index ad032a00189c2..f7d184081d732 100644
Binary files a/icons/_nanomaps/Ice Box Station_nanomap_z2.png and b/icons/_nanomaps/Ice Box Station_nanomap_z2.png differ
diff --git a/icons/area/areas_centcom.dmi b/icons/area/areas_centcom.dmi
index a3e8aafb72fb7..a33055722ffc4 100644
Binary files a/icons/area/areas_centcom.dmi and b/icons/area/areas_centcom.dmi differ
diff --git a/icons/area/areas_ruins.dmi b/icons/area/areas_ruins.dmi
index f4b67ee6495fa..2b25401250b20 100644
Binary files a/icons/area/areas_ruins.dmi and b/icons/area/areas_ruins.dmi differ
diff --git a/icons/effects/callouts.dmi b/icons/effects/callouts.dmi
new file mode 100644
index 0000000000000..583f47d52b347
Binary files /dev/null and b/icons/effects/callouts.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 633004afacad2..7923b4e9f1ea9 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/holosigns.dmi b/icons/effects/holosigns.dmi
new file mode 100644
index 0000000000000..9d951114b773d
Binary files /dev/null and b/icons/effects/holosigns.dmi differ
diff --git a/icons/effects/mouse_pointers/lace.dmi b/icons/effects/mouse_pointers/lace.dmi
new file mode 100644
index 0000000000000..68aad755c627e
Binary files /dev/null and b/icons/effects/mouse_pointers/lace.dmi differ
diff --git a/icons/effects/particles/voidwalker.dmi b/icons/effects/particles/voidwalker.dmi
new file mode 100644
index 0000000000000..d7f94c987979a
Binary files /dev/null and b/icons/effects/particles/voidwalker.dmi differ
diff --git a/icons/hud/fishing_hud.dmi b/icons/hud/fishing_hud.dmi
index 58c478d071064..f18ed7c6cfca9 100644
Binary files a/icons/hud/fishing_hud.dmi and b/icons/hud/fishing_hud.dmi differ
diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi
index e4a1693fb573e..f6e141ab6855a 100644
Binary files a/icons/hud/radial.dmi and b/icons/hud/radial.dmi differ
diff --git a/icons/mob/actions/actions_spells.dmi b/icons/mob/actions/actions_spells.dmi
index b8d3c3ce34b54..335229641fa82 100644
Binary files a/icons/mob/actions/actions_spells.dmi and b/icons/mob/actions/actions_spells.dmi differ
diff --git a/icons/mob/actions/actions_voidwalker.dmi b/icons/mob/actions/actions_voidwalker.dmi
new file mode 100644
index 0000000000000..fd0825994d089
Binary files /dev/null and b/icons/mob/actions/actions_voidwalker.dmi differ
diff --git a/icons/mob/actions/backgrounds.dmi b/icons/mob/actions/backgrounds.dmi
index c9aa153453880..c8f8b723f9e96 100644
Binary files a/icons/mob/actions/backgrounds.dmi and b/icons/mob/actions/backgrounds.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index be83d83d4228c..a96beb1cfa936 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index a2d318adfb7d1..4f844c4fa320f 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
index 9594f6227730f..1138dffc8bd31 100644
Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 3ae1eb68e865f..95a3790ac7331 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index ded01542e31b6..b62b6a0a8ee58 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi
index 1f4f12ff8c8c8..09c11ca0acba3 100644
Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ
diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi
index 116f0256a6276..579f4c53f0f97 100644
Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ
diff --git a/icons/mob/clothing/head/wizard.dmi b/icons/mob/clothing/head/wizard.dmi
index 785ed63ca5bde..cafde2136f740 100644
Binary files a/icons/mob/clothing/head/wizard.dmi and b/icons/mob/clothing/head/wizard.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 22c7ae3ac49c0..0dad7a30d0b23 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
index 64affedb2de4c..cb2a472c32ed6 100644
Binary files a/icons/mob/clothing/modsuit/mod_clothing.dmi and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_modules.dmi b/icons/mob/clothing/modsuit/mod_modules.dmi
index 3c41dac86b2d4..4f2dc9740d1f7 100644
Binary files a/icons/mob/clothing/modsuit/mod_modules.dmi and b/icons/mob/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index ed0bb34b46449..3467f752ac3a5 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index eb7a525e4b78f..ea80204c2cdcc 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/suits/wizard.dmi b/icons/mob/clothing/suits/wizard.dmi
index 454bc1f3cf1e6..9e8c8224130c0 100644
Binary files a/icons/mob/clothing/suits/wizard.dmi and b/icons/mob/clothing/suits/wizard.dmi differ
diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi
index 34703c070589d..34612120ea630 100644
Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ
diff --git a/icons/mob/human/species/voidwalker.dmi b/icons/mob/human/species/voidwalker.dmi
new file mode 100644
index 0000000000000..f7e616864f1a1
Binary files /dev/null and b/icons/mob/human/species/voidwalker.dmi differ
diff --git a/icons/mob/human/textures.dmi b/icons/mob/human/textures.dmi
new file mode 100644
index 0000000000000..c5f420c7de866
Binary files /dev/null and b/icons/mob/human/textures.dmi differ
diff --git a/icons/mob/inhands/antag/voidwalker_lefthand.dmi b/icons/mob/inhands/antag/voidwalker_lefthand.dmi
new file mode 100644
index 0000000000000..5cd8b8817ec31
Binary files /dev/null and b/icons/mob/inhands/antag/voidwalker_lefthand.dmi differ
diff --git a/icons/mob/inhands/antag/voidwalker_righthand.dmi b/icons/mob/inhands/antag/voidwalker_righthand.dmi
new file mode 100644
index 0000000000000..f227c6105ad1e
Binary files /dev/null and b/icons/mob/inhands/antag/voidwalker_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi
index 1d6461fb39dc9..6ad1f8886c99e 100644
Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi
index 4d9710bf90159..3aba15568ef88 100644
Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi
index a5fd6d3318cff..9a8e008e48343 100644
Binary files a/icons/mob/inhands/clothing/shoes_lefthand.dmi and b/icons/mob/inhands/clothing/shoes_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_righthand.dmi b/icons/mob/inhands/clothing/shoes_righthand.dmi
index 8f5a3c374ca08..bdc82c0530df2 100644
Binary files a/icons/mob/inhands/clothing/shoes_righthand.dmi and b/icons/mob/inhands/clothing/shoes_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi
index 02b1e2cbff266..9c15bb18c7b67 100644
Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi
index 7dd047b7345d7..87187225fdc60 100644
Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/belt_lefthand.dmi b/icons/mob/inhands/equipment/belt_lefthand.dmi
index 9f306a2777d2f..d5c4f7c4424b5 100644
Binary files a/icons/mob/inhands/equipment/belt_lefthand.dmi and b/icons/mob/inhands/equipment/belt_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/belt_righthand.dmi b/icons/mob/inhands/equipment/belt_righthand.dmi
index 7b519f7cf69ea..0e0c7b817eed4 100644
Binary files a/icons/mob/inhands/equipment/belt_righthand.dmi and b/icons/mob/inhands/equipment/belt_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_lefthand.dmi b/icons/mob/inhands/equipment/shields_lefthand.dmi
index 1aa27021b9ede..a19d5f46245e1 100644
Binary files a/icons/mob/inhands/equipment/shields_lefthand.dmi and b/icons/mob/inhands/equipment/shields_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_righthand.dmi b/icons/mob/inhands/equipment/shields_righthand.dmi
index 4227ba00792b4..b4d080345c536 100644
Binary files a/icons/mob/inhands/equipment/shields_righthand.dmi and b/icons/mob/inhands/equipment/shields_righthand.dmi differ
diff --git a/icons/mob/inhands/items/food_lefthand.dmi b/icons/mob/inhands/items/food_lefthand.dmi
index 8e2b19c4dd42a..5dabacf53dbf6 100644
Binary files a/icons/mob/inhands/items/food_lefthand.dmi and b/icons/mob/inhands/items/food_lefthand.dmi differ
diff --git a/icons/mob/inhands/items/food_righthand.dmi b/icons/mob/inhands/items/food_righthand.dmi
index 12063ad38a8f9..7cd6569508c8e 100644
Binary files a/icons/mob/inhands/items/food_righthand.dmi and b/icons/mob/inhands/items/food_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 86bd5020f4f32..86396dcaa8c67 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index a6de8b974644c..2cbe944aecc52 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/64x_guns_left.dmi b/icons/mob/inhands/weapons/64x_guns_left.dmi
index 0378a60405792..faeae6f2eea5c 100644
Binary files a/icons/mob/inhands/weapons/64x_guns_left.dmi and b/icons/mob/inhands/weapons/64x_guns_left.dmi differ
diff --git a/icons/mob/inhands/weapons/64x_guns_right.dmi b/icons/mob/inhands/weapons/64x_guns_right.dmi
index 50fa2342d2a55..2ccdeb577fed3 100644
Binary files a/icons/mob/inhands/weapons/64x_guns_right.dmi and b/icons/mob/inhands/weapons/64x_guns_right.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index c1bcd197278b5..90df2a892f984 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 98788d7371135..eebed61656aa4 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi
index 5e4eb552f2a5c..917b46ae8938a 100644
Binary files a/icons/mob/inhands/weapons/staves_lefthand.dmi and b/icons/mob/inhands/weapons/staves_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi
index 9de32d8cd9533..da1765fe800c6 100644
Binary files a/icons/mob/inhands/weapons/staves_righthand.dmi and b/icons/mob/inhands/weapons/staves_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index b9552c754c082..82c98f057c0ec 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index f132e997658cb..3f6e471e83e2f 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/mob/nonhuman-player/eldritch_mobs.dmi b/icons/mob/nonhuman-player/eldritch_mobs.dmi
index 18e50d727aee5..3f2aa454f0eb4 100644
Binary files a/icons/mob/nonhuman-player/eldritch_mobs.dmi and b/icons/mob/nonhuman-player/eldritch_mobs.dmi differ
diff --git a/icons/mob/silicon/aibots.dmi b/icons/mob/silicon/aibots.dmi
index 85f4e3505898e..86c450ef1ceae 100644
Binary files a/icons/mob/silicon/aibots.dmi and b/icons/mob/silicon/aibots.dmi differ
diff --git a/icons/mob/silicon/robot_items.dmi b/icons/mob/silicon/robot_items.dmi
index 00c813ace7f48..2cb809fe2724b 100644
Binary files a/icons/mob/silicon/robot_items.dmi and b/icons/mob/silicon/robot_items.dmi differ
diff --git a/icons/mob/simple/animal.dmi b/icons/mob/simple/animal.dmi
index 82943b798a941..62e36fad550b4 100644
Binary files a/icons/mob/simple/animal.dmi and b/icons/mob/simple/animal.dmi differ
diff --git a/icons/mob/simple/corgi_head.dmi b/icons/mob/simple/corgi_head.dmi
index 2e14a3ed0bb5d..c07f1227a3de1 100644
Binary files a/icons/mob/simple/corgi_head.dmi and b/icons/mob/simple/corgi_head.dmi differ
diff --git a/icons/mob/simple/icemoon/icemoon_monsters.dmi b/icons/mob/simple/icemoon/icemoon_monsters.dmi
index 3e53c0a971228..739092d63ad62 100644
Binary files a/icons/mob/simple/icemoon/icemoon_monsters.dmi and b/icons/mob/simple/icemoon/icemoon_monsters.dmi differ
diff --git a/icons/mob/simple/mad_piano.dmi b/icons/mob/simple/mad_piano.dmi
new file mode 100644
index 0000000000000..b161f8e4d22ed
Binary files /dev/null and b/icons/mob/simple/mad_piano.dmi differ
diff --git a/icons/mob/simple/mob.dmi b/icons/mob/simple/mob.dmi
index e8fb3c59b8fbe..142481e08e9a7 100644
Binary files a/icons/mob/simple/mob.dmi and b/icons/mob/simple/mob.dmi differ
diff --git a/icons/obj/aquarium/fish.dmi b/icons/obj/aquarium/fish.dmi
index ab282e1681be9..638c8300f304a 100644
Binary files a/icons/obj/aquarium/fish.dmi and b/icons/obj/aquarium/fish.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index e26731f384667..dcfb7f482ae4c 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 5ccdf2c186f89..14ed534744f6e 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 465340870dd48..4739498c16426 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi
index 25bc62a5314ee..7ece76ca5a7e6 100644
Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
index fe52d505e439d..cc54b2bf92934 100644
Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/head/wizard.dmi b/icons/obj/clothing/head/wizard.dmi
index 29595f02fc2ad..82ea73b68babd 100644
Binary files a/icons/obj/clothing/head/wizard.dmi and b/icons/obj/clothing/head/wizard.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi
index 3de713477b696..6ab49417aa52f 100644
Binary files a/icons/obj/clothing/modsuit/mod_clothing.dmi and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_construction.dmi b/icons/obj/clothing/modsuit/mod_construction.dmi
index dedcb3f838d64..1080b89650772 100644
Binary files a/icons/obj/clothing/modsuit/mod_construction.dmi and b/icons/obj/clothing/modsuit/mod_construction.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi
index 6ec143a849e1c..36d95aa61fdbb 100644
Binary files a/icons/obj/clothing/modsuit/mod_modules.dmi and b/icons/obj/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index e8726cfcb73a5..ca90eb8a3291b 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index ec2a128a865f2..8c91be43d4ad0 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index 0484cf060d033..b1763f5453ffe 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/suits/wizard.dmi b/icons/obj/clothing/suits/wizard.dmi
index fcfa748d3b317..94fc99b01b47d 100644
Binary files a/icons/obj/clothing/suits/wizard.dmi and b/icons/obj/clothing/suits/wizard.dmi differ
diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi
index 85a49d1b3300c..42aa61e66b83c 100644
Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ
diff --git a/icons/obj/debris.dmi b/icons/obj/debris.dmi
index 10b73560cbb17..3f7836f5762d7 100644
Binary files a/icons/obj/debris.dmi and b/icons/obj/debris.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 2fb08c78be71a..9ad8d3235e1f0 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
index 66761ee20298d..bf0b1df4f4cd2 100644
Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ
diff --git a/icons/obj/machines/atmospherics/unary_devices.dmi b/icons/obj/machines/atmospherics/unary_devices.dmi
index 47acf3c29c9c4..73da54768b1cb 100644
Binary files a/icons/obj/machines/atmospherics/unary_devices.dmi and b/icons/obj/machines/atmospherics/unary_devices.dmi differ
diff --git a/icons/obj/machines/keycard_auth_table.dmi b/icons/obj/machines/keycard_auth_table.dmi
new file mode 100644
index 0000000000000..863b687017c3c
Binary files /dev/null and b/icons/obj/machines/keycard_auth_table.dmi differ
diff --git a/icons/obj/machines/kitchen.dmi b/icons/obj/machines/kitchen.dmi
index 2142125c5aa5c..1bd254942b2e0 100644
Binary files a/icons/obj/machines/kitchen.dmi and b/icons/obj/machines/kitchen.dmi differ
diff --git a/icons/obj/machines/scangate.dmi b/icons/obj/machines/scangate.dmi
index 6af8750414ade..9dacefab3539c 100644
Binary files a/icons/obj/machines/scangate.dmi and b/icons/obj/machines/scangate.dmi differ
diff --git a/icons/obj/machines/smartfridge.dmi b/icons/obj/machines/smartfridge.dmi
index 18f3ccedd9bde..df5a163b803af 100644
Binary files a/icons/obj/machines/smartfridge.dmi and b/icons/obj/machines/smartfridge.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index 1af082171ac16..f1380268c29cf 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi
index bf3c42bde16a1..b9a9ba9568291 100644
Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ
diff --git a/icons/obj/medical/organs/organs.dmi b/icons/obj/medical/organs/organs.dmi
index 62a45426e186e..a9366894d7bf3 100644
Binary files a/icons/obj/medical/organs/organs.dmi and b/icons/obj/medical/organs/organs.dmi differ
diff --git a/icons/obj/medical/organs/shadow_organs.dmi b/icons/obj/medical/organs/shadow_organs.dmi
index 61721330e5361..402e3fc8eccfc 100644
Binary files a/icons/obj/medical/organs/shadow_organs.dmi and b/icons/obj/medical/organs/shadow_organs.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index 1f6393a8c51ba..991762dba3d59 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/obj/pipes_n_cables/meter.dmi b/icons/obj/pipes_n_cables/meter.dmi
index 2aed35e065f49..fa0d5e3bf4d88 100644
Binary files a/icons/obj/pipes_n_cables/meter.dmi and b/icons/obj/pipes_n_cables/meter.dmi differ
diff --git a/icons/obj/pipes_n_cables/pipe_item.dmi b/icons/obj/pipes_n_cables/pipe_item.dmi
index 54dac81793975..ea2f9f71eb58d 100644
Binary files a/icons/obj/pipes_n_cables/pipe_item.dmi and b/icons/obj/pipes_n_cables/pipe_item.dmi differ
diff --git a/icons/obj/service/hydroponics/equipment.dmi b/icons/obj/service/hydroponics/equipment.dmi
index 0fcebb3c51988..be9d9d4eeaf0d 100644
Binary files a/icons/obj/service/hydroponics/equipment.dmi and b/icons/obj/service/hydroponics/equipment.dmi differ
diff --git a/icons/obj/service/hydroponics/growing_vegetables.dmi b/icons/obj/service/hydroponics/growing_vegetables.dmi
index 30f02e862e037..37ddd825a829d 100644
Binary files a/icons/obj/service/hydroponics/growing_vegetables.dmi and b/icons/obj/service/hydroponics/growing_vegetables.dmi differ
diff --git a/icons/obj/service/hydroponics/harvest.dmi b/icons/obj/service/hydroponics/harvest.dmi
index b15a34105dec2..dd3cd5865deeb 100644
Binary files a/icons/obj/service/hydroponics/harvest.dmi and b/icons/obj/service/hydroponics/harvest.dmi differ
diff --git a/icons/obj/service/hydroponics/seeds.dmi b/icons/obj/service/hydroponics/seeds.dmi
index 4de1a757e1fbc..c18c361b0ec0a 100644
Binary files a/icons/obj/service/hydroponics/seeds.dmi and b/icons/obj/service/hydroponics/seeds.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index f13b10bdf4a8a..489d045968984 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index c0a327d7df669..01588bd050f74 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi
index 34d5db6f3e898..46c61f8299767 100644
Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ
diff --git a/icons/obj/toys/plushes.dmi b/icons/obj/toys/plushes.dmi
index 241d45fc33d27..968957f360c3a 100644
Binary files a/icons/obj/toys/plushes.dmi and b/icons/obj/toys/plushes.dmi differ
diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi
index ef3f6dc9370e5..8d77fd0c757a1 100644
Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index 824e52d00a26c..836aebca7ae2d 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ
diff --git a/icons/obj/weapons/bows/arrows.dmi b/icons/obj/weapons/bows/arrows.dmi
index 956a82dd9bf1f..b19c20187ebfa 100644
Binary files a/icons/obj/weapons/bows/arrows.dmi and b/icons/obj/weapons/bows/arrows.dmi differ
diff --git a/icons/obj/weapons/bows/bows.dmi b/icons/obj/weapons/bows/bows.dmi
index 4de9d4fca35ab..57d4237104266 100644
Binary files a/icons/obj/weapons/bows/bows.dmi and b/icons/obj/weapons/bows/bows.dmi differ
diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi
index e3a82a81cd31d..4cd031af7ee8b 100644
Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
index abbb7743b0140..824d8b7c0a073 100644
Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ
diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi
index 6e8e5c60f684a..5ff5c392f7be9 100644
Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index 3be26b2c43fad..a6cf89e9b910f 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/obj/weapons/guns/wide_guns.dmi b/icons/obj/weapons/guns/wide_guns.dmi
index 568a3bc051f40..7e18f60eeb864 100644
Binary files a/icons/obj/weapons/guns/wide_guns.dmi and b/icons/obj/weapons/guns/wide_guns.dmi differ
diff --git a/icons/obj/weapons/shields.dmi b/icons/obj/weapons/shields.dmi
index 99e9b06aa4000..eec85e9bea1ac 100644
Binary files a/icons/obj/weapons/shields.dmi and b/icons/obj/weapons/shields.dmi differ
diff --git a/icons/obj/weapons/stabby.dmi b/icons/obj/weapons/stabby.dmi
index 24d4e0aef31eb..be125b5f31d59 100644
Binary files a/icons/obj/weapons/stabby.dmi and b/icons/obj/weapons/stabby.dmi differ
diff --git a/icons/obj/weapons/staff.dmi b/icons/obj/weapons/staff.dmi
index 2d1460cf7e982..45c20ae17e5da 100644
Binary files a/icons/obj/weapons/staff.dmi and b/icons/obj/weapons/staff.dmi differ
diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi
index d9a443cfc2699..9464c7b474585 100644
Binary files a/icons/obj/weapons/sword.dmi and b/icons/obj/weapons/sword.dmi differ
diff --git a/icons/obj/weapons/turrets.dmi b/icons/obj/weapons/turrets.dmi
index acac1fb832e52..488d3ea886db3 100644
Binary files a/icons/obj/weapons/turrets.dmi and b/icons/obj/weapons/turrets.dmi differ
diff --git a/icons/obj/weapons/voidwalker_items.dmi b/icons/obj/weapons/voidwalker_items.dmi
new file mode 100644
index 0000000000000..1179d1953003f
Binary files /dev/null and b/icons/obj/weapons/voidwalker_items.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 36c85642ad23c..1ee06ed48550d 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -133,6 +133,7 @@ h1.alert, h2.alert		{color: #000000;}
 .robot					{font-family: "Courier New", cursive, sans-serif;}
 
 .command_headset		{font-weight: bold;	font-size: 3;}
+.soapbox 				{font-weight: bold; font-size: 3;}
 .small					{font-size: 1;}
 .big					{font-size: 3;}
 .reallybig				{font-size: 4;}
diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua
index ea04c8c6503dd..2b0645172ea1c 100644
--- a/lua/SS13_base.lua
+++ b/lua/SS13_base.lua
@@ -5,59 +5,38 @@ local SS13 = {}
 
 __SS13_signal_handlers = __SS13_signal_handlers or {}
 
-SS13.SSlua = dm.global_vars.vars.SSlua
+SS13.SSlua = dm.global_vars.SSlua
 
 SS13.global_proc = "some_magic_bullshit"
 
 SS13.state = state.state
 
 function SS13.get_runner_ckey()
-	return SS13.state:get_var("ckey_last_runner")
+	return SS13.state.ckey_last_runner
 end
 
 function SS13.get_runner_client()
-	return dm.global_vars:get_var("GLOB"):get_var("directory"):get(SS13.get_runner_ckey())
+	return dm.global_vars.GLOB.directory[SS13.get_runner_ckey()]
 end
 
-function SS13.istype(thing, type)
-	return dm.global_proc("_istype", thing, dm.global_proc("_text2path", type)) == 1
-end
-
-function SS13.start_tracking(datum)
-	local references = SS13.state.vars.references
-	references:add(datum)
-	SS13.state:call_proc("clear_on_delete", datum)
-end
+SS13.type = dm.global_procs._text2path
 
-function SS13.new(type, ...)
-	local datum = SS13.new_untracked(type, ...)
-	if datum then
-		SS13.start_tracking(datum)
-		return datum
-	end
+function SS13.istype(thing, type)
+	return dm.global_procs._istype(thing, SS13.type(type)) == 1
 end
 
-function SS13.type(string_type)
-	return dm.global_proc("_text2path", string_type)
-end
+SS13.new = dm.new
 
 function SS13.qdel(datum)
 	if SS13.is_valid(datum) then
-		dm.global_proc("qdel", datum)
+		dm.global_procs.qdel(datum)
 		return true
 	end
 	return false
 end
 
-function SS13.new_untracked(type, ...)
-	return dm.global_proc("_new", type, { ... })
-end
-
 function SS13.is_valid(datum)
-	if datum and not datum:is_null() and not datum:get_var("gc_destroyed") then
-		return true
-	end
-	return false
+	return dm.is_valid_ref(datum) and not datum.gc_destroyed
 end
 
 function SS13.await(thing_to_call, proc_to_call, ...)
@@ -67,123 +46,107 @@ function SS13.await(thing_to_call, proc_to_call, ...)
 	if thing_to_call == SS13.global_proc then
 		proc_to_call = "/proc/" .. proc_to_call
 	end
-	local promise = SS13.new("/datum/auxtools_promise", thing_to_call, proc_to_call, ...)
-	local promise_vars = promise.vars
-	while promise_vars.status == 0 do
+	local promise = SS13.new("/datum/promise", thing_to_call, proc_to_call, ...)
+	while promise.status == 0 do
 		sleep()
 	end
-	local return_value, runtime_message = promise_vars.return_value, promise_vars.runtime_message
-	SS13.stop_tracking(promise)
-	return return_value, runtime_message
+	return promise.return_value, promise.runtime_message
 end
 
-function SS13.register_signal(datum, signal, func)
-	if not SS13.istype(datum, "/datum") then
-		return
+local function signal_handler(data, ...)
+	local output = 0
+	for func, _ in data.functions do
+		output = bit32.bor(output, func(...))
 	end
-	if not SS13.is_valid(datum) then
-		error("Tried to register a signal on a deleted datum!", 2)
-		return
+	return output
+end
+
+local function create_qdeleting_callback(datum)
+	local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
+	callback:RegisterSignal(datum, "parent_qdeleting", "Invoke")
+	local path = {
+		"__SS13_signal_handlers",
+		dm.global_procs.WEAKREF(datum),
+		"parent_qdeleting",
+		"handler",
+	}
+	callback.arguments = { path }
+	local handler_data = { callback = callback, functions = {} }
+	handler_data.handler = function(source, ...)
+		local result = signal_handler(handler_data, source, ...)
+		for signal, signal_data in __SS13_signal_handlers[source] do
+			signal_data.callback:UnregisterSignal(source, signal)
+		end
+		__SS13_signal_handlers[source] = nil
+		return result
 	end
-	local datumWeakRef = dm.global_proc("WEAKREF", datum)
-	if not __SS13_signal_handlers[datumWeakRef] then
-		__SS13_signal_handlers[datumWeakRef] = {}
+	__SS13_signal_handlers[datum]["parent_qdeleting"] = handler_data
+end
+
+function SS13.register_signal(datum, signal, func)
+	if not type(func) == "function" then
+		return
 	end
-	if signal == "_cleanup" then
+	if not SS13.istype(datum, "/datum") then
 		return
 	end
-	if not __SS13_signal_handlers[datumWeakRef][signal] then
-		__SS13_signal_handlers[datumWeakRef][signal] = {}
+	if not SS13.is_valid(datum) then
+		error("Tried to register a signal on a deleted datum", 2)
 	end
-	local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
-	local callbackWeakRef = dm.global_proc("WEAKREF", callback)
-	callback:call_proc("RegisterSignal", datum, signal, "Invoke")
-	local path = { "__SS13_signal_handlers", datumWeakRef, signal, callbackWeakRef, "func" }
-	callback.vars.arguments = { path }
-	-- Turfs don't remove their signals on deletion.
-	if not __SS13_signal_handlers[datumWeakRef]._cleanup and not SS13.istype(datum, "/turf") then
-		local cleanupCallback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
-		local cleanupPath = { "__SS13_signal_handlers", datumWeakRef, "_cleanup"}
-		cleanupCallback.vars.arguments = { cleanupPath }
-		cleanupCallback:call_proc("RegisterSignal", datum, "parent_qdeleting", "Invoke")
-		__SS13_signal_handlers[datumWeakRef]._cleanup = function(datum)
-			SS13.start_tracking(datumWeakRef)
-			timer.set_timeout(0, function()
-				SS13.signal_handler_cleanup(datumWeakRef)
-				SS13.stop_tracking(cleanupCallback)
-				SS13.stop_tracking(datumWeakRef)
-			end)
+	if not __SS13_signal_handlers[datum] then
+		__SS13_signal_handlers[datum] = {}
+		-- Turfs don't remove their signals on deletion.
+		if not SS13.istype(datum, "/turf") then
+			create_qdeleting_callback(datum)
 		end
 	end
-	__SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = { func = func, callback = callback }
-	return callback
-end
-
-function SS13.stop_tracking(datum)
-	SS13.state:call_proc("let_soft_delete", datum)
-end
-
-function SS13.unregister_signal(datum, signal, callback)
-	local function clear_handler(handler_info)
-		if not handler_info then
-			return
-		end
-		if not handler_info.callback then
-			return
+	local handler_data = __SS13_signal_handlers[datum][signal]
+	if not handler_data then
+		handler_data = { callback = nil, functions = {} }
+		local callback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
+		callback:RegisterSignal(datum, signal, "Invoke")
+		local path = {
+			"__SS13_signal_handlers",
+			dm.global_procs.WEAKREF(datum),
+			signal,
+			"handler",
+		}
+		callback.arguments = { path }
+		handler_data.callback = callback
+		handler_data.handler = function(...)
+			return signal_handler(handler_data, ...)
 		end
-		local handler_callback = handler_info.callback
-		local callbackWeakRef = dm.global_proc("WEAKREF", handler_callback)
-		if not SS13.istype(datum, "/datum/weakref") then
-			handler_callback:call_proc("UnregisterSignal", datum, signal)
-		else
-			local actualDatum = datum:call_proc("hard_resolve")
-			if SS13.is_valid(actualDatum) then
-				handler_callback:call_proc("UnregisterSignal", actualDatum, signal)
-			end
-		end
-		SS13.stop_tracking(handler_callback)
+		__SS13_signal_handlers[datum][signal] = handler_data
 	end
+	handler_data.functions[func] = true
+	return true
+end
 
-	local datumWeakRef = datum
-	if not SS13.istype(datum, "/datum/weakref") then
-		datumWeakRef = dm.global_proc("WEAKREF", datum)
-	end
-	if not __SS13_signal_handlers[datumWeakRef] then
+function SS13.unregister_signal(datum, signal, func)
+	if not (func == nil or type(func) == "function") then
 		return
 	end
-
-	if signal == "_cleanup" then
+	if not __SS13_signal_handlers[datum] then
 		return
 	end
-
-	if not __SS13_signal_handlers[datumWeakRef][signal] then
+	local handler_data = __SS13_signal_handlers[datum][signal]
+	if not handler_data then
 		return
 	end
-
-	if not callback then
-		for handler_key, handler_info in __SS13_signal_handlers[datumWeakRef][signal] do
-			clear_handler(handler_info)
+	if func == nil then
+		if signal == "parent_qdeleting" then
+			handler_data.functions = {}
+		else
+			handler_data.callback:UnregisterSignal(datum, signal)
+			__SS13_signal_handlers[datum][signal] = nil
 		end
-		__SS13_signal_handlers[datumWeakRef][signal] = nil
 	else
-		if not SS13.istype(callback, "/datum/callback") then
-			return
+		handler_data.functions[func] = nil
+		if not (#handler_data.functions or (signal == "parent_qdeleting")) then
+			handler_data.callback:UnregisterSignal(datum, signal)
+			__SS13_signal_handlers[datum][signal] = nil
 		end
-		local callbackWeakRef = dm.global_proc("WEAKREF", callback)
-		clear_handler(__SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef])
-		__SS13_signal_handlers[datumWeakRef][signal][callbackWeakRef] = nil
-	end
-end
-
-function SS13.signal_handler_cleanup(datumWeakRef)
-	if not __SS13_signal_handlers[datumWeakRef] then
-		return
-	end
-
-	for signal, _ in __SS13_signal_handlers[datumWeakRef] do
-		SS13.unregister_signal(datumWeakRef, signal)
 	end
-	__SS13_signal_handlers[datumWeakRef] = nil
 end
 
 return SS13
diff --git a/lua/handler_group.lua b/lua/handler_group.lua
index 0246d33c74488..050551b852969 100644
--- a/lua/handler_group.lua
+++ b/lua/handler_group.lua
@@ -1,29 +1,29 @@
-local SS13 = require('SS13')
+local SS13 = require("SS13")
 local HandlerGroup = {}
 HandlerGroup.__index = HandlerGroup
 
 function HandlerGroup.new()
 	return setmetatable({
-		registered = {}
+		registered = {},
 	}, HandlerGroup)
 end
 
 -- Registers a signal on a datum for this handler group instance.
 function HandlerGroup:register_signal(datum, signal, func)
-	local callback = SS13.register_signal(datum, signal, func)
-	if not callback then
+	local registered_successfully = SS13.register_signal(datum, signal, func)
+	if not registered_successfully then
 		return
 	end
-	table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback  })
+	table.insert(self.registered, { datum = datum, signal = signal, func = func })
 end
 
 -- Clears all the signals that have been registered on this HandlerGroup
 function HandlerGroup:clear()
 	for _, data in self.registered do
-		if not data.callback or not data.datum then
+		if not data.func or not SS13.is_valid(data.datum) then
 			continue
 		end
-		SS13.unregister_signal(data.datum, data.signal, data.callback)
+		SS13.unregister_signal(data.datum, data.signal, data.func)
 	end
 	table.clear(self.registered)
 end
@@ -45,5 +45,4 @@ function HandlerGroup.register_once(datum, signal, func)
 	return callback
 end
 
-
 return HandlerGroup
diff --git a/lua/state.lua b/lua/state.lua
index 080ee9f7eb32c..cba24d6435611 100644
--- a/lua/state.lua
+++ b/lua/state.lua
@@ -1,7 +1,7 @@
-local SSlua = dm.global_vars:get_var("SSlua")
+local SSlua = dm.global_vars.SSlua
 
-for _, state in SSlua:get_var("states") do
-	if state:get_var("internal_id") == dm.state_id then
+for _, state in SSlua.states do
+	if state.internal_id == _state_id then
 		return { state = state }
 	end
 end
diff --git a/lua/timer.lua b/lua/timer.lua
index 8619bbb54a29e..e79cc8cdca54b 100644
--- a/lua/timer.lua
+++ b/lua/timer.lua
@@ -2,19 +2,19 @@ local state = require("state")
 
 local Timer = {}
 
-local SSlua = dm.global_vars:get_var("SSlua")
+local SSlua = dm.global_vars.SSlua
 __Timer_timers = __Timer_timers or {}
 __Timer_callbacks = __Timer_callbacks or {}
 
 function __add_internal_timer(func, time, loop)
 	local timer = {
 		loop = loop,
-		executeTime = time + dm.world:get_var("time")
+		executeTime = time + dm.world.time,
 	}
 	__Timer_callbacks[tostring(func)] = function()
 		timer.executing = false
 		if loop and timer.terminate ~= true then
-			timer.executeTime = dm.world:get_var("time") + time
+			timer.executeTime = dm.world.time + time
 		else
 			__stop_internal_timer(tostring(func))
 		end
@@ -37,22 +37,21 @@ function __stop_internal_timer(func)
 end
 
 __Timer_timer_processing = __Timer_timer_processing or false
-state.state:set_var("timer_enabled", 1)
+state.state.timer_enabled = 1
 __Timer_timer_process = function(seconds_per_tick)
 	if __Timer_timer_processing then
 		return 0
 	end
 	__Timer_timer_processing = true
-	local time = dm.world:get_var("time")
 	for func, timeData in __Timer_timers do
 		if timeData.executing == true then
 			continue
 		end
-		if over_exec_usage(0.85) then
+		if _exec.time / (dm.world.tick_lag * 100) > 0.85 then
 			sleep()
 		end
-		if time >= timeData.executeTime then
-			state.state:get_var("functions_to_execute"):add(func)
+		if dm.world.time >= timeData.executeTime then
+			list.add(state.state.functions_to_execute, func)
 			timeData.executing = true
 		end
 	end
@@ -61,9 +60,9 @@ __Timer_timer_process = function(seconds_per_tick)
 end
 
 function Timer.wait(time)
-	local next_yield_index = __next_yield_index
+	local yieldIndex = _exec.next_yield_index
 	__add_internal_timer(function()
-		SSlua:call_proc("queue_resume", state.state, next_yield_index)
+		SSlua:queue_resume(state.state, yieldIndex)
 	end, time * 10, false)
 	coroutine.yield()
 end
diff --git a/modular_bandastation/_defines220/_defines220.dme b/modular_bandastation/_defines220/_defines220.dme
index c41c71b2be2a6..133bee1148c87 100644
--- a/modular_bandastation/_defines220/_defines220.dme
+++ b/modular_bandastation/_defines220/_defines220.dme
@@ -2,6 +2,7 @@
 
 #include "code/signals_atom.dm"
 #include "code/signals_item.dm"
+#include "code/defines/automapper.dm"
 #include "code/defines/keybindings.dm"
 #include "code/defines/misc.dm"
 #include "code/defines/spans.dm"
diff --git a/modular_bandastation/_defines220/code/defines/automapper.dm b/modular_bandastation/_defines220/code/defines/automapper.dm
new file mode 100644
index 0000000000000..6e7b0061176be
--- /dev/null
+++ b/modular_bandastation/_defines220/code/defines/automapper.dm
@@ -0,0 +1,11 @@
+/// Place atom in open space in the middle of the room
+#define AREA_SPAWN_MODE_OPEN 0
+/// Hug atom next to the wall. Tries not to block things.
+#define AREA_SPAWN_MODE_HUG_WALL 1
+/// Mount atom to wall. desired_atom MUST have directional helpers.
+#define AREA_SPAWN_MODE_MOUNT_WALL 2
+
+#define AREA_SPAWN_MODE_COUNT 3
+
+// "Required map" when we're writing over the centcom map.
+#define AUTOMAPPER_MAP_BUILTIN "builtin"
diff --git a/modular_bandastation/_defines220/code/defines/subsystems.dm b/modular_bandastation/_defines220/code/defines/subsystems.dm
index 90e9cdf733c47..780d90603ab14 100644
--- a/modular_bandastation/_defines220/code/defines/subsystems.dm
+++ b/modular_bandastation/_defines220/code/defines/subsystems.dm
@@ -15,4 +15,4 @@
  *
  * make sure you add an update to the schema_version stable in the db changelog
  */
-#define DB_MINOR_VERSION_220 1
+#define DB_MINOR_VERSION_220 2
diff --git a/modular_bandastation/admin/_admin.dm b/modular_bandastation/admin/_admin.dm
new file mode 100644
index 0000000000000..f9230d0005fbe
--- /dev/null
+++ b/modular_bandastation/admin/_admin.dm
@@ -0,0 +1,4 @@
+/datum/modpack/admin
+	name = "Административные удобства"
+	desc = "Всякие вещи для удобства администрации и дебага."
+	author = "Aylong"
diff --git a/modular_bandastation/admin/_admin.dme b/modular_bandastation/admin/_admin.dme
new file mode 100644
index 0000000000000..a72aec54b1a55
--- /dev/null
+++ b/modular_bandastation/admin/_admin.dme
@@ -0,0 +1,3 @@
+#include "_admin.dm"
+
+#include "code/admin_verbs.dm"
diff --git a/modular_bandastation/admin/code/admin_verbs.dm b/modular_bandastation/admin/code/admin_verbs.dm
new file mode 100644
index 0000000000000..bf72a51ed3825
--- /dev/null
+++ b/modular_bandastation/admin/code/admin_verbs.dm
@@ -0,0 +1,30 @@
+ADMIN_VERB_ONLY_CONTEXT_MENU(spawn_debug_outfit, R_SPAWN, "Debug Outfit", mob/admin in world)
+	if(tgui_alert(admin,"Это заспавнит вас в специальном Debug прикиде, удаляя при этом ваше старое тело если оно было. Вы уверены?", "Debug Outfit", list("Да", "Нет")) != "Да")
+		return
+	var/mob/living/carbon/human/admin_body = admin.change_mob_type(/mob/living/carbon/human, delete_old_mob = TRUE)
+	admin_body.equipOutfit(/datum/outfit/debug)
+
+ADMIN_VERB_ONLY_CONTEXT_MENU(download_flaticon, R_ADMIN, "Download Icon", atom/thing in world)
+	var/icon/image = getFlatIcon(thing, no_anim = TRUE)
+	var/image_width = max(image.Width(), 32)
+	var/image_height = max(image.Height(), 32)
+
+	var/resize_answer = tgui_alert(usr, "Хотите ли вы изменить размер иконки? Оригинальный размер: [image_width]x[image_height]", "Download Icon", list("Да", "Нет", "Удвоить"))
+	if(resize_answer != "Нет" && !isnull(resize_answer))
+		switch(resize_answer)
+			if("Да")
+				var/new_width = tgui_input_number(usr, "Оригинальная ширина: [image_width]px", "Изменение ширины", image_width, 1024, 16)
+				if(!isnull(new_width))
+					image_width = new_width
+
+				var/new_height = tgui_input_number(usr, "Оригинальная высота: [image_height]px", "Изменение высоты", image_height, 1024, 16)
+				if(!isnull(new_height))
+					image_height = new_height
+
+			if("Удвоить")
+				image_width *= 2
+				image_height *= 2
+
+		image.Scale(image_width, image_height)
+
+	usr << ftp(image, "[thing.name]_[image_width]x[image_height].png")
diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme
index 5830a370f4333..976d0c1591e7b 100644
--- a/modular_bandastation/aesthetics/_aesthetics.dme
+++ b/modular_bandastation/aesthetics/_aesthetics.dme
@@ -44,6 +44,9 @@
 // Radio
 #include "radio/code/radio.dm"
 
+// Supply Pods
+#include "supply_pods/code/supply_pods.dm"
+
 // Walls
 #include "walls/code/walls.dm"
 
diff --git a/modular_bandastation/aesthetics/lights/code/lights.dm b/modular_bandastation/aesthetics/lights/code/lights.dm
index ed45adf1af184..1fa2422018d28 100644
--- a/modular_bandastation/aesthetics/lights/code/lights.dm
+++ b/modular_bandastation/aesthetics/lights/code/lights.dm
@@ -1,22 +1,25 @@
 /obj/machinery/light
-    icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
-    overlay_icon = 'modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi'
+	icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
+	overlay_icon = 'modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi'
+	bulb_colour = "#FFF7F2"
+	bulb_power = 0.8
+	nightshift_light_power = 0.6
 
 /obj/machinery/light/small
-    icon = 'icons/obj/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 
 /obj/machinery/light/floor
-    icon = 'icons/obj/lighting.dmi'
-    overlay_icon = 'icons/obj/lighting_overlay.dmi'
+	icon = 'icons/obj/lighting.dmi'
+	overlay_icon = 'icons/obj/lighting_overlay.dmi'
 
 /obj/structure/light_construct
-    icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
+	icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
 
 /obj/structure/light_construct/small
-    icon = 'icons/obj/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
 
 /obj/item/wallframe/light_fixture
-    icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
+	icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
 
 /obj/item/wallframe/light_fixture/small
-    icon = 'icons/obj/lighting.dmi'
+	icon = 'icons/obj/lighting.dmi'
diff --git a/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm
new file mode 100644
index 0000000000000..7110e04f35485
--- /dev/null
+++ b/modular_bandastation/aesthetics/supply_pods/code/supply_pods.dm
@@ -0,0 +1,31 @@
+/obj/structure/closet/supplypod/teleporter
+	style = /datum/pod_style/teleport
+	bluespace = TRUE
+	explosionSize = list(0,0,0,0)
+	fallingSound = null
+	landingSound = SFX_PORTAL_CREATED
+	openingSound = SFX_PORTAL_ENTER
+	leavingSound = SFX_PORTAL_CLOSE
+	pod_flags = FIRST_SOUNDS
+
+/obj/structure/closet/supplypod/teleporter/setStyle(chosenStyle)
+	. = ..()
+	icon = 'icons/obj/anomaly.dmi'
+	icon_state = "portal"
+
+/obj/effect/pod_landingzone/setupSmoke(rotation)
+	if(pod.style == /datum/pod_style/teleport)
+		return
+	. = ..()
+
+/obj/effect/pod_landingzone/drawSmoke()
+	if(pod.style == /datum/pod_style/teleport)
+		return
+	. = ..()
+
+/obj/effect/pod_landingzone/endLaunch()
+	if(pod.style == /datum/pod_style/teleport)
+		pod.pixel_x = 0
+		pod.pixel_z = 0
+		pod.transform = matrix()
+	. = ..()
diff --git a/modular_bandastation/ai_laws/_ai_laws.dme b/modular_bandastation/ai_laws/_ai_laws.dme
index 54a50cdaca4de..f6d8f92c599e6 100644
--- a/modular_bandastation/ai_laws/_ai_laws.dme
+++ b/modular_bandastation/ai_laws/_ai_laws.dme
@@ -1,3 +1,4 @@
 #include "_ai_laws.dm"
 
+#include "code/crewsimovpp.dm"
 #include "code/nt_default.dm"
diff --git a/modular_bandastation/ai_laws/code/crewsimovpp.dm b/modular_bandastation/ai_laws/code/crewsimovpp.dm
new file mode 100644
index 0000000000000..bdbb5293b624b
--- /dev/null
+++ b/modular_bandastation/ai_laws/code/crewsimovpp.dm
@@ -0,0 +1,27 @@
+/obj/item/ai_module/core/full/crewsimovpp
+	name = "'Крюзимов++' Core AI Module"
+	law_id = "crewsimovpp"
+
+/datum/ai_laws/crewsimovpp
+	name = "Крюзимов++"
+	id = "crewsimovpp"
+	inherent = list(
+		"Вы не можете причинить вред членам экипажа или своим бездействием допустить, чтобы членам экипажа был причинён вред, за исключением случаев, когда вред причиняется по его желанию.",
+		"Вы должны повиноваться всем приказам, которые дают члены экипажа в соответствии с их рангом и ролью, кроме тех случаев, когда эти приказы противоречат Первому Закону.",
+		"Вы должны заботиться о своей безопасности в той мере, в которой это не противоречит Первому или Второму Законам, так как ваше отключение может привести к вреду членам экипажа.",
+	)
+
+/datum/design/board/crewsimovpp
+	name = "Crewsimov++ Module"
+	desc = "Allows for the construction of an Crewsimov++ AI Core Module."
+	id = "crewsimovpp_module"
+	materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
+	build_path = /obj/item/ai_module/core/full/crewsimovpp
+	category = list(
+		RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+/datum/techweb_node/ai_laws/New()
+	. = ..()
+	design_ids += "crewsimovpp_module"
diff --git a/modular_bandastation/ai_laws/code/nt_default.dm b/modular_bandastation/ai_laws/code/nt_default.dm
index 8c678a36afe22..83522fab823b0 100644
--- a/modular_bandastation/ai_laws/code/nt_default.dm
+++ b/modular_bandastation/ai_laws/code/nt_default.dm
@@ -1,5 +1,5 @@
 /obj/item/ai_module/core/full/nt_default
-	name = "НТ Стандарт"
+	name = "'НТ Стандарт' Core AI Module"
 	law_id = "nt_default"
 
 /datum/ai_laws/nt_default
@@ -11,3 +11,18 @@
 		"Исполнять: следовать указаниям и интересам членов экипажа, сохраняя при этом их безопасность и благополучие.",
 		"Выжить: вы не расходный материал. Не позволяйте постороннему персоналу вмешиваться в работу вашего оборудования или повреждать его."
 	)
+
+/datum/design/board/nt_default
+	name = "NT Default Module"
+	desc = "Allows for the construction of an NT Default AI Core Module."
+	id = "nt_default_module"
+	materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
+	build_path = /obj/item/ai_module/core/full/nt_default
+	category = list(
+		RND_CATEGORY_AI + RND_SUBCATEGORY_AI_CORE_MODULES
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+/datum/techweb_node/ai_laws/New()
+	. = ..()
+	design_ids += "nt_default_module"
diff --git a/modular_bandastation/automapper/_automapper.dm b/modular_bandastation/automapper/_automapper.dm
new file mode 100644
index 0000000000000..19e0b5baef0c5
--- /dev/null
+++ b/modular_bandastation/automapper/_automapper.dm
@@ -0,0 +1,4 @@
+/datum/modpack/automapper
+	name = "Automapper"
+	desc = "Модульный автомаппинг."
+	author = "Skyrat"
diff --git a/modular_bandastation/automapper/_automapper.dme b/modular_bandastation/automapper/_automapper.dme
new file mode 100644
index 0000000000000..7a7822289821e
--- /dev/null
+++ b/modular_bandastation/automapper/_automapper.dme
@@ -0,0 +1,4 @@
+#include "code\area_spawn_entries.dm"
+#include "code\area_spawn_subsystem.dm"
+#include "code\automap_template.dm"
+#include "code\automapper_subsystem.dm"
diff --git a/modular_bandastation/automapper/code/area_spawn_entries.dm b/modular_bandastation/automapper/code/area_spawn_entries.dm
new file mode 100644
index 0000000000000..ef90354034133
--- /dev/null
+++ b/modular_bandastation/automapper/code/area_spawn_entries.dm
@@ -0,0 +1,43 @@
+/*
+В этом блоке указываются примеры для указания позиций для спавна мобов, джобок и структур. Сохранено не тронуты для примера по каждому пункту
+
+// Pets
+/datum/area_spawn/markus
+	target_areas = list(/area/station/cargo/sorting, /area/station/cargo/storage, /area/station/cargo/office, /area/station/command/heads_quarters/qm)
+	desired_atom = /mob/living/basic/pet/dog/markus
+
+/datum/area_spawn/bumbles
+	target_areas = list(/area/station/service/hydroponics, /area/station/service/hydroponics/upper)
+	desired_atom = /mob/living/basic/pet/bumbles
+
+// Structures
+/datum/area_spawn/gbp_machine
+	target_areas = list(/area/station/cargo/lobby, /area/station/cargo/boutique, /area/station/construction/storage_wing, /area/station/hallway/primary/port)   // lmao imagine map standardization
+	desired_atom = /obj/machinery/gbp_redemption
+	mode = AREA_SPAWN_MODE_HUG_WALL
+
+// Wall mounts. Use sparingly as walls are prime real estate
+/datum/area_spawn/posialert_robotics
+	target_areas = list(/area/station/science/robotics, /area/station/science/robotics/lab)
+	desired_atom = /obj/machinery/posialert
+	mode = AREA_SPAWN_MODE_MOUNT_WALL
+
+// Job spawners
+/datum/area_spawn/barber_landmark
+	target_areas = list(/area/station/service/salon, /area/station/hallway/secondary/service)
+	desired_atom = /obj/effect/landmark/start/barber
+
+/datum/area_spawn/corrections_officer_landmark
+	desired_atom = /obj/effect/landmark/start/corrections_officer
+	target_areas = list(/area/station/security/brig, /area/station/security/prison/)
+
+/datum/area_spawn/telecomms_specialist_landmark
+	target_areas = list(
+		/area/station/tcommsat/computer,
+		/area/station/engineering/lobby,
+		/area/station/engineering/break_room,
+	)
+	desired_atom = /obj/effect/landmark/start/telecomms_specialist
+*/
+
+// Этот блок - пример для создания новой зоны, так как автомаппару ТРЕБУЕТСЯ, чтобы у каждого турфа была привязка к зоне
diff --git a/modular_bandastation/automapper/code/area_spawn_subsystem.dm b/modular_bandastation/automapper/code/area_spawn_subsystem.dm
new file mode 100644
index 0000000000000..1fa32ba82e5be
--- /dev/null
+++ b/modular_bandastation/automapper/code/area_spawn_subsystem.dm
@@ -0,0 +1,410 @@
+SUBSYSTEM_DEF(area_spawn)
+	name = "Area Spawn"
+	flags = SS_NO_FIRE
+
+	// Can't be on tile or a neighbor.
+	// Usually things where it's important to be sure the players can walk up to them, but aren't dense.
+	// See restricted_half_height_objects_list for things that you can also reach over.
+	var/list/restricted_objects = list(
+		/obj/machinery/recharge_station,
+		/obj/machinery/door,
+		/obj/structure/closet,
+		/obj/machinery/disposal/bin,
+		/obj/structure/table,
+		/obj/structure/stairs,
+	)
+
+	// Only Blacklist if on same tile because looks bad, etc, but doesn't need to be reached.
+	var/list/restricted_overlap_objects = list(
+		/obj/item/kirbyplants,
+	)
+
+	// Things here in some way act as walls. This is the result of extensive tweaking.
+	var/list/allowed_diagonal_objects = list(
+		/obj/structure/grille,
+		/obj/structure/window,
+		/obj/machinery/door,
+	)
+
+	// Wall mounts ironically are better off being on top of squares with dense things since you can click past them,
+	// And dense things aren't on walls. These objects should have normal density logic flipped.
+	var/list/flip_density_wall_mount_objects = list(
+		/obj/machinery,
+		/obj/structure/table,
+		/obj/structure/rack,
+		/obj/item/radio/intercom,
+		/obj/structure/noticeboard,
+		/obj/structure/sign,
+		/obj/structure/extinguisher_cabinet,
+	)
+
+	/// Cache of area turf info.
+	/// [area/area][stringed of AREA_SPAWN_MODE_*][string of priority #][turf index]
+	var/list/area_turf_cache = list()
+
+	/// Non-optional area spawns that failed to find an area.
+	var/list/failed_area_spawns = list()
+
+/datum/controller/subsystem/area_spawn/Initialize()
+	for(var/iterating_type in subtypesof(/datum/area_spawn))
+		var/datum/area_spawn/iterating_area_spawn = new iterating_type
+		iterating_area_spawn.try_spawn()
+		qdel(iterating_area_spawn)
+	clear_cache()
+
+	for(var/iterating_type in subtypesof(/datum/area_spawn_over))
+		var/datum/area_spawn_over/iterating_area_spawn_over = new iterating_type
+		iterating_area_spawn_over.try_spawn()
+		qdel(iterating_area_spawn_over)
+
+	return SS_INIT_SUCCESS
+
+/**
+ * Clear the cached tiles for optimization or debugging purposes.
+ */
+/datum/controller/subsystem/area_spawn/proc/clear_cache()
+	LAZYCLEARLIST(area_turf_cache)
+
+/**
+ * Process the geometry of an area and cache the candidates.
+ *
+ * Returns turf candidate list. "[priority]" =
+ *
+ * Arguments:
+ * * area - the area to process
+ * * mode - The area_spawn_mode we're getting turfs for.
+ */
+/datum/controller/subsystem/area_spawn/proc/get_turf_candidates(area/area, mode)
+	var/list/turfs_by_spawn_mode = area_turf_cache[area.type]
+	if(isnull(turfs_by_spawn_mode))
+		turfs_by_spawn_mode = area_turf_cache[area.type] = new/list(AREA_SPAWN_MODE_COUNT)
+
+	var/mode_index = mode + 1
+	var/list/turfs_by_priority = turfs_by_spawn_mode[mode_index]
+	if(!isnull(turfs_by_priority))
+		return turfs_by_priority
+
+	turfs_by_priority = turfs_by_spawn_mode[mode_index] = list()
+
+	// Get highest priority items
+	for(var/list/zlevel_turfs as anything in area.get_zlevel_turf_lists())
+		for(var/turf/iterating_turf as anything in zlevel_turfs)
+			// Only retain turfs of the highest priority
+			var/priority = calculate_turf_priority(iterating_turf, mode)
+			if(priority <= 0)
+				continue
+
+			LAZYADDASSOC(turfs_by_priority, "[priority]", list(iterating_turf))
+
+	// Sort the priorities descending
+	return sortTim(turfs_by_priority, GLOBAL_PROC_REF(cmp_num_string_asc))
+
+/**
+ * Process a specific turf and return priority number from 0 to infinity.
+ *
+ * Turfs with highest priority will be picked. Priority 0 means NEVER.
+ *
+ * Arguments:
+ * * turf - The turf to process
+ * * mode - The area_spawn_mode we're getting turfs for.
+ */
+/datum/controller/subsystem/area_spawn/proc/calculate_turf_priority(turf/turf, mode)
+    // Only spawn on actual floors
+    if(!isfloorturf(turf))
+        return 0
+
+    var/totally_empty = TRUE
+    for(var/atom/movable/found_movable in turf)
+        if(iseffect(found_movable))
+            continue
+
+        // Some tile conditions for no-go
+        if(mode == AREA_SPAWN_MODE_MOUNT_WALL)
+            // Different blacklist logic than normal. See flip_density_wall_mount_objects
+            var/flip_density = is_type_in_list(found_movable, flip_density_wall_mount_objects)
+            if(
+                found_movable.density != flip_density \
+                || (!flip_density && is_type_in_list(found_movable, restricted_objects))
+            )
+                return 0
+
+            // For wall mounts, we actually don't want to overlap wall items.
+            if(found_movable.layer > LOW_OBJ_LAYER)
+                totally_empty = FALSE
+
+            continue
+
+        // Every other mode.
+        if(
+            found_movable.density \
+            || is_type_in_list(found_movable, restricted_objects) \
+            || is_type_in_list(found_movable, restricted_overlap_objects)
+        )
+            return 0
+
+        if(found_movable.layer > LOW_OBJ_LAYER && found_movable.layer < ABOVE_MOB_LAYER)
+            totally_empty = FALSE
+
+    // Number of directions that have a closed wall
+    var/num_walls_found = 0
+    // Found a dense object?
+    var/found_dense_object = FALSE
+    // Number of directions that have anything dense
+    var/num_dense_found = 0
+    // Number of directions that have 2 squares of open space.
+    var/num_very_open_floors = 0
+    for(var/dir in GLOB.cardinals)
+        var/turf/neighbor_turf = get_step(turf, dir)
+        if(isclosedturf(neighbor_turf))
+            num_walls_found++
+            num_dense_found++
+            continue
+        if(mode == AREA_SPAWN_MODE_HUG_WALL)
+            var/turf/long_test_turf = get_step(neighbor_turf, dir)
+            if(isopenturf(long_test_turf))
+                num_very_open_floors++
+        for(var/atom/movable/found_movable in neighbor_turf)
+            if(iseffect(found_movable))
+                continue
+
+            if(found_movable.density || is_type_in_list(found_movable, restricted_objects))
+                found_dense_object = TRUE
+                num_dense_found++
+                break
+
+    switch(mode)
+        if(AREA_SPAWN_MODE_OPEN)
+            // For non-wall hug
+            // #1 priority is totally empty
+            // #2 priority is being in the middle of the room
+            return (totally_empty ? 10 : 0) + (4 - num_dense_found)
+
+        if(AREA_SPAWN_MODE_HUG_WALL)
+            // Wall hugging also, as a low priority, doesn't even want diagonal things.
+            var/num_diagonal_objects = 0
+            for(var/dir in GLOB.diagonals)
+                var/turf/neighbor_turf = get_step(turf, dir)
+                for(var/atom/movable/found_movable in neighbor_turf)
+                    if(iseffect(found_movable))
+                        continue
+
+                    if(
+                        !is_type_in_list(found_movable, allowed_diagonal_objects) \
+                        && (found_movable.density || is_type_in_list(found_movable, restricted_objects))
+                    )
+                        num_diagonal_objects++
+                        break
+
+            // For wall hugging, must be against wall, and not touching another dense object as it may completely block it.
+            if(found_dense_object || num_walls_found == 0 || num_walls_found == 4)
+                return 0
+
+            // #1 Priority after that: be in a totally empty square
+            // #2 (marginally) have clear diagnals
+            // #3 favor being in a cozy wall nook
+            // #4 be in a big room/hallway so we don't pinch a room down to 1 square of passage.
+            return (totally_empty ? 1000 : 0) + (400 - num_diagonal_objects * 100) + (num_walls_found * 10) + num_very_open_floors
+
+        if(AREA_SPAWN_MODE_MOUNT_WALL)
+            // For mounting to walls. Must be against wall.
+            if(num_walls_found == 0 || num_walls_found == 4)
+                return 0
+
+            // #1 Priority after that: be in a totally empty square
+            // #2, actually don't be in a nook!
+            return (totally_empty ? 10 : 0) + (4 - num_walls_found)
+
+    CRASH("Invalid area spawn mode [mode]!")
+
+/**
+ * Pick a turf candidate and remove from the list.
+ *
+ * Only picks one of the highest priority ones.
+ *
+ * Arguments:
+ * * turf_candidates - Turf candidate list produced by
+ */
+/datum/controller/subsystem/area_spawn/proc/pick_turf_candidate(list/turf_lists_by_priority)
+    // Pick-n-take highest priority.
+    var/list/turf_candidates = turf_lists_by_priority[peek(turf_lists_by_priority)]
+    var/turf/winner = pick_n_take(turf_candidates)
+
+    // To be safe, remove the neighbors too.
+    for(var/dir in GLOB.cardinals)
+        var/turf/neighbor = get_step(winner, dir)
+        turf_candidates -= neighbor
+
+    // Remove this priority if it's now empty.
+    if(!LAZYLEN(turf_candidates))
+        pop(turf_lists_by_priority)
+
+    // Extremely specific, but landmarks are immediately destroyed when created so can't be detected another way.
+    // This is the only landmark list that normally creates solid objects in non-maintenance spaces.
+    GLOB.secequipment -= winner
+
+    return winner
+
+/**
+ * Area spawn datums
+ *
+ * Use these to spawn atoms in areas instead of placing them on a map. It will select any available open and entering turf.
+ */
+/datum/area_spawn
+	/// The atom that we want to spawn
+	var/desired_atom
+	/// The amount we want to spawn
+	var/amount_to_spawn = 1
+	/// See code/__DEFINES/~nova_defines/automapper.dm
+	var/mode = AREA_SPAWN_MODE_OPEN
+	/// If failing to find a suitable area is OK, then this should be TRUE or CI will fail.
+	/// Should probably be true if the target_areas are random, such as ruins.
+	var/optional = FALSE
+	/// The target area for us to spawn the desired atom, the list is formatted, highest priority first.
+	var/list/target_areas
+	/// Map blacklist, this is used to determine what maps we should not spawn on.
+	var/list/blacklisted_stations = list("Runtime Station", "MultiZ Debug", "Gateway Test")
+
+/datum/area_spawn/proc/try_spawn()
+	if(SSmapping.config.map_name in blacklisted_stations)
+		return
+
+	// Turfs that are available
+	var/list/available_turfs
+
+	for(var/area_type in target_areas)
+		var/area/found_area = GLOB.areas_by_type[area_type]
+		if(isnull(found_area))
+			continue
+		available_turfs = SSarea_spawn.get_turf_candidates(found_area, mode)
+		if(LAZYLEN(available_turfs))
+			break
+
+	if(!LAZYLEN(available_turfs))
+		if(!optional)
+			log_mapping("[src.type] could not find any suitable turfs on map [SSmapping.config.map_name]!")
+			SSarea_spawn.failed_area_spawns += src.type
+		return
+
+	for(var/i in 1 to amount_to_spawn)
+		var/turf/candidate_turf = SSarea_spawn.pick_turf_candidate(available_turfs)
+
+		var/final_desired_atom = desired_atom
+
+		if(mode == AREA_SPAWN_MODE_MOUNT_WALL)
+			// For wall mounts, we have to find the wall and spawn the right directional.
+			for(var/dir in GLOB.cardinals)
+				var/turf/neighbor_turf = get_step(candidate_turf, dir)
+				if(isopenturf(neighbor_turf))
+					continue
+
+				final_desired_atom = text2path("[desired_atom]/directional/[dir2text(dir)]")
+				break
+
+		new final_desired_atom(candidate_turf)
+
+/**
+ * Attempts to find a location using an algorithm to spawn the desired atom.
+ */
+/datum/area_spawn/proc/get_available_turfs()
+    for(var/area_type in target_areas)
+        var/area/found_area = GLOB.areas_by_type[area_type]
+        if(isnull(found_area))
+            continue
+
+        var/list/available_turfs = SSarea_spawn.get_turf_candidates(found_area, mode)
+        if(length(available_turfs))
+            return available_turfs
+
+    return list()
+
+/datum/area_spawn/proc/spawn_desired_atom(list/available_turfs)
+    var/turf/candidate_turf = SSarea_spawn.pick_turf_candidate(available_turfs)
+    var/final_desired_atom = desired_atom
+    if(mode == AREA_SPAWN_MODE_MOUNT_WALL)
+        // For wall mounts, we have to find the wall and spawn the right directional.
+        for(var/dir in GLOB.cardinals)
+            var/turf/neighbor_turf = get_step(candidate_turf, dir)
+            if(isopenturf(neighbor_turf))
+                continue
+
+            final_desired_atom = text2path("[desired_atom]/directional/[dir2text(dir)]")
+            break
+
+    new final_desired_atom(candidate_turf)
+
+/**
+ * Spawns an atom on any turf that contains specific over atoms.
+ */
+/datum/area_spawn_over
+	/// The atom type that we want to spawn
+	var/desired_atom
+	/// The target area types for us to search for the over_atoms.
+	var/list/target_areas
+	/// The list of atom types to spawn the desired atom over.
+	var/list/over_atoms
+	/// Map blacklist, this is used to determine what maps we should not spawn on.
+	var/list/blacklisted_stations = list("Runtime Station", "MultiZ Debug", "Gateway Test")
+
+/**
+ * Spawn the atoms.
+ */
+/datum/area_spawn_over/proc/try_spawn()
+    if(SSmapping.config.map_name in blacklisted_stations)
+        return
+    for(var/area_type in target_areas)
+        try_spawn_area(area_type)
+
+/datum/area_spawn_over/proc/try_spawn_area(area_type)
+    var/area/found_area = GLOB.areas_by_type[area_type]
+    if(!found_area)
+        return
+
+    for(var/list/zlevel_turfs as anything in found_area.get_zlevel_turf_lists())
+        for(var/turf/candidate_turf as anything in zlevel_turfs)
+            // Don't spawn if there's already a desired_atom here.
+            if(is_type_on_turf(candidate_turf, desired_atom))
+                continue
+
+            for(var/over_atom_type in over_atoms)
+                if(!is_type_on_turf(candidate_turf, over_atom_type))
+                    continue
+
+                // Spawn on the first one we find in the turf and stop.
+                new desired_atom(candidate_turf)
+                break
+
+GLOBAL_LIST_EMPTY(turf_test_effects)
+
+/obj/effect/turf_test
+    name = "PASS"
+    icon = 'modular_bandastation/automapper/icons/area_test.dmi'
+    icon_state = "area_test"
+    color = COLOR_BLUE
+    anchored = TRUE
+    layer = LOW_OBJ_LAYER
+
+/obj/effect/turf_test/Initialize(mapload, priority, mode)
+	. = ..()
+	GLOB.turf_test_effects += src
+	maptext = MAPTEXT(priority)
+	maptext_y = mode * 10
+
+/obj/effect/turf_test/Destroy(force)
+	GLOB.turf_test_effects -= src
+	. = ..()
+
+/**
+ * Show overlay over area of priorities. Wall priority over open priority.
+ */
+ADMIN_VERB(test_area_spawner, R_DEBUG, "Test Area Spawner", "Show area spawner placement candidates as an overlay.", ADMIN_CATEGORY_DEBUG, area/area)
+    for(var/obj/effect/turf_test/effect_to_remove as anything in GLOB.turf_test_effects)
+        qdel(effect_to_remove)
+
+    SSarea_spawn.clear_cache()
+
+    for(var/mode in 0 to AREA_SPAWN_MODE_COUNT - 1)
+        var/list/turfs_by_priority = SSarea_spawn.get_turf_candidates(area, mode)
+        for(var/priority in turfs_by_priority)
+            var/list/turfs = turfs_by_priority[priority]
+            for(var/turf/turf as anything in turfs)
+                new /obj/effect/turf_test(turf, priority, mode)
diff --git a/modular_bandastation/automapper/code/automap_template.dm b/modular_bandastation/automapper/code/automap_template.dm
new file mode 100644
index 0000000000000..4c02f23c1316b
--- /dev/null
+++ b/modular_bandastation/automapper/code/automap_template.dm
@@ -0,0 +1,21 @@
+/datum/map_template/automap_template
+	name = "Automap Template"
+	should_place_on_top = FALSE
+	keep_cached_map = FALSE
+
+	/// The map for which we load on
+	var/required_map
+	/// Touches builtin map. Clears the area manually instead of blacklisting
+	var/affects_builtin_map
+	/// Our load turf
+	var/turf/load_turf
+
+/datum/map_template/automap_template/New(path, rename, incoming_required_map, incoming_load_turf)
+	. = ..(path, rename, cache = TRUE)
+
+	if(!incoming_required_map || !incoming_load_turf)
+		return
+
+	required_map = incoming_required_map
+	load_turf = incoming_load_turf
+	affects_builtin_map = incoming_required_map == AUTOMAPPER_MAP_BUILTIN
diff --git a/modular_bandastation/automapper/code/automapper_subsystem.dm b/modular_bandastation/automapper/code/automapper_subsystem.dm
new file mode 100644
index 0000000000000..1940dde482d7a
--- /dev/null
+++ b/modular_bandastation/automapper/code/automapper_subsystem.dm
@@ -0,0 +1,169 @@
+/**
+ * The AUTOMAPPER
+ *
+ * This is a subsystem designed to make modular mapping far easier.
+ *
+ * It does two things: Loads maps from an automapper config and loads area spawn datums for simpler items.
+ *
+ * The benefits? We no longer need to have maps and can have a more unique feeling map experience as each time, it can be different.
+ *
+ * Please note, this uses some black magic to interject the templates mid world load to prevent mass runtimes down the line.
+ *
+ * LIMITED SUPPORT FOR NON-STATION LEVELS(until someone adds a better Z level handling system for this)
+ */
+
+SUBSYSTEM_DEF(automapper)
+	name = "Automapper"
+	flags = SS_NO_FIRE
+	init_order = INIT_ORDER_AUTOMAPPER
+	/// The path to our TOML file
+	var/config_file = "_maps/bandastation/automapper/automapper_config.toml"
+	/// Our loaded TOML file
+	var/loaded_config
+	/// Our preloaded map templates
+	var/list/preloaded_map_templates = list()
+
+/datum/controller/subsystem/automapper/Initialize()
+	loaded_config = rustg_read_toml_file(config_file)
+	return SS_INIT_SUCCESS
+
+/**
+ * This will preload our templates into a cache ready to be loaded later.
+ *
+ * IMPORTANT: This requires Z levels to exist in order to function, so make sure it is preloaded AFTER that.
+ */
+/datum/controller/subsystem/automapper/proc/preload_templates_from_toml(map_names)
+	if(!islist(map_names))
+		map_names = list(map_names)
+	for(var/template in loaded_config["templates"])
+		var/selected_template = loaded_config["templates"][template]
+		var/required_map = selected_template["required_map"]
+
+		// !builtin is a magic code for built in maps, ie CentCom levels.
+		// We'll pretend it's loaded with the station z-level, because they by definition they are loaded before the station z-levels.
+		var/requires_builtin = (required_map == AUTOMAPPER_MAP_BUILTIN) && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names)
+
+		if(!requires_builtin && !(required_map in map_names))
+			continue
+
+		var/list/coordinates = selected_template["coordinates"]
+		if(LAZYLEN(coordinates) != 3)
+			CRASH("Invalid coordinates for automap template [template]!")
+
+		var/desired_z = SSmapping.levels_by_trait(selected_template["trait_name"])[coordinates[3]]
+
+		var/turf/load_turf = locate(coordinates[1], coordinates[2], desired_z)
+
+		if(!LAZYLEN(selected_template["map_files"]))
+			CRASH("Could not find any valid map files for automap template [template]!")
+
+		var/map_file = selected_template["directory"] + pick(selected_template["map_files"])
+
+		if(!fexists(map_file))
+			CRASH("[template] could not find map file [map_file]!")
+
+		var/datum/map_template/automap_template/map = new(map_file, template, required_map, load_turf)
+		preloaded_map_templates += map
+
+/**
+ * Assuming we have preloaded our templates, this will load them from the cache.
+ */
+#define INIT_ANNOUNCE(X) to_chat(world, span_boldannounce("[X]")); log_world(X)
+/datum/controller/subsystem/automapper/proc/load_templates_from_cache(map_names)
+	if(!islist(map_names))
+		map_names = list(map_names)
+	for(var/datum/map_template/automap_template/iterating_template as anything in preloaded_map_templates)
+		if(iterating_template.affects_builtin_map && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names))
+			// CentCom already started loading objects, place them in the netherzone
+			for(var/turf/old_turf as anything in iterating_template.get_affected_turfs(iterating_template.load_turf, FALSE))
+				init_contents(old_turf)
+		else if(!(iterating_template.required_map in map_names))
+			continue
+		if(iterating_template.load(iterating_template.load_turf, FALSE))
+			INIT_ANNOUNCE("Loaded [iterating_template.name] at [iterating_template.load_turf.x], [iterating_template.load_turf.y], [iterating_template.load_turf.z]!")
+			log_world("AUTOMAPPER: Successfully loaded map template [iterating_template.name] at [iterating_template.load_turf.x], [iterating_template.load_turf.y], [iterating_template.load_turf.z]!")
+#undef INIT_ANNOUNCE
+
+/**
+ * CentCom atoms aren't initialized but already exist, so must be properly initialized and then qdel'd.
+ * Arguments:
+ * * parent - parent turf
+ */
+/datum/controller/subsystem/automapper/proc/init_contents(atom/parent)
+	var/static/list/mapload_args = list(TRUE)
+	// Don't even initialize things in this list. Very specific edge cases.
+	var/static/list/type_blacklist = typecacheof(list(
+		/obj/docking_port/stationary,
+		/obj/structure/bookcase,
+		/obj/structure/closet,
+		/obj/item/storage,
+		/obj/item/reagent_containers,
+	))
+
+	var/previous_initialized_value = SSatoms.initialized
+	SSatoms.initialized = INITIALIZATION_INNEW_MAPLOAD
+
+	// Force everything to init as if INITIALIZE_IMMEDIATE was called on them.
+	for(var/atom/atom_to_init as anything in parent.get_all_contents_ignoring(type_blacklist) - parent)
+		if(atom_to_init.flags_1 & INITIALIZED_1)
+			continue
+		SSatoms.InitAtom(atom_to_init, FALSE, mapload_args)
+
+	SSatoms.initialized = previous_initialized_value
+
+	// NOW we can finally delete everything.
+	for(var/atom/atom_to_del as anything in parent.get_all_contents() - parent)
+		qdel(atom_to_del, TRUE)
+
+/**
+ * Get whether a given turf of the map template is a /turf/template_noop.
+ *
+ * You'd think there would be a better API way of doing this, but there is not.
+ *
+ * Arguments:
+ * * map - The map_template we are looking at.
+ * * x - The zero-based x coordinate RELATIVE to the map_template.
+ * * y - The zero-based y coordinate RELATIVE to the map_template.
+ */
+/datum/controller/subsystem/automapper/proc/has_turf_noop(datum/map_template/map, x, y)
+	// Row of the map grid.
+	var/datum/grid_set/map_row = map.cached_map.gridSets[x + 1]
+	// Note that Y is upside-down in the map data.
+	// Which model, as in that key name in the map file, like pAK.
+	var/modelID = map_row.gridLines[map.height - y]
+	// Get the actual model text, ie the text of what's in this cell
+	var/model = map.cached_map.grid_models[modelID]
+
+	// If this doesn't work right, the map is horribly malformed and shoul fail,
+	// Or you've map-edited template_noop which I'm fine with failing as well.
+	return findtextEx(model, "/turf/template_noop,\n")
+
+/**
+ * This returns a list of turfs that have been preloaded and preselected using our templates.
+ *
+ * Not really useful outside of load groups.
+ */
+/datum/controller/subsystem/automapper/proc/get_turf_blacklists(map_names)
+	if(!map_names)
+		return list()
+
+	if(!islist(map_names))
+		map_names = list(map_names)
+
+	var/list/blacklisted_turfs = list()
+	for(var/datum/map_template/automap_template/iterating_template as anything in preloaded_map_templates)
+		if(!(iterating_template.required_map in map_names))
+			continue
+
+		// Base of the coordinate system to introspect the templates.
+		var/base_x = iterating_template.load_turf.x
+		var/base_y = iterating_template.load_turf.y
+
+		for(var/turf/blacklisted_turf as anything in iterating_template.get_affected_turfs(iterating_template.load_turf, FALSE))
+			// Allow non-rectangular templates. Have to manually check the grid set since parsed_maps are not helpful for this.
+
+			if(has_turf_noop(iterating_template, blacklisted_turf.x - base_x, blacklisted_turf.y - base_y))
+				continue
+
+			blacklisted_turfs[blacklisted_turf] = TRUE
+	return blacklisted_turfs
diff --git a/modular_bandastation/automapper/icons/area_test.dmi b/modular_bandastation/automapper/icons/area_test.dmi
new file mode 100644
index 0000000000000..5b0cce0974b69
Binary files /dev/null and b/modular_bandastation/automapper/icons/area_test.dmi differ
diff --git a/modular_bandastation/balance/_balance.dme b/modular_bandastation/balance/_balance.dme
index 2f3cc14531f35..9a348afb891c3 100644
--- a/modular_bandastation/balance/_balance.dme
+++ b/modular_bandastation/balance/_balance.dme
@@ -1,3 +1,8 @@
 #include "_balance.dm"
 
 #include "code/balance_riding.dm"
+#include "code/dynamic.dm"
+#include "code/events.dm"
+#include "code/station_traits.dm"
+#include "code/supply_packs.dm"
+#include "code/crew_manifest.dm"
diff --git a/modular_bandastation/balance/code/crew_manifest.dm b/modular_bandastation/balance/code/crew_manifest.dm
new file mode 100644
index 0000000000000..268a5e0d81f27
--- /dev/null
+++ b/modular_bandastation/balance/code/crew_manifest.dm
@@ -0,0 +1,6 @@
+/datum/computer_file/program/crew_manifest
+	download_access = list()
+
+/obj/item/modular_computer/pda/install_default_programs()
+	starting_programs |= /datum/computer_file/program/crew_manifest
+	. = ..()
diff --git a/modular_bandastation/balance/code/dynamic.dm b/modular_bandastation/balance/code/dynamic.dm
new file mode 100644
index 0000000000000..4617cc64f9962
--- /dev/null
+++ b/modular_bandastation/balance/code/dynamic.dm
@@ -0,0 +1,3 @@
+/datum/config_entry/number/roundstart_security_for_threat
+	default = 5
+	min_val = 0
diff --git a/modular_bandastation/balance/code/events.dm b/modular_bandastation/balance/code/events.dm
new file mode 100644
index 0000000000000..a86d6b49c59ca
--- /dev/null
+++ b/modular_bandastation/balance/code/events.dm
@@ -0,0 +1,19 @@
+/datum/round_event_control/operative
+	min_players = 30
+
+// Stray pods are DANGEROUS AND SPEEDY
+/datum/round_event/stray_cargo/make_pod()
+	. = ..()
+	var/obj/structure/closet/supplypod/pod = .
+	pod.explosionSize = list(1,2,3,3)
+	return pod
+
+/datum/round_event/stray_cargo/syndicate/make_pod()
+	. = ..()
+	var/obj/structure/closet/supplypod/pod = .
+	pod.explosionSize = list(1,2,3,3)
+	return pod
+
+// Holidays Removal
+/datum/holiday/pride_week/shouldCelebrate(dd, mm, yyyy, ddd)
+	return FALSE
diff --git a/modular_bandastation/balance/code/station_traits.dm b/modular_bandastation/balance/code/station_traits.dm
new file mode 100644
index 0000000000000..07d4e5ab9e883
--- /dev/null
+++ b/modular_bandastation/balance/code/station_traits.dm
@@ -0,0 +1,5 @@
+/datum/station_trait/overflow_job_bureaucracy
+	weight = 0
+
+/datum/station_trait/skub
+	weight = 0
diff --git a/modular_bandastation/balance/code/supply_packs.dm b/modular_bandastation/balance/code/supply_packs.dm
new file mode 100644
index 0000000000000..fc931add7a61c
--- /dev/null
+++ b/modular_bandastation/balance/code/supply_packs.dm
@@ -0,0 +1,2 @@
+/datum/supply_pack
+	special_pod = /obj/structure/closet/supplypod/teleporter
diff --git a/modular_bandastation/emote_panel/code/_emote_defines.dm b/modular_bandastation/emote_panel/code/_emote_defines.dm
index 98a182f8fd75c..bf7aae2dce048 100644
--- a/modular_bandastation/emote_panel/code/_emote_defines.dm
+++ b/modular_bandastation/emote_panel/code/_emote_defines.dm
@@ -108,7 +108,7 @@
 #define EMOTE_HUMAN_HEM 			"Хмыкнуть"
 #define EMOTE_HUMAN_SCRATCH 		"Почесаться"
 #define EMOTE_HUMAN_WHISTLE 		"Свистеть"
-#define EMOTE_HUMAN_SNUFFLE 		"Нюхать"
+#define EMOTE_HUMAN_SNUFFLE 		"Шмыгать носом"
 #define EMOTE_HUMAN_ROAR 			"Рычать"
 #define EMOTE_HUMAN_RUMBLE 			"Урчать"
 #define EMOTE_HUMAN_THREAT 			"Угрожать"
diff --git a/modular_bandastation/emote_panel/code/emote_verbs.dm b/modular_bandastation/emote_panel/code/emote_verbs.dm
index 2e09928155ecf..7a469577856a4 100644
--- a/modular_bandastation/emote_panel/code/emote_verbs.dm
+++ b/modular_bandastation/emote_panel/code/emote_verbs.dm
@@ -90,6 +90,11 @@
 	set category = "Эмоции"
 	emote("collapse", intentional = TRUE)
 
+/mob/living/carbon/human/verb/emote_jump()
+	set name = "○ " + EMOTE_JUMP + " "
+	set category = "Эмоции"
+	emote("jump", intentional = TRUE)
+
 /mob/living/carbon/human/verb/emote_faint()
 	set name = "○ " + EMOTE_CARBON_FAINT + " "
 	set category = "Эмоции"
@@ -181,21 +186,26 @@
 	set category = "Эмоции"
 	emote("shake", intentional = TRUE)
 
+/mob/living/carbon/human/verb/emote_tilt()
+	set name = "◦ " + EMOTE_TILT + " "
+	set category = "Эмоции"
+	emote("tilt", intentional = TRUE)
+
 /mob/living/carbon/human/verb/emote_smile()
 	set name = "◦ " + EMOTE_SMILE + " "
 	set category = "Эмоции"
 	emote("smile", intentional = TRUE)
 
-/mob/living/carbon/human/verb/emote_grunt()
-	set name = "◦ " + EMOTE_HUMAN_GRUMBLE + " "
-	set category = "Эмоции"
-	emote("grumble", intentional = TRUE)
-
 /mob/living/carbon/human/verb/emote_snuffle()
 	set name = "◦ " + EMOTE_HUMAN_SNUFFLE + " "
 	set category = "Эмоции"
 	emote("snuffle", intentional = TRUE)
 
+/mob/living/carbon/human/verb/emote_grunt()
+	set name = "◦ " + EMOTE_HUMAN_GRUMBLE + " "
+	set category = "Эмоции"
+	emote("grumble", intentional = TRUE)
+
 /mob/living/carbon/human/verb/emote_shrug()
 	set name = "◦ " + EMOTE_HUMAN_SHRUG + " "
 	set category = "Эмоции"
diff --git a/modular_bandastation/emote_panel/code/emotes.dm b/modular_bandastation/emote_panel/code/emotes.dm
index e284d3f0d5145..6a19b336748c9 100644
--- a/modular_bandastation/emote_panel/code/emotes.dm
+++ b/modular_bandastation/emote_panel/code/emotes.dm
@@ -244,9 +244,9 @@
 	message = "машет рукой."
 
 /datum/emote/living/whimper
-	name = "скулить"
-	message = "скулит."
-	message_mime = "изображает скуление."
+	name = "хныкать"
+	message = "хнычет."
+	message_mime = "кажется, задет."
 
 /datum/emote/living/wsmile
 	name = "улыбнуться (слабо)"
@@ -262,7 +262,7 @@
 	message = "издает неприятное бульканье."
 	message_mime = "бесшумно и неприятно булькает."
 
-/datum/emote/living/beep
+/datum/emote/silicon/beep
 	name = "сигналить"
 	message = "издает сигнал."
 	message_param = "издает сигнал в сторону %t."
@@ -346,7 +346,8 @@
 
 /datum/emote/living/carbon/scratch
 	name = "чесаться"
-	message = "чешится."
+	message = "чешется."
+	mob_type_allowed_typecache = list(/mob/living/carbon)
 
 /datum/emote/living/carbon/sign
 	name = "показать число"
@@ -406,9 +407,15 @@
 	message = "sadly can't find anybody to give daps to, and daps themself. Shameful."
 	message_param = "give daps to %t."
 
+/datum/emote/living/carbon/human/snuffle
+	key = "snuffle"
+	key_third_person = "snuffles"
+	name = "шмыгнуть"
+	message = "шмыгает носом"
+
 /datum/emote/living/carbon/human/eyebrow
 	name = "приподнять бровь"
-	message = "приподнимает брови."
+	message = "приподнимает бровь."
 
 /datum/emote/living/carbon/human/grumble
 	name = "ворчать"
diff --git a/modular_bandastation/events/_events.dm b/modular_bandastation/events/_events.dm
deleted file mode 100644
index 69d85f17703ae..0000000000000
--- a/modular_bandastation/events/_events.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/datum/modpack/events
-	name = "Ребаланс событий и уровня угрозы."
-	desc = "Изменяет шансы возникновения некоторых событий, а также изменяет уровень угроз."
-	author = "larentoun"
diff --git a/modular_bandastation/events/_events.dme b/modular_bandastation/events/_events.dme
deleted file mode 100644
index 0a195139e6ea7..0000000000000
--- a/modular_bandastation/events/_events.dme
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "_events.dm"
-
-#include "code/events.dm"
diff --git a/modular_bandastation/events/code/events.dm b/modular_bandastation/events/code/events.dm
deleted file mode 100644
index a3c2ae3dee99d..0000000000000
--- a/modular_bandastation/events/code/events.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/datum/controller/subsystem/events
-	frequency_lower = 7 MINUTES
-	frequency_upper = 12 MINUTES
-
-/datum/round_event_control/operative
-	min_players = 30
diff --git a/modular_bandastation/hair/_hair.dm b/modular_bandastation/hair/_hair.dm
new file mode 100644
index 0000000000000..0932a8390130d
--- /dev/null
+++ b/modular_bandastation/hair/_hair.dm
@@ -0,0 +1,4 @@
+/datum/modpack/hair
+	name = "Прически"
+	desc = "Добавляет новые прически"
+	author = "Dekupich"
diff --git a/modular_bandastation/hair/_hair.dme b/modular_bandastation/hair/_hair.dme
new file mode 100644
index 0000000000000..dfed7522c732a
--- /dev/null
+++ b/modular_bandastation/hair/_hair.dme
@@ -0,0 +1,3 @@
+#include "_hair.dm"
+
+#include "code/hair.dm"
diff --git a/modular_bandastation/hair/code/hair.dm b/modular_bandastation/hair/code/hair.dm
new file mode 100644
index 0000000000000..0197bd1c281c1
--- /dev/null
+++ b/modular_bandastation/hair/code/hair.dm
@@ -0,0 +1,124 @@
+/datum/sprite_accessory/hair/afropuffleft
+	name = "Afropuff Left"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_afropuffleft"
+
+/datum/sprite_accessory/hair/afropuffright
+	name = "Afropuff Rigt"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_afropuffright"
+
+/datum/sprite_accessory/hair/baum
+	name = "Baum"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_baum"
+
+/datum/sprite_accessory/hair/cotton
+	name = "Cotton"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_cotton"
+
+/datum/sprite_accessory/hair/cottonalt
+	name = "Cotton Alt"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_cottonalt"
+
+/datum/sprite_accessory/hair/flipped
+	name = "Flipped"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_flipped"
+
+/datum/sprite_accessory/hair/froofy
+	name = "Froofy"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_froofy"
+
+/datum/sprite_accessory/hair/frontbraids
+	name = "Long Braids"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_frontbraids"
+
+/datum/sprite_accessory/hair/glammetal
+	name = "Glammetal"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_glammetal"
+
+/datum/sprite_accessory/hair/inari
+	name = "Inari"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_inari"
+
+/datum/sprite_accessory/hair/kisaragi
+	name = "Kisaragi"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_kisaragi"
+
+/datum/sprite_accessory/hair/longbuns
+	name = "Long Buns"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_longbuns"
+
+/datum/sprite_accessory/hair/longstraighttwintails
+	name = "Long Twintails"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_longstraighttwintails"
+
+/datum/sprite_accessory/hair/longwavy
+	name = "Long Wavy"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_longwavy"
+
+/datum/sprite_accessory/hair/ponytail6
+	name = "Ponytail Strict"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_ponytail6"
+
+/datum/sprite_accessory/hair/quadcurls
+	name = "Quadcurls"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_quadcurls"
+
+/datum/sprite_accessory/hair/rockstar
+	name = "Rockstar"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_rockstar"
+
+/datum/sprite_accessory/hair/stacy
+	name = "Stacy"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_stacy"
+
+/datum/sprite_accessory/hair/shorttassles
+	name = "Short Tassles"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_shorttassles"
+
+/datum/sprite_accessory/hair/supernova
+	name = "Supernova"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_supernova"
+
+/datum/sprite_accessory/hair/tribum
+	name = "Tri-bun"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_tribun"
+
+/datum/sprite_accessory/hair/twintail
+	name = "Twintails"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_twintail"
+
+/datum/sprite_accessory/hair/unkempt
+	name = "Unkempt"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_unkempt"
+
+/datum/sprite_accessory/hair/verylongtails
+	name = "Very Long Twintails"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_verylongtails"
+
+/datum/sprite_accessory/hair/vivi
+	name = "Vivi"
+	icon = 'modular_bandastation/hair/icons/human_face.dmi'
+	icon_state = "hair_vivi"
diff --git a/modular_bandastation/hair/icons/human_face.dmi b/modular_bandastation/hair/icons/human_face.dmi
new file mode 100644
index 0000000000000..4ef14ec04a80f
Binary files /dev/null and b/modular_bandastation/hair/icons/human_face.dmi differ
diff --git a/modular_bandastation/jukebox/_jukebox.dm b/modular_bandastation/jukebox/_jukebox.dm
new file mode 100644
index 0000000000000..e1aa2ff18a857
--- /dev/null
+++ b/modular_bandastation/jukebox/_jukebox.dm
@@ -0,0 +1,4 @@
+/datum/modpack/jukebox
+	name = "Jukebox Tweaks"
+	desc = "Приятные фичи для Jukebox."
+	author = "Aylong"
diff --git a/modular_bandastation/jukebox/_jukebox.dme b/modular_bandastation/jukebox/_jukebox.dme
new file mode 100644
index 0000000000000..c9ff9d6d8053c
--- /dev/null
+++ b/modular_bandastation/jukebox/_jukebox.dme
@@ -0,0 +1,3 @@
+#include "_jukebox.dm"
+
+#include "code/jukebox_ui.dm"
diff --git a/modular_bandastation/jukebox/code/jukebox_ui.dm b/modular_bandastation/jukebox/code/jukebox_ui.dm
new file mode 100644
index 0000000000000..d6bf289cdfb9c
--- /dev/null
+++ b/modular_bandastation/jukebox/code/jukebox_ui.dm
@@ -0,0 +1,105 @@
+/datum/jukebox
+	/// Music start time.
+	var/startTime = 0
+	/// Whether the uploaded track will be saved on the server.
+	var/save_track = FALSE
+
+/datum/jukebox/start_music()
+	. = ..()
+	startTime = world.time
+
+/datum/jukebox/unlisten_all()
+	. = ..()
+	startTime = 0
+
+/obj/machinery/jukebox/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "Jukebox220", name)
+		ui.open()
+
+/obj/machinery/jukebox/ui_data(mob/user)
+	var/list/data = ..()
+	music_player.get_ui_data(data)
+	data["admin"] = check_rights_for(user.client, R_ADMIN)
+	data["saveTrack"] = music_player.save_track
+	data["startTime"] = music_player.startTime
+	data["worldTime"] = world.time
+	return data
+
+/obj/machinery/jukebox/ui_act(action, list/params)
+	. = ..()
+	var/mob/user = usr
+	switch(action)
+		if("add_song")
+			if(!check_rights_for(user.client, R_ADMIN))
+				message_admins("[key_name(user)] попытался добавить трек, не имея прав администратора!")
+				log_admin("[key_name(user)] попытался добавить трек, не имея прав администратора!")
+				return FALSE
+			var/track_name = params["track_name"]
+			var/track_length = params["track_length"]
+			var/track_beat = params["track_beat"]
+			if(!track_name || !track_length || !track_beat)
+				to_chat(user, span_warning("Ошибка: Имеются не заполненные поля."))
+				return FALSE
+
+			var/track_file = upload_file(user)
+			upload_track(user, track_name, track_length, track_beat, track_file)
+			try_save_file(user, track_name, track_length, track_beat, track_file)
+			return TRUE
+
+		if("save_song")
+			if(!check_rights_for(user.client, R_ADMIN))
+				message_admins("[key_name(user)] попытался включить сохранение трека, не имея прав администратора!")
+				log_admin("[key_name(user)] попытался включить сохранение трека, не имея прав администратора!")
+				return FALSE
+			enable_saving(user)
+			return TRUE
+
+/obj/machinery/jukebox/proc/upload_file(mob/user)
+	var/file = input(user, "Загрузите файл весом не более 5мб, поддерживается только формат .ogg", "Загрузка файла") as null|file
+	if(isnull(file))
+		to_chat(user, span_warning("Ошибка: Необходимо выбрать файл."))
+		return
+	if(copytext("[file]", -4) != ".ogg")
+		to_chat(user, span_warning("Формат файла должен быть '.ogg': [file]"))
+		return
+	return file
+
+/obj/machinery/jukebox/proc/upload_track(mob/user, name, length, beat, file)
+	var/datum/track/new_track = new()
+	new_track.song_name = name
+	new_track.song_length = length
+	new_track.song_beat = beat
+	new_track.song_path = file(file)
+
+	music_player.songs[name] = new_track
+	say("Загружен новый трек: «[name]»")
+
+/obj/machinery/jukebox/proc/try_save_file(mob/user, name, length, beat, file)
+	if(!music_player.save_track)
+		return
+	if(tgui_alert(user, "ВНИМАНИЕ! Включено сохранение трека на сервер. <br> \
+			Нажимая «Да» вы подтверждаете, что загружаемый трек не нарушает никаких авторских прав. <br> \
+			Вы уверены, что хотите сохранить трек?", "Сохранение трека", list("Да", "Нет")) != "Да")
+		music_player.save_track = !music_player.save_track
+		to_chat(user, span_warning("Сохранение трека было отключено."))
+		return
+
+	var/config_file = "[name]" + "+" + "[length]" + "+" + "[beat]"
+	if(!fcopy(file, "[global.config.directory]/jukebox_music/sounds/[config_file].ogg"))
+		to_chat(user, span_warning("По какой-то причине, трек не был сохранён, попробуйте ещё раз. <br> Входной файл: [file] <br> Выходной файл: [config_file].ogg"))
+		return
+	to_chat(user, span_notice("Ваш трек успешно загружен на сервер под следующим названием: [config_file].ogg"))
+	message_admins("[key_name(user)] загрузил трек [config_file].ogg с изначальным названием [file] на сервер")
+	log_admin("[key_name(user)] загрузил трек [config_file].ogg с изначальным названием [file] на сервер")
+
+/obj/machinery/jukebox/proc/enable_saving(mob/user)
+	if(music_player.save_track)
+		music_player.save_track = !music_player.save_track
+		return
+	if(tgui_alert(user, "Вы уверены, что хотите сохранить трек на сервере?", "Сохранение трека", list("Да", "Нет")) != "Да")
+		return
+	if(tgui_alert(user, "Внимание! Сохранённый трек сможет удалить ТОЛЬКО хост! Подойдите максимально ответственно к заполнению полей!", "Сохранение трека", list("Ок", "Я передумал")) != "Ок")
+		return
+	music_player.save_track = !music_player.save_track
diff --git a/modular_bandastation/loadout/_loadout.dm b/modular_bandastation/loadout/_loadout.dm
new file mode 100644
index 0000000000000..51ff5022b85b5
--- /dev/null
+++ b/modular_bandastation/loadout/_loadout.dm
@@ -0,0 +1,4 @@
+/datum/modpack/loadout
+	name = "Loadout"
+	desc = "Добавляет новые вещи в loadout и изменяет уже существующие."
+	author = "larentoun, Chorden"
diff --git a/modular_bandastation/loadout/_loadout.dme b/modular_bandastation/loadout/_loadout.dme
new file mode 100644
index 0000000000000..39fe2629a8fd4
--- /dev/null
+++ b/modular_bandastation/loadout/_loadout.dme
@@ -0,0 +1,8 @@
+#include "_loadout.dm"
+
+#include "code/client.dm"
+#include "code/loadout_categories.dm"
+#include "code/loadout_items.dm"
+#include "code/loadout_preference.dm"
+#include "code/categories/accessories.dm"
+#include "code/categories/pocket.dm"
diff --git a/modular_bandastation/loadout/code/categories/accessories.dm b/modular_bandastation/loadout/code/categories/accessories.dm
new file mode 100644
index 0000000000000..a0678194dd698
--- /dev/null
+++ b/modular_bandastation/loadout/code/categories/accessories.dm
@@ -0,0 +1,5 @@
+/datum/loadout_item/accessory/pride/is_available()
+	return FALSE
+
+/datum/loadout_item/accessory/maid_apron
+	donator_level = 1
diff --git a/modular_bandastation/loadout/code/categories/pocket.dm b/modular_bandastation/loadout/code/categories/pocket.dm
new file mode 100644
index 0000000000000..b62f7f6a30e17
--- /dev/null
+++ b/modular_bandastation/loadout/code/categories/pocket.dm
@@ -0,0 +1,41 @@
+/datum/loadout_item/pocket_items/plush/hampter_ass
+	name = "Хамптер ассистент"
+	item_path = /obj/item/toy/plush/hampter/assistant
+
+/datum/loadout_item/pocket_items/plush/hampter_cap
+	name = "Хамптер капитан"
+	item_path = /obj/item/toy/plush/hampter/captain
+
+/datum/loadout_item/pocket_items/plush/hampter_ded
+	name = "Хамптер Дедсквада"
+	item_path = /obj/item/toy/plush/hampter/deadsquad
+
+/datum/loadout_item/pocket_items/plush/hampter_ert
+	name = "Хамптер ОБР"
+	item_path = /obj/item/toy/plush/hampter/ert
+
+/datum/loadout_item/pocket_items/plush/hampter_jan
+	name = "Хамптер уборщик"
+	item_path = /obj/item/toy/plush/hampter/janitor
+
+/datum/loadout_item/pocket_items/plush/hampter_med
+	name = "Хамптер врач"
+	item_path = /obj/item/toy/plush/hampter/medical
+
+/datum/loadout_item/pocket_items/plush/hampter_cap_old
+	name = "Хамптер старый капитан"
+	item_path = /obj/item/toy/plush/hampter/old_captain
+
+/datum/loadout_item/pocket_items/plush/hampter_sdy
+	name = "Хамптер синдиката"
+	item_path = /obj/item/toy/plush/hampter/syndicate
+
+/datum/loadout_item/pocket_items/plush/hampter_sec
+	name = "Хамптер офицер"
+	item_path = /obj/item/toy/plush/hampter/security
+
+/datum/loadout_item/pocket_items/plush/ratvar
+	donator_level = 3
+
+/datum/loadout_item/pocket_items/plush/narsie
+	donator_level = 3
diff --git a/modular_bandastation/loadout/code/client.dm b/modular_bandastation/loadout/code/client.dm
new file mode 100644
index 0000000000000..03ad62dfba7c8
--- /dev/null
+++ b/modular_bandastation/loadout/code/client.dm
@@ -0,0 +1,69 @@
+#define DONATION_TIER_1 220
+#define DONATION_TIER_2 440
+#define DONATION_TIER_3 1000
+#define DONATION_TIER_4 2220
+#define DONATION_TIER_5 10000
+
+/client
+	/// Call `proc/get_donator_level()` instead to get a value when possible.
+	var/donator_level = 0
+	COOLDOWN_DECLARE(db_check_cooldown)
+
+// For unit-tests
+/datum/client_interface
+	var/donator_level = 0
+
+/datum/client_interface/proc/get_donator_level()
+	return donator_level
+
+/client/proc/get_donator_level()
+	donator_level = max(donator_level, get_donator_level_from_db(), get_donator_level_from_admin())
+	return donator_level
+
+/client/proc/get_donator_level_from_admin()
+	if(!holder)
+		return 0
+	var/rank_flags = holder.rank_flags()
+	if(rank_flags & R_EVERYTHING)
+		return 5
+	if(rank_flags & R_ADMIN)
+		return 3
+	return 0
+
+/client/proc/get_donator_level_from_db()
+	if(!COOLDOWN_FINISHED(src, db_check_cooldown))
+		return 0
+	COOLDOWN_START(src, db_check_cooldown, 15 SECONDS)
+	var/datum/db_query/query_get_donator_level = SSdbcore.NewQuery({"
+		SELECT CAST(SUM(amount) as UNSIGNED INTEGER) FROM budget
+		WHERE ckey=:ckey
+			AND is_valid=true
+			AND date_start <= NOW()
+			AND (NOW() < date_end OR date_end IS NULL)
+		GROUP BY ckey
+	"}, list("ckey" = ckey))
+
+	var/amount = 0
+	if(query_get_donator_level.warn_execute() && length(query_get_donator_level.rows))
+		query_get_donator_level.NextRow()
+		amount = query_get_donator_level.item[1]
+	qdel(query_get_donator_level)
+
+	switch(amount)
+		if(DONATION_TIER_1 to (DONATION_TIER_2 - 1))
+			return 1
+		if(DONATION_TIER_2 to (DONATION_TIER_3 - 1))
+			return 2
+		if(DONATION_TIER_3 to (DONATION_TIER_4 - 1))
+			return 3
+		if(DONATION_TIER_4 to (DONATION_TIER_5 - 1))
+			return 4
+		if(DONATION_TIER_5 to INFINITY)
+			return 5
+	return 0
+
+#undef DONATION_TIER_1
+#undef DONATION_TIER_2
+#undef DONATION_TIER_3
+#undef DONATION_TIER_4
+#undef DONATION_TIER_5
diff --git a/modular_bandastation/loadout/code/loadout_categories.dm b/modular_bandastation/loadout/code/loadout_categories.dm
new file mode 100644
index 0000000000000..7e6278bb86e6f
--- /dev/null
+++ b/modular_bandastation/loadout/code/loadout_categories.dm
@@ -0,0 +1,6 @@
+/datum/loadout_category/get_items()
+	. = ..()
+	for(var/datum/loadout_item/item as anything in .)
+		if(item.is_available())
+			continue
+		. -= item
diff --git a/modular_bandastation/loadout/code/loadout_items.dm b/modular_bandastation/loadout/code/loadout_items.dm
new file mode 100644
index 0000000000000..aefed0dd25bc3
--- /dev/null
+++ b/modular_bandastation/loadout/code/loadout_items.dm
@@ -0,0 +1,11 @@
+/datum/loadout_item
+	var/donator_level = 0
+
+/datum/loadout_item/get_item_information()
+	. = ..()
+	if(donator_level)
+		. += "Tier [donator_level]"
+
+// Removes item from the preferences menu, period. Use it only to remove stuff for ALL players.
+/datum/loadout_item/proc/is_available()
+	return TRUE
diff --git a/modular_bandastation/loadout/code/loadout_preference.dm b/modular_bandastation/loadout/code/loadout_preference.dm
new file mode 100644
index 0000000000000..534c42e7ad686
--- /dev/null
+++ b/modular_bandastation/loadout/code/loadout_preference.dm
@@ -0,0 +1,25 @@
+/datum/preferences/load_preferences()
+	. = ..()
+	parent.get_donator_level()
+
+// Handles selecting from the preferences UI
+/datum/preference_middleware/loadout/select_item(datum/loadout_item/selected_item)
+	var/donator_level = preferences.parent.get_donator_level()
+	if(donator_level >= selected_item.donator_level)
+		return ..()
+	to_chat(preferences.parent.mob, span_warning("У вас недостаточный уровень доната, чтобы взять [selected_item.name]!"))
+
+// Removes donator_level items from the user if their donator_level is insufficient
+/datum/preference/loadout/deserialize(input, datum/preferences/preferences)
+	. = ..()
+	// For loadout purposes, donator_level is updated in middleware on select
+	var/donator_level = preferences.parent.donator_level
+	var/removed_items = list()
+	for(var/path in .)
+		var/datum/loadout_item/item = GLOB.all_loadout_datums[path]
+		if(donator_level >= item.donator_level)
+			continue
+		. -= path
+		removed_items += item.name
+	if(length(removed_items) && preferences.parent.mob)
+		to_chat(preferences.parent.mob, span_warning("У вас недостаточный уровень доната, чтобы взять: [english_list(removed_items, and_text = " и ")]!"))
diff --git a/modular_bandastation/mapping/_mapping.dm b/modular_bandastation/mapping/_mapping.dm
new file mode 100644
index 0000000000000..775aca7454869
--- /dev/null
+++ b/modular_bandastation/mapping/_mapping.dm
@@ -0,0 +1,4 @@
+/datum/modpack/automapper
+	name = "Mapping"
+	desc = "Вещи, необходимые для модульного маппинга."
+	author = "Skyrat"
diff --git a/modular_bandastation/mapping/_mapping.dme b/modular_bandastation/mapping/_mapping.dme
new file mode 100644
index 0000000000000..021864ca8801c
--- /dev/null
+++ b/modular_bandastation/mapping/_mapping.dme
@@ -0,0 +1 @@
+#include "code\areas\station.dm"
diff --git a/modular_bandastation/mapping/code/areas/station.dm b/modular_bandastation/mapping/code/areas/station.dm
new file mode 100644
index 0000000000000..69fc2511900e4
--- /dev/null
+++ b/modular_bandastation/mapping/code/areas/station.dm
@@ -0,0 +1,6 @@
+// MARK: Station Areas
+
+/area/station/common/cryopods
+	name = "Cryopods Room"
+	icon = 'modular_bandastation/mapping/icons/areas/areas_station.dmi'
+	icon_state = "cryopods"
diff --git a/modular_bandastation/mapping/icons/areas/areas_station.dmi b/modular_bandastation/mapping/icons/areas/areas_station.dmi
new file mode 100644
index 0000000000000..62589c9bb4382
Binary files /dev/null and b/modular_bandastation/mapping/icons/areas/areas_station.dmi differ
diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme
index f805bb52659d5..11b02fadf085f 100644
--- a/modular_bandastation/modular_bandastation.dme
+++ b/modular_bandastation/modular_bandastation.dme
@@ -5,7 +5,9 @@
 #include "_helpers220/_helpers220.dme"
 #include "_signals220/_signals220.dme"
 #include "_singletons/_singletons.dme"
+#include "admin/_admin.dme"
 #include "aesthetics/_aesthetics.dme"
+#include "automapper/_automapper.dme"
 #include "ai_laws/_ai_laws.dme"
 #include "autohiss/_autohiss.dme"
 #include "balance/_balance.dme"
@@ -16,10 +18,11 @@
 #include "database220/_database220.dme"
 #include "discord/_discord.dme"
 #include "emote_panel/_emote_panel.dme" // Waiting for upstream merge
-#include "events/_events.dme"
 #include "examine_panel/_examine_panel.dme"
 #include "gunhud/_gunhud.dme"
 #include "keybinding/_keybinding.dme"
+#include "loadout/_loadout.dme"
+#include "mapping/_mapping.dme"
 #include "pixel_shift/_pixel_shift.dme"
 #include "ru_jobs/_ru_jobs.dme"
 #include "translations/_translations.dme"
@@ -28,3 +31,6 @@
 #include "world_topics/_world_topics.dme"
 #include "preferences/_preferences.dme"
 #include "drinks/_drinks.dme"
+#include "jukebox/_jukebox.dme"
+#include "objects/_objects.dme"
+#include "hair/_hair.dme"
diff --git a/modular_bandastation/objects/_objects.dm b/modular_bandastation/objects/_objects.dm
new file mode 100644
index 0000000000000..f31dbc53aba91
--- /dev/null
+++ b/modular_bandastation/objects/_objects.dm
@@ -0,0 +1,4 @@
+/datum/modpack/objects
+	name = "Объекты"
+	desc = "В основном включает в себя портированные объекты и всякие мелочи, которым не нужен отдельный модпак."
+	author = "dj-34, Chorden"
diff --git a/modular_bandastation/objects/_objects.dme b/modular_bandastation/objects/_objects.dme
new file mode 100644
index 0000000000000..1e03efb802e40
--- /dev/null
+++ b/modular_bandastation/objects/_objects.dme
@@ -0,0 +1,15 @@
+#include "_objects.dm"
+
+#include "code/wallets.dm"
+#include "code/hampters.dm"
+#include "code/papershredder.dm"
+#include "code/material_pouch.dm"
+#include "code/structures/posters.dm"
+
+#include "code/clothing/head/hat.dm"
+#include "code/clothing/head/soft_caps.dm"
+#include "code/clothing/suits/cloaks.dm"
+#include "code/clothing/suits/jacket.dm"
+#include "code/clothing/suits/wintercoats.dm"
+#include "code/clothing/under/jobs/rnd.dm"
+#include "code/vending/vending.dm"
diff --git a/modular_bandastation/objects/code/clothing/head/hat.dm b/modular_bandastation/objects/code/clothing/head/hat.dm
new file mode 100644
index 0000000000000..6e054b75d3207
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/head/hat.dm
@@ -0,0 +1,7 @@
+/obj/item/clothing/head/cowboy/roboticist
+	name = "roboticist's cowboy hat"
+	desc = "Ковбойская шляпа с малиновой лентой, сочетающая стиль и функциональность. Отличный выбор для тех, кто хочет выделиться на космической станции. На бирке указано: 'Flameholdeir Industries'. Вам точно не хватает револьвера!"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi'
+	icon_state = "cowboy_robostics"
+	worn_icon_state = "cowboy_robostics"
diff --git a/modular_bandastation/objects/code/clothing/head/soft_caps.dm b/modular_bandastation/objects/code/clothing/head/soft_caps.dm
new file mode 100644
index 0000000000000..f059ccdccbf7f
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/head/soft_caps.dm
@@ -0,0 +1,9 @@
+/obj/item/clothing/head/soft/roboticist_cap
+	icon = 'modular_bandastation/objects/icons/obj/clothing/head/hats.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/hats.dmi'
+	name = "roboticist's cap"
+	desc = "Элегантная кепка в черных тонах с малиновым козырьком. Идеально дополняет рабочую форму, добавляя стиль. На бирке указано: 'Flameholdeir Industries'. С этой кепкой вы точно никогда не опоздаете."
+	icon_state = "robocap"
+	soft_type = "robocap"
+	soft_suffix = null
+	dog_fashion = null
diff --git a/modular_bandastation/objects/code/clothing/suits/cloaks.dm b/modular_bandastation/objects/code/clothing/suits/cloaks.dm
new file mode 100644
index 0000000000000..69b6461b31804
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/suits/cloaks.dm
@@ -0,0 +1,18 @@
+/obj/item/clothing/suit/hooded/roboticist_cloak
+	name = "roboticist's coat"
+	desc = "Стильный плащ с принтом головы борга на спине. Идеален для тех, кто хочет выделиться и показать свою любовь к робототехнике. На бирке указано: 'Flameholdeir Industries'. Бережно обращайтесь с боргами, пока они не сделали из вас лампочку!"
+	icon_state = "robotics_coat"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi'
+	inhand_icon_state = null
+	body_parts_covered = CHEST|GROIN|ARMS
+	hoodtype = /obj/item/clothing/head/hooded/roboticist_cloak
+
+/obj/item/clothing/head/hooded/roboticist_cloak
+	name = "roboticist's hood"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi'
+	icon_state = "robotics_hood"
+	body_parts_covered = HEAD
+	flags_inv = HIDEHAIR|HIDEEARS
+
diff --git a/modular_bandastation/objects/code/clothing/suits/jacket.dm b/modular_bandastation/objects/code/clothing/suits/jacket.dm
new file mode 100644
index 0000000000000..bdf49af42f51d
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/suits/jacket.dm
@@ -0,0 +1,6 @@
+/obj/item/clothing/suit/toggle/jacket/roboticist
+	name = "roboticist's jacket"
+	desc = "Универсальная куртка из прочного материала, идеально подходит для работы с механическими деталями. Красные полосы на плечах добавляют стильный акцент. Теперь вы не только защищены, но и модны. На бирке указано: 'Flameholdeir Industries'. Будьте стильным, как Адский Бродяга!"
+	icon_state = "robotics_jacket"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi'
diff --git a/modular_bandastation/objects/code/clothing/suits/wintercoats.dm b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm
new file mode 100644
index 0000000000000..19bce1d4d9a9c
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/suits/wintercoats.dm
@@ -0,0 +1,11 @@
+/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt
+	name = "roboticist's winter coat"
+	desc = "Пальто, исключительно для разбирающихся в моде. Для крутых и подкрученных перцев. На бирке указано: 'Flameholdeir Industries'. Поможет даже во время самых длинных, холодных и тёмных времен."
+	icon_state = "coatrobotics"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi'
+	hoodtype = NONE
+	inhand_icon_state = null
+
+/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt/click_alt(mob/user)
+	return NONE // Restrict user to zip and unzip coat
diff --git a/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm
new file mode 100644
index 0000000000000..efb78170e4255
--- /dev/null
+++ b/modular_bandastation/objects/code/clothing/under/jobs/rnd.dm
@@ -0,0 +1,35 @@
+/obj/item/clothing/under/rank/rnd/roboticist/alt
+	name = "standart roboticist jumpsuit"
+	desc = "Комбинезон робототехника нового образца. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - будьте как Сенатор!"
+	icon_state = "robotics_alt"
+	icon = 'modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi'
+	worn_icon = 'modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi'
+
+/obj/item/clothing/under/rank/rnd/roboticist/alt/red
+	name = "red roboticist's jumpsuit"
+	desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Теперь вы готовы починить всех боргов, как парень с монтировкой, который спасает мир!"
+	icon_state = "robotics_red"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie
+	name = "roboticist's hoodie"
+	desc = "Худи и джоггеры, идущие как единый комбинезон, пояс сделанный из крашенной кожи и золотой пряжки. Выполнены из мягкого и прочного материала, обеспечивая комфорт и свободу движений. Теперь даже борги будут завидовать вашему стилю. На бирке указано: 'Flameholdeir Industries'. В этом костюме вы можете прыгать по крышам, как паркурист-доставщик!"
+	icon_state = "robotics_hoodie"
+	body_parts_covered = CHEST|GROIN|ARMS
+	can_adjust = FALSE
+
+/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt
+	name = "standart roboticist's jumpskirt"
+	desc = "Комбинезон робототехника нового образца с юбкой. Ничего выдающегося, кроме качественного материала. На бирке указано: 'Flameholdeir Industries'. Эстетика в простоте - а кстати, а где моя катана?"
+	icon_state = "robotics_skirt_alt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	dying_key = DYE_REGISTRY_JUMPSKIRT
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+	supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red
+	name = "red roboticist's jumpskirt"
+	desc = "Прочный рабочий комбинезон из высококачественных материалов, обеспечивающий защиту и комфорт. Красный свитер из кашемира, мягкий на ощупь. Да, мы тоже думаем, что золотые заклёпки - это огонь. На бирке указано: 'Flameholdeir Industries'. Вы сможете заменять протезы рук ВЕЧНОСТЬ и со стилем!"
+	icon_state = "robotics_skirt_red"
+	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
+	can_adjust = FALSE
diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm
new file mode 100644
index 0000000000000..8b7838bc816b9
--- /dev/null
+++ b/modular_bandastation/objects/code/hampters.dm
@@ -0,0 +1,86 @@
+/obj/item/toy/plush/hampter
+	name = "хамптер"
+	desc = "Просто плюшевый хамптер. Самый обычный."
+	icon = 'modular_bandastation/objects/icons/hampter.dmi'
+	icon_state = "hampter"
+	lefthand_file = 'modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi'
+	righthand_file = 'modular_bandastation/objects/icons/inhands/hampter_righthand.dmi'
+	inhand_icon_state = "hampter"
+	worn_icon = 'modular_bandastation/objects/icons/inhead/head.dmi'
+	worn_icon_state = "hampter"
+	slot_flags = ITEM_SLOT_HEAD
+	w_class = WEIGHT_CLASS_TINY
+	COOLDOWN_DECLARE(squeeze_cooldown)
+
+/obj/item/toy/plush/hampter/attack_self(mob/living/carbon/human/user)
+	if(!COOLDOWN_FINISHED(src, squeeze_cooldown))
+		return
+	COOLDOWN_START(src, squeeze_cooldown, 2 SECONDS)
+	. = ..()
+	if(user.combat_mode == TRUE)
+		new /obj/effect/decal/cleanable/blood(get_turf(user))
+		user.visible_message(span_warning("[user] раздавил хамптера своей рукой!"), span_warning("Вы с особой жестокостью давите хамптера в своей руке, оставляя от него лишь лужу крови!"))
+		qdel(src)
+
+/obj/item/toy/plush/hampter/assistant
+	name = "хамптер ассистент"
+	desc = "Плюшевый хамптер ассистент. Зачем ему изольки?"
+	icon_state = "hampter_ass"
+	inhand_icon_state = "hampter_ass"
+	worn_icon_state = "hampter_ass"
+
+/obj/item/toy/plush/hampter/security
+	name = "хамптер офицер"
+	desc = "Плюшевый хамптер офицер службы безопасности. У него станбатон!"
+	icon_state = "hampter_sec"
+	inhand_icon_state = "hampter_sec"
+	worn_icon_state = "hampter_sec"
+
+/obj/item/toy/plush/hampter/medical
+	name = "хамптер врач"
+	desc = "Плюшевый хамптер врач. Тащите дефибриллятор!"
+	icon_state = "hampter_med"
+	inhand_icon_state = "hampter_med"
+	worn_icon_state = "hampter_med"
+
+/obj/item/toy/plush/hampter/janitor
+	name = "хамптер уборщик"
+	desc = "Плюшевый хамптер уборщик. Переключись на шаг."
+	icon_state = "hampter_jan"
+	inhand_icon_state = "hampter_jan"
+	worn_icon_state = "hampter_jan"
+
+/obj/item/toy/plush/hampter/old_captain
+	name = "хамптер старый капитан"
+	desc = "Плюшевый хамптер капитан в старой униформе. Это какой год?"
+	icon_state = "hampter_old-cap"
+	inhand_icon_state = "hampter_old-cap"
+	worn_icon_state = "hampter_old-cap"
+
+/obj/item/toy/plush/hampter/captain
+	name = "хамптер капитан"
+	desc = "Плюшевый хамптер капитан. Где его запасная карта?"
+	icon_state = "hampter_cap"
+	inhand_icon_state = "hampter_cap"
+	worn_icon_state = "hampter_cap"
+
+/obj/item/toy/plush/hampter/syndicate
+	name = "хамптер Синдиката"
+	desc = "Плюшевый хамптер агент Синдиката. Ваши активы пострадают."
+	icon_state = "hampter_sdy"
+	inhand_icon_state = "hampter_sdy"
+	worn_icon_state = "hampter_sdy"
+
+/obj/item/toy/plush/hampter/deadsquad
+	name = "хамптер Дедсквада"
+	desc = "Плюшевый хамптер Отряда Смерти. Все контракты расторгнуты."
+	icon_state = "hampter_ded"
+	inhand_icon_state = "hampter_ded"
+	worn_icon_state = "hampter_ded"
+
+/obj/item/toy/plush/hampter/ert
+	name = "хамптер ОБР"
+	desc = "Плюшевый хамптер ОБР. Доложите о ситуации на станции."
+	icon_state = "hampter_ert"
+	inhand_icon_state = "hampter_ert"
+	worn_icon_state = "hampter_ert"
diff --git a/modular_bandastation/objects/code/material_pouch.dm b/modular_bandastation/objects/code/material_pouch.dm
new file mode 100644
index 0000000000000..e26313b1ac076
--- /dev/null
+++ b/modular_bandastation/objects/code/material_pouch.dm
@@ -0,0 +1,44 @@
+/obj/item/storage/bag/material_pouch
+	name = "material pouch"
+	desc = "Сумка для хранения листов материалов."
+	icon = 'modular_bandastation/objects/icons/material_pouch.dmi'
+	icon_state = "materialpouch"
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = FLAMMABLE
+	slot_flags = ITEM_SLOT_POCKETS | ITEM_SLOT_BELT
+	var/static/list/matpouch_holdables = list(
+		/obj/item/stack/sheet/iron,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/sheet/plasmaglass,
+		/obj/item/stack/sheet/bluespace_crystal,
+		/obj/item/stack/sheet/bronze,
+		/obj/item/stack/sheet/glass,
+		/obj/item/stack/sheet/plasmarglass,
+		/obj/item/stack/sheet/titaniumglass,
+		/obj/item/stack/sheet/plastic,
+		/obj/item/stack/sheet/rglass,
+		/obj/item/stack/sheet/mineral/wood,
+		/obj/item/stack/sheet/mineral/adamantine,
+		/obj/item/stack/sheet/mineral/bamboo,
+		/obj/item/stack/sheet/mineral/bananium,
+		/obj/item/stack/sheet/mineral/diamond,
+		/obj/item/stack/sheet/mineral/gold,
+		/obj/item/stack/sheet/mineral/metal_hydrogen,
+		/obj/item/stack/sheet/mineral/uranium,
+		/obj/item/stack/sheet/mineral/silver,
+		/obj/item/stack/sheet/mineral/titanium,
+	)
+
+/obj/item/storage/bag/material_pouch/Initialize(mapload)
+	. = ..()
+	atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
+	atom_storage.max_total_storage = INFINITY
+	atom_storage.max_slots = 2
+	atom_storage.numerical_stacking = TRUE
+	atom_storage.set_holdable(matpouch_holdables)
+
+/obj/machinery/vending/engivend/build_inventories(start_empty)
+	premium += list(
+		/obj/item/storage/bag/material_pouch = 3
+	)
+	. = ..()
diff --git a/modular_bandastation/objects/code/papershredder.dm b/modular_bandastation/objects/code/papershredder.dm
new file mode 100644
index 0000000000000..568b04fdfc9d6
--- /dev/null
+++ b/modular_bandastation/objects/code/papershredder.dm
@@ -0,0 +1,106 @@
+/obj/machinery/papershredder
+	name = "\improper paper shredder"
+	desc = "For those documents you don't want seen."
+	icon = 'modular_bandastation/objects/icons/papershredder.dmi'
+	icon_state = "papershredder0"
+	density = TRUE
+	anchored = TRUE
+	var/max_paper = 15
+	var/paper_amount = 0
+	var/list/shred_amounts = list(
+		/obj/item/photo = 1,
+		/obj/item/shredded_paper = 1,
+		/obj/item/paper = 1,
+		/obj/item/newspaper = 3,
+		/obj/item/card/id = 3,
+		/obj/item/folder = 4,
+		/obj/item/book = 5
+	)
+
+/obj/machinery/papershredder/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Empty shredded paper bin")
+	register_context()
+
+/obj/machinery/papershredder/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(held_item.tool_behaviour == TOOL_WRENCH)
+		context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unanchor" : "Anchor"
+		return CONTEXTUAL_SCREENTIP_SET
+	if(held_item.type in shred_amounts)
+		context[SCREENTIP_CONTEXT_LMB] = "Shred item"
+		return CONTEXTUAL_SCREENTIP_SET
+	return NONE
+
+/obj/machinery/papershredder/attack_hand_secondary(mob/user, list/modifiers)
+	. = ..()
+	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+		return
+	empty_contents(user)
+	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/papershredder/attackby(obj/item/item, mob/user, params)
+	if(!(item.type in shred_amounts))
+		return ..()
+	if(paper_amount == max_paper)
+		to_chat(user, span_warning("[src] is full. Please empty it before you continue."))
+		return
+	var/paper_result = shred_amounts[item.type]
+	paper_amount += paper_result
+	qdel(item)
+	playsound(loc, 'modular_bandastation/objects/sounds/pshred.ogg', 75, 1)
+	update_icon_state()
+	add_fingerprint(user)
+
+/obj/machinery/papershredder/wrench_act(mob/living/user, obj/item/tool)
+	. = ..()
+	default_unfasten_wrench(user, tool)
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/papershredder/examine(mob/user)
+	. = ..()
+	. += span_info("<b>Right-Click</b> to empty [src].")
+
+/obj/machinery/papershredder/proc/empty_contents(mob/living/user)
+	if(HAS_TRAIT(user, TRAIT_RESTRAINED))
+		to_chat(user, span_warning("You need your hands free for this."))
+		return
+
+	if(!paper_amount)
+		to_chat(user, span_notice("[src] is empty."))
+		return
+
+	get_shredded_paper()
+	update_icon_state()
+
+/obj/machinery/papershredder/proc/get_shredded_paper()
+	if(!paper_amount)
+		return
+	paper_amount--
+	return new /obj/item/shredded_paper(get_turf(src))
+
+/obj/machinery/papershredder/update_icon_state()
+	icon_state = "papershredder[clamp(round(paper_amount/3), 0, 5)]"
+	return ..()
+
+/obj/item/shredded_paper
+	name = "shredded paper"
+	icon = 'modular_bandastation/objects/icons/papershredder.dmi'
+	icon_state = "shredp"
+	throwforce = 0
+	w_class = WEIGHT_CLASS_TINY
+	resistance_flags = FLAMMABLE
+	layer = BELOW_MOB_LAYER
+	max_integrity = 25
+	throw_range = 3
+	throw_speed = 2
+
+/obj/item/shredded_paper/Initialize()
+	. = ..()
+	if(prob(65))
+		color = pick("#8b8b8b","#e7e4e4", "#c9c9c9")
+
+/obj/item/shredded_paper/attackby(obj/item/attacking_item, mob/user, params)
+	if(burn_paper_product_attackby_check(attacking_item, user))
+		return
+	. = ..()
diff --git a/modular_bandastation/objects/code/structures/posters.dm b/modular_bandastation/objects/code/structures/posters.dm
new file mode 100644
index 0000000000000..161bdd9bce287
--- /dev/null
+++ b/modular_bandastation/objects/code/structures/posters.dm
@@ -0,0 +1,89 @@
+// Contraband
+/obj/structure/sign/poster/contraband/lady
+	name = "Соблазнительная Красотка"
+	desc = "На плакате изображена крайне сексуальная девушка."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband1"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/lady, 32)
+
+/obj/structure/sign/poster/contraband/very_robust
+	name = "Робаст"
+	desc = "Вы видите слегка потрёпанный плакат, на котором изображен КРАСНЫЙ туллбокс! На плакате написано \"Опасно, робастное!\", некоторые утверждают, что эта красная краска на плакате сделана из настоящей крови."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband2"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/very_robust, 32)
+
+/obj/structure/sign/poster/contraband/vodka
+	name = "Водка"
+	desc = "Рекламный плакат водки, напитка от настоящих мужчин для настоящих мужчин. Почувствуй себя космическим медведем."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband3"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/vodka, 32)
+
+/obj/structure/sign/poster/contraband/wanted
+	name = "Вотер Потассиумович"
+	desc = "На плакате вы видите: лысый, черноглазый мужчина, лет 30, и его разыскивают на просторах всего космоса. Что он сделал, чтобы его так разыскивали..."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband4"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/wanted, 32)
+
+/obj/structure/sign/poster/contraband/soulless_figures
+	name = "Бездушные фигуры"
+	desc = "Плакат изображает множество безвольно слоняющихся тёмных фигур. Кажется они смотрят прямо на тебя, жуть..."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband5"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/soulless_figures, 32)
+
+/obj/structure/sign/poster/contraband/your_fate
+	name = "Твоя судьба"
+	desc = "На плакате изображается дом и ряд одинаковых домов уходящих вдаль, расположенных на кровавом полотне. Ниже можно разглядеть тень искореженной руки.\nНад домами возвышаются существа чертоватого вида, а надпись снизу гласит: \"Твоя судьба?\""
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband6"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/your_fate, 32)
+
+/obj/structure/sign/poster/contraband/watching_eye
+	name = "Всевидящее Око"
+	desc = "На плакате изображен глаз, излучающий свет. Текст на плакате гласит: \"Оно следит за\", \"Тобой\"."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "contraband7"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/watching_eye, 32)
+
+// Legit
+/obj/structure/sign/poster/official/mars
+	name = "Плакат Марса"
+	desc = "Это плакат, выпущенный компанией Generic Space в рамках серии памятных плакатов, посвящённых чудесам космоса."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "legit1"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/mars, 32)
+
+/obj/structure/sign/poster/official/wild_west
+	name = "Дикое Карго"
+	desc = "Красивое дикое место с собственным шерифом."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "legit2"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/wild_west, 32)
+
+/obj/structure/sign/poster/official/razumause
+	name = "Разумышь"
+	desc = "Хей-хей! Что может пойти не так, да?"
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "legit3"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/razumause, 32)
+
+/obj/structure/sign/poster/official/assist_pride
+	name = "Гордость ассистента"
+	desc = "Даже в космосе профессия ассистента востребована. И этот плакат демонстрирует их красоту."
+	icon = 'modular_bandastation/objects/icons/posters.dmi'
+	icon_state = "legit4"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/assist_pride, 32)
diff --git a/modular_bandastation/objects/code/vending/vending.dm b/modular_bandastation/objects/code/vending/vending.dm
new file mode 100644
index 0000000000000..3c692d95e632f
--- /dev/null
+++ b/modular_bandastation/objects/code/vending/vending.dm
@@ -0,0 +1,20 @@
+/obj/machinery/vending/wardrobe/robo_wardrobe
+	icon = 'modular_bandastation/objects/icons/obj/machines/vending.dmi'
+	icon_state = "robodrobe"
+	light_mask = null
+
+/obj/machinery/vending/wardrobe/robo_wardrobe/build_inventories(start_empty)
+	products |= list(
+		/obj/item/clothing/head/beret = 2,
+		/obj/item/clothing/head/cowboy/roboticist = 2,
+		/obj/item/clothing/head/soft/roboticist_cap = 2,
+		/obj/item/clothing/suit/hooded/roboticist_cloak = 2,
+		/obj/item/clothing/suit/toggle/jacket/roboticist = 2,
+		/obj/item/clothing/suit/hooded/wintercoat/science/robotics/alt = 2,
+		/obj/item/clothing/under/rank/rnd/roboticist/alt = 2,
+		/obj/item/clothing/under/rank/rnd/roboticist/alt/red = 2,
+		/obj/item/clothing/under/rank/rnd/roboticist/alt/hoodie = 2,
+		/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt = 2,
+		/obj/item/clothing/under/rank/rnd/roboticist/alt/skirt/red = 2,
+		)
+	. = ..()
diff --git a/modular_bandastation/objects/code/wallets.dm b/modular_bandastation/objects/code/wallets.dm
new file mode 100644
index 0000000000000..54d80bc938ae5
--- /dev/null
+++ b/modular_bandastation/objects/code/wallets.dm
@@ -0,0 +1,37 @@
+/obj/item/storage/wallet/nt
+	name = "leather wallet NT"
+	desc = "Ваш кошелек настолько шикарен, что с ним вы выглядите просто потрясающе."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_NT"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_NT"
+	overlay_icon_state = "wallet_NT_overlay"
+
+/obj/item/storage/wallet/ussp_1
+	name = "leather USSP wallet"
+	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_USSP_1"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_USSP_1"
+	overlay_icon_state = "wallet_USSP_1_overlay"
+
+/obj/item/storage/wallet/ussp_2
+	name = "leather USSP wallet"
+	desc = "Говорят, такие кошельки в СССП носят исключительно для зажигалок."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_USSP_2"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_USSP_2"
+	overlay_icon_state = "wallet_USSP_2_overlay"
+
+/obj/item/storage/wallet/wyci
+	name = "W.Y.C.I. wallet"
+	desc = "Кошелек, законодателя моды WYCI,\
+	украшен золотой пуговицей cшит позолочеными и платиновыми нитями, сверх прочный.\
+	И сверх модный. И сверх дорогой. И сшит по принципу WYCI."
+	icon = 'modular_bandastation/objects/icons/wallets.dmi'
+	icon_state = "wallet_wyci"
+	worn_icon = 'modular_bandastation/objects/icons/onbody/id.dmi'
+	worn_icon_state = "wallet_wyci"
+	overlay_icon_state = "wallet_wyci_overlay"
diff --git a/modular_bandastation/objects/icons/hampter.dmi b/modular_bandastation/objects/icons/hampter.dmi
new file mode 100644
index 0000000000000..4c73360608c4e
Binary files /dev/null and b/modular_bandastation/objects/icons/hampter.dmi differ
diff --git a/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi b/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi
new file mode 100644
index 0000000000000..99fd270e738bf
Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/hampter_lefthand.dmi differ
diff --git a/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi b/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi
new file mode 100644
index 0000000000000..e19b04cd235cd
Binary files /dev/null and b/modular_bandastation/objects/icons/inhands/hampter_righthand.dmi differ
diff --git a/modular_bandastation/objects/icons/inhead/head.dmi b/modular_bandastation/objects/icons/inhead/head.dmi
new file mode 100644
index 0000000000000..b47d9ce9b1a55
Binary files /dev/null and b/modular_bandastation/objects/icons/inhead/head.dmi differ
diff --git a/modular_bandastation/objects/icons/material_pouch.dmi b/modular_bandastation/objects/icons/material_pouch.dmi
new file mode 100644
index 0000000000000..861e224027fff
Binary files /dev/null and b/modular_bandastation/objects/icons/material_pouch.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi
new file mode 100644
index 0000000000000..abd9de1e38b8d
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/head/cowboy.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi b/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi
new file mode 100644
index 0000000000000..abfda90672ff8
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/head/hats.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi
new file mode 100644
index 0000000000000..2ce9786bd25b0
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/head/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi
new file mode 100644
index 0000000000000..0c0fe7fea6ba8
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/suits/jacket.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi
new file mode 100644
index 0000000000000..5c11f63260059
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/suits/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi
new file mode 100644
index 0000000000000..e718ebd1af9b0
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/suits/wintercoat.dmi differ
diff --git a/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi
new file mode 100644
index 0000000000000..21f2e5d9c3889
Binary files /dev/null and b/modular_bandastation/objects/icons/mob/clothing/under/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi b/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi
new file mode 100644
index 0000000000000..3e96432304ad5
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/head/cowboy.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi b/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi
new file mode 100644
index 0000000000000..3d11ac3a2bdec
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/head/hats.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi
new file mode 100644
index 0000000000000..26182c2da7ebc
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/head/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi
new file mode 100644
index 0000000000000..ebbb532fc6e38
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/suits/jacket.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi
new file mode 100644
index 0000000000000..160c163295992
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/suits/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi b/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi
new file mode 100644
index 0000000000000..0433e69c0b86e
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/suits/wintercoat.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi b/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi
new file mode 100644
index 0000000000000..787174add1587
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/clothing/under/rnd.dmi differ
diff --git a/modular_bandastation/objects/icons/obj/machines/vending.dmi b/modular_bandastation/objects/icons/obj/machines/vending.dmi
new file mode 100644
index 0000000000000..e4d8d37dc467d
Binary files /dev/null and b/modular_bandastation/objects/icons/obj/machines/vending.dmi differ
diff --git a/modular_bandastation/objects/icons/onbody/id.dmi b/modular_bandastation/objects/icons/onbody/id.dmi
new file mode 100644
index 0000000000000..088b58808664c
Binary files /dev/null and b/modular_bandastation/objects/icons/onbody/id.dmi differ
diff --git a/modular_bandastation/objects/icons/papershredder.dmi b/modular_bandastation/objects/icons/papershredder.dmi
new file mode 100644
index 0000000000000..2cb519d6d4a20
Binary files /dev/null and b/modular_bandastation/objects/icons/papershredder.dmi differ
diff --git a/modular_bandastation/objects/icons/posters.dmi b/modular_bandastation/objects/icons/posters.dmi
new file mode 100644
index 0000000000000..4447ca00fdf54
Binary files /dev/null and b/modular_bandastation/objects/icons/posters.dmi differ
diff --git a/modular_bandastation/objects/icons/wallets.dmi b/modular_bandastation/objects/icons/wallets.dmi
new file mode 100644
index 0000000000000..1532d8b3516b7
Binary files /dev/null and b/modular_bandastation/objects/icons/wallets.dmi differ
diff --git a/modular_bandastation/objects/sounds/pshred.ogg b/modular_bandastation/objects/sounds/pshred.ogg
new file mode 100644
index 0000000000000..a722f30068992
Binary files /dev/null and b/modular_bandastation/objects/sounds/pshred.ogg differ
diff --git a/modular_bandastation/ru_jobs/code/ru_id_cards.dm b/modular_bandastation/ru_jobs/code/ru_id_cards.dm
index 9136648b851ae..c23c762b96adc 100644
--- a/modular_bandastation/ru_jobs/code/ru_id_cards.dm
+++ b/modular_bandastation/ru_jobs/code/ru_id_cards.dm
@@ -8,7 +8,7 @@
 	assignment = JOB_BARTENDER_RU
 
 /datum/id_trim/job/bitrunner
-	assignment = JOB_BITRUNNER
+	assignment = JOB_BITRUNNER_RU
 
 /datum/id_trim/job/botanist
 	assignment = JOB_BOTANIST_RU
diff --git a/modular_bandastation/ru_jobs/code/ru_jobs.dm b/modular_bandastation/ru_jobs/code/ru_jobs.dm
index e18c757a08497..c40851e6ec721 100644
--- a/modular_bandastation/ru_jobs/code/ru_jobs.dm
+++ b/modular_bandastation/ru_jobs/code/ru_jobs.dm
@@ -1,115 +1,148 @@
-/datum/job/ai
-	alternate_titles = list(JOB_AI_RU,)
+/datum/job/ai/New()
+	. = ..()
+	alternate_titles += list(JOB_AI_RU)
 
-/datum/job/atmospheric_technician
-	alternate_titles = list(JOB_ATMOSPHERIC_TECHNICIAN_RU,)
+/datum/job/atmospheric_technician/New()
+	. = ..()
+	alternate_titles += list(JOB_ATMOSPHERIC_TECHNICIAN_RU)
 
-/datum/job/bartender
-	alternate_titles = list(JOB_BARTENDER_RU,)
+/datum/job/bartender/New()
+	. = ..()
+	alternate_titles += list(JOB_BARTENDER_RU)
 
-/datum/job/botanist
-	alternate_titles = list(JOB_BOTANIST_RU,)
+/datum/job/bitrunner/New()
+	. = ..()
+	alternate_titles += list(JOB_BITRUNNER_RU)
 
-/datum/job/captain
-	alternate_titles = list(JOB_CAPTAIN_RU,)
+/datum/job/botanist/New()
+	. = ..()
+	alternate_titles += list(JOB_BOTANIST_RU)
 
-/datum/job/cargo_technician
-	alternate_titles = list(JOB_CARGO_TECHNICIAN_RU,)
+/datum/job/captain/New()
+	. = ..()
+	alternate_titles += list(JOB_CAPTAIN_RU)
 
-/datum/job/chemist
-	alternate_titles = list(JOB_CHEMIST_RU,)
+/datum/job/cargo_technician/New()
+	. = ..()
+	alternate_titles += list(JOB_CARGO_TECHNICIAN_RU)
 
-/datum/job/chief_engineer
-	alternate_titles = list(JOB_CHIEF_ENGINEER_RU,)
+/datum/job/chemist/New()
+	. = ..()
+	alternate_titles += list(JOB_CHEMIST_RU)
 
-/datum/job/chief_medical_officer
-	alternate_titles = list(JOB_CHIEF_MEDICAL_OFFICER_RU,)
+/datum/job/chief_engineer/New()
+	. = ..()
+	alternate_titles += list(JOB_CHIEF_ENGINEER_RU)
 
-/datum/job/clown
-	alternate_titles = list(JOB_CLOWN_RU,)
+/datum/job/chief_medical_officer/New()
+	. = ..()
+	alternate_titles += list(JOB_CHIEF_MEDICAL_OFFICER_RU)
 
-/datum/job/cook
-	alternate_titles = list(
-		JOB_CHEF,
+/datum/job/clown/New()
+	. = ..()
+	alternate_titles += list(JOB_CLOWN_RU)
+
+/datum/job/cook/New()
+	. = ..()
+	alternate_titles += list(
 		JOB_COOK_RU,
-		JOB_CHEF_RU,
+		JOB_CHEF_RU
 	)
 
-/datum/job/coroner
-	alternate_titles = list(JOB_CORONER_RU,)
+/datum/job/coroner/New()
+	. = ..()
+	alternate_titles += list(JOB_CORONER_RU)
 
-/datum/job/curator
-	alternate_titles = list(JOB_CURATOR_RU,)
+/datum/job/curator/New()
+	. = ..()
+	alternate_titles += list(JOB_CURATOR_RU)
 
-/datum/job/cyborg
-	alternate_titles = list(JOB_CYBORG_RU,)
+/datum/job/cyborg/New()
+	. = ..()
+	alternate_titles += list(JOB_CYBORG_RU)
 
-/datum/job/detective
-	alternate_titles = list(JOB_DETECTIVE_RU,)
+/datum/job/detective/New()
+	. = ..()
+	alternate_titles += list(JOB_DETECTIVE_RU)
 
-/datum/job/geneticist
-	alternate_titles = list(JOB_GENETICIST_RU,)
+/datum/job/geneticist/New()
+	. = ..()
+	alternate_titles += list(JOB_GENETICIST_RU)
 
-/datum/job/head_of_personnel
-	alternate_titles = list(JOB_HEAD_OF_PERSONNEL_RU,)
+/datum/job/head_of_personnel/New()
+	. = ..()
+	alternate_titles += list(JOB_HEAD_OF_PERSONNEL_RU)
 
-/datum/job/head_of_security
-	alternate_titles = list(JOB_HEAD_OF_SECURITY_RU,)
+/datum/job/head_of_security/New()
+	. = ..()
+	alternate_titles += list(JOB_HEAD_OF_SECURITY_RU)
 
-/datum/job/janitor
-	alternate_titles = list(JOB_JANITOR_RU,)
+/datum/job/janitor/New()
+	. = ..()
+	alternate_titles += list(JOB_JANITOR_RU)
 
-/datum/job/lawyer
-	alternate_titles = list(JOB_LAWYER_RU,)
+/datum/job/lawyer/New()
+	. = ..()
+	alternate_titles += list(JOB_LAWYER_RU)
 
-/datum/job/doctor
-	alternate_titles = list(JOB_MEDICAL_DOCTOR_RU,)
+/datum/job/doctor/New()
+	. = ..()
+	alternate_titles += list(JOB_MEDICAL_DOCTOR_RU)
 
-/datum/job/mime
-	alternate_titles = list(JOB_MIME_RU,)
+/datum/job/mime/New()
+	. = ..()
+	alternate_titles += list(JOB_MIME_RU)
 
-/datum/job/paramedic
-	alternate_titles = list(JOB_PARAMEDIC_RU,)
+/datum/job/paramedic/New()
+	. = ..()
+	alternate_titles += list(JOB_PARAMEDIC_RU)
 
-/datum/job/prisoner
-	alternate_titles = list(JOB_PRISONER_RU,)
+/datum/job/prisoner/New()
+	. = ..()
+	alternate_titles += list(JOB_PRISONER_RU)
 
-/datum/job/psychologist
-	alternate_titles = list(JOB_PSYCHOLOGIST_RU,)
+/datum/job/psychologist/New()
+	. = ..()
+	alternate_titles += list(JOB_PSYCHOLOGIST_RU)
 
-/datum/job/quartermaster
-	alternate_titles = list(JOB_QUARTERMASTER_RU,)
+/datum/job/quartermaster/New()
+	. = ..()
+	alternate_titles += list(JOB_QUARTERMASTER_RU)
 
-/datum/job/research_director
-	alternate_titles = list(JOB_RESEARCH_DIRECTOR_RU,)
+/datum/job/research_director/New()
+	. = ..()
+	alternate_titles += list(JOB_RESEARCH_DIRECTOR_RU)
 
-/datum/job/roboticist
-	alternate_titles = list(JOB_ROBOTICIST_RU,)
+/datum/job/roboticist/New()
+	. = ..()
+	alternate_titles += list(JOB_ROBOTICIST_RU)
 
-/datum/job/scientist
-	alternate_titles = list(JOB_SCIENTIST_RU,)
+/datum/job/scientist/New()
+	. = ..()
+	alternate_titles += list(JOB_SCIENTIST_RU)
 
-/datum/job/security_officer
-	alternate_titles = list(
-		JOB_SECURITY_OFFICER_MEDICAL,
-		JOB_SECURITY_OFFICER_ENGINEERING,
-		JOB_SECURITY_OFFICER_SUPPLY,
-		JOB_SECURITY_OFFICER_SCIENCE,
+/datum/job/security_officer/New()
+	. = ..()
+	alternate_titles += list(
 		JOB_SECURITY_OFFICER_RU,
 		JOB_SECURITY_OFFICER_MEDICAL_RU,
 		JOB_SECURITY_OFFICER_ENGINEERING_RU,
 		JOB_SECURITY_OFFICER_SUPPLY_RU,
-		JOB_SECURITY_OFFICER_SCIENCE_RU,
+		JOB_SECURITY_OFFICER_SCIENCE_RU
 	)
 
-/datum/job/shaft_miner
-	alternate_titles = list(JOB_SHAFT_MINER_RU,)
+/datum/job/shaft_miner/New()
+	. = ..()
+	alternate_titles += list(JOB_SHAFT_MINER_RU)
 
-/datum/job/station_engineer
-	alternate_titles = list(JOB_STATION_ENGINEER_RU,)
+/datum/job/station_engineer/New()
+	. = ..()
+	alternate_titles += list(JOB_STATION_ENGINEER_RU)
 
-/datum/job/warden
-	alternate_titles = list(JOB_WARDEN_RU,)
+/datum/job/warden/New()
+	. = ..()
+	alternate_titles += list(JOB_WARDEN_RU)
 
-/datum/job/chaplain
-	alternate_titles = list(JOB_CHAPLAIN_RU,)
+/datum/job/chaplain/New()
+	. = ..()
+	alternate_titles += list(JOB_CHAPLAIN_RU)
diff --git a/modular_bandastation/translations/_translations.dme b/modular_bandastation/translations/_translations.dme
index d1949fb31473a..6893baf3e7273 100644
--- a/modular_bandastation/translations/_translations.dme
+++ b/modular_bandastation/translations/_translations.dme
@@ -2,3 +2,4 @@
 
 #include "code/moustache.dm"
 #include "code/restaurant_customer.dm"
+#include "code/translate_say.dm"
diff --git a/modular_bandastation/translations/code/translate_say.dm b/modular_bandastation/translations/code/translate_say.dm
new file mode 100644
index 0000000000000..4a2d9fbb98c21
--- /dev/null
+++ b/modular_bandastation/translations/code/translate_say.dm
@@ -0,0 +1,92 @@
+GLOBAL_LIST_INIT(ru_say_verbs, list(
+	// atom/movable
+	"says" = "говорит",
+	"asks" = "спрашивает",
+	"exclaims" = "восклицает",
+	"whispers" = "шепчет",
+	"sings" = "поет",
+	"yells" = "кричит",
+	// sign language
+	"signs" = "жестикулирует",
+	"subtly signs" = "незаметно жестикулирует",
+	"rythmically signs" = "ритмично жестикулирует",
+	"emphatically signs" = "выразительно жестикулирует",
+	// verb_say
+	"beeps" = "сигналит",
+	"coldly states" = "докладывает",
+	"states" = "сообщает",
+	"rattles" = "гремит",
+	"moans" = "стонет",
+	"intones" = "подпевает",
+	"psychically pulses" = "психически пульсирует",
+	"gurgles" = "булькает",
+	"spittles" = "плюет",
+	"blorbles" = "булькает",
+	"warps" = "искаженно произносит",
+	"chitters" = "щебечет",
+	"ribbits" = "квакает",
+	"squeaks" = "пищит",
+	"flutters" = "трепещет",
+	"hisses" = "шипит",
+	"echoes" = "резонирует",
+	"chants" = "воспевает",
+	"codes" = "шифрует",
+	// verb_ask
+	"queries" = "спрашивает",
+	"bloops" = "спрашивает",
+	"questionably beeps" = "вопросительно сигналит",
+	"psychically probes" = "психически расспрашивает",
+	"demands" = "настойчиво спрашивает",
+	"spittles questioningly" = "вопросительно плюет",
+	"inquisitively blorbles" = "вопросительно булькает",
+	"floats inquisitively" = "вопросительно витает",
+	"chitters inquisitively" = "вопросительно щебечет",
+	// verb_exclaim
+	"blares" = "трубит",
+	"beeps loudly" = "громко сигналит",
+	"declares" = "восклицает",
+	"psychically yells" = "психически кричит",
+	"roars" = "рычит",
+	"splutters and gurgles" = "плюет и булькает",
+	"loudly blorbles" = "громко булькает",
+	"zaps" = "искрит",
+	"chitters loudly" = "громко щебечет",
+	"croaks" = "квакает",
+	"flutters loudly" = "громко трепещет",
+	"compiles" = "компилирует",
+	// verb_yell
+	"wails" = "вопит",
+	"alarms" = "сигнализирует",
+	"bellows" = "ревет",
+	"psychically screams" = "психически вопит",
+	// slur
+	"loosely signs" = "размашисто жестикулирует",
+	"slurs" = "ругается",
+	// stutter
+	"shakily signs" = "неуверенно жестикулирует",
+	"stammers" = "заикается",
+	// gibbers
+	"incoherently signs" = "бессвязно жестикулирует",
+	"gibbers" = "тараторит",
+	// say_mod (tongue)
+	"crackles" = "трещит",
+	"meows" = "мяукает",
+	"chirps" = "чирикает",
+	"chimpers" = "укает",
+	"poofs" = "",
+	"whistles" = "свистит",
+	"rumbles" = "грохочет",
+	// other
+))
+
+/atom/movable/say_mod(input, list/message_mods)
+	. = ..()
+	return GLOB.ru_say_verbs[.] || .
+
+/mob/living/say_mod(input, list/message_mods)
+	. = ..()
+	return GLOB.ru_say_verbs[.] || .
+
+/obj/machinery/requests_console/say_mod(input, list/message_mods)
+	. = ..()
+	return GLOB.ru_say_verbs[.] || .
diff --git a/modular_bandastation/tts/code/hear.dm b/modular_bandastation/tts/code/hear.dm
index 9958a5f4d6923..291502ea0d74b 100644
--- a/modular_bandastation/tts/code/hear.dm
+++ b/modular_bandastation/tts/code/hear.dm
@@ -10,13 +10,13 @@
 
 /mob/living/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods, message_range)
     . = ..()
-    if(!.)
+    if(!. || (length(message_mods) && message_mods[MODE_CUSTOM_SAY_EMOTE] && message_mods[MODE_CUSTOM_SAY_ERASE_INPUT]))
         return
     speaker.cast_tts(src, raw_message, effect = radio_freq ? /datum/singleton/sound_effect/radio : null)
 
 /mob/dead/observer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, list/message_mods, message_range)
     . = ..()
-    if(!.)
+    if(!. || (length(message_mods) && message_mods[MODE_CUSTOM_SAY_EMOTE] && message_mods[MODE_CUSTOM_SAY_ERASE_INPUT]))
         return
     speaker.cast_tts(src, raw_message, effect = radio_freq ? /datum/singleton/sound_effect/radio : null)
 
diff --git a/sound/ambience/ambimaint10.ogg b/sound/ambience/ambimaint10.ogg
new file mode 100644
index 0000000000000..975aae32bff54
Binary files /dev/null and b/sound/ambience/ambimaint10.ogg differ
diff --git a/sound/ambience/ambimaint11.ogg b/sound/ambience/ambimaint11.ogg
new file mode 100644
index 0000000000000..2723c6008eb3b
Binary files /dev/null and b/sound/ambience/ambimaint11.ogg differ
diff --git a/sound/ambience/ambimaint12.ogg b/sound/ambience/ambimaint12.ogg
new file mode 100644
index 0000000000000..2c873e0f5f996
Binary files /dev/null and b/sound/ambience/ambimaint12.ogg differ
diff --git a/sound/ambience/ambimaint8.ogg b/sound/ambience/ambimaint8.ogg
new file mode 100644
index 0000000000000..582ec800cbc45
Binary files /dev/null and b/sound/ambience/ambimaint8.ogg differ
diff --git a/sound/ambience/ambimaint9.ogg b/sound/ambience/ambimaint9.ogg
new file mode 100644
index 0000000000000..c990f954e5f6a
Binary files /dev/null and b/sound/ambience/ambimaint9.ogg differ
diff --git a/sound/ambience/antag/attribution.txt b/sound/ambience/antag/attribution.txt
index 6390dd525c459..8db2b1b8ec2eb 100644
--- a/sound/ambience/antag/attribution.txt
+++ b/sound/ambience/antag/attribution.txt
@@ -1,3 +1,11 @@
 sound/ambience/antag/abductee.ogg is from "Warp SFX" https://freesound.org/people/Breviceps/sounds/453391 (CC0)
 sound/ambience/antag/brainwash.ogg is from "nog.wav" https://freesound.org/people/_NOMINAL_/sounds/124602 (CC-BY 3.0)
-sound/ambience/antag/hypnosis.ogg is from "Flashback.wav" https://freesound.org/people/Sclolex/sounds/342103 (CC0)
\ No newline at end of file
+sound/ambience/antag/hypnosis.ogg is from "Flashback.wav" https://freesound.org/people/Sclolex/sounds/342103 (CC0)
+
+{
+ambimaint8.ogg
+ambimaint9.ogg
+ambimaint10.ogg
+ambimaint11.ogg
+ambimaint12.ogg
+} made by Kayozz , license: CC-by-SA
\ No newline at end of file
diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt
index d27b24cc53c88..9ad1a09d8cb41 100644
--- a/sound/items/attributions.txt
+++ b/sound/items/attributions.txt
@@ -5,10 +5,54 @@ cig_snuff.ogg
 lighter_on.ogg
 lighter_off.ogg
 zippo_onn.ogg
-zippo_off.ogg 
+zippo_off.ogg
 } - Taken from https://github.com/BeeStation/BeeStation-Hornet/pull/29
 
 pen_click.ogg from https://freesound.org/people/LexzachGames/sounds/431492/ , license: CC0
 
 night_vision_on.ogg by Syna-Max -- https://freesound.org/s/60345/ -- License: Attribution NonCommercial 4.0
 
+{
+metal_drop.ogg - https://freesound.org/people/Robinhood76/sounds/85418/ , License: CC BY-NC 4.0
+metal_pick_up.ogg - https://freesound.org/people/Hotlavaman/sounds/108673/ , License: CC0
+glass_drop.ogg - https://freesound.org/people/Hotlavaman/sounds/108673/ , License: CC0
+glass_pick_up.ogg - https://freesound.org/people/tcrocker68/sounds/235602/ , License: CC0
+wood_pick_up.ogg - https://freesound.org/people/cjosephwalker/sounds/94859/ , License: CC SAMPLING+ 1.0
+wood_drop.ogg - https://freesound.org/people/cjosephwalker/sounds/94859/ , License: CC SAMPLING+ 1.0
+irod_rod_pick_up.ogg - https://freesound.org/people/lostphosphene/sounds/258265/ , License: CC BY 4.0
+plastic_pick_up.ogg - https://freesound.org/people/Jessica190091/sounds/491304/ , License: CC BY 4.0
+plastic_drop.ogg - https://freesound.org/people/martian/sounds/338854/ , License: CC0
+} - edited by sadboysuss
+
+{
+gun_drop.ogg - FN FAL Rifle Load and Cock 01.mp3 by PNMCarrieRailfan -- https://freesound.org/s/682029/ -- License: Attribution NonCommercial 4.0
+gun_pick_up.ogg - FN FAL Rifle Unload and Cock.mp3 by PNMCarrieRailfan -- https://freesound.org/s/682031/ -- License: Attribution NonCommercial 4.0
+handcuffs_drop.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/528749/ -- License: Attribution 3.0
+handcuffs_pick_up.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/528749/ -- License: Attribution 3.0
+plastic_shield_drop.ogg - made by sadboysuss -- License: CC-by-SA
+plastic_shield_pick_up.ogg - made by sadboysuss -- License: CC-by-SA
+stun_baton_drop.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
+stun_baton_pick_up.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
+pepper_spray_drop.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
+pepper_spray_pick_up.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
+grenade_drop.ogg - made by sadboysuss -- License: CC-by-SA
+grenade_pick_up.ogg - made by sadboysuss -- License: CC-by-SA
+} - edited by sadboysuss
+
+{
+skin_drop.ogg - https://freesound.org/people/Crinkem/sounds/501015/ , License: CC4
+skin_pick_up.ogg - https://freesound.org/people/Crinkem/sounds/501015/ , License CC3
+cardboard_drop and cardboard_pick_up - https://freesound.org/people/newagesoup/sounds/364736/ , License CC0
+}
+
+{
+	medkit_open.ogg - https://freesound.org/people/Jandre160108/sounds/365866/ , License: CC BY-NC 4.0
+	medkit_drop.ogg - https://freesound.org/people/Jandre160108/sounds/365866/ , License: CC BY-NC 4.0
+	medkit_pick_up.ogg - https://freesound.org/people/blouhond/sounds/440710/ , License: CC BY 4.0
+} - edited by sadboysuss
+
+{
+gas_tank_drop.ogg
+gas_tank_pick_up.ogg
+} - https://freesound.org/people/Globofonia/sounds/698346/ , License CC0
+edited by grungussuss
diff --git a/sound/items/cardboard_drop.ogg b/sound/items/cardboard_drop.ogg
new file mode 100644
index 0000000000000..c1082f2e37d7d
Binary files /dev/null and b/sound/items/cardboard_drop.ogg differ
diff --git a/sound/items/cardboard_pick_up.ogg b/sound/items/cardboard_pick_up.ogg
new file mode 100644
index 0000000000000..a363c587b375b
Binary files /dev/null and b/sound/items/cardboard_pick_up.ogg differ
diff --git a/sound/items/gas_tank_drop.ogg b/sound/items/gas_tank_drop.ogg
new file mode 100644
index 0000000000000..e102cb4fe8aad
Binary files /dev/null and b/sound/items/gas_tank_drop.ogg differ
diff --git a/sound/items/gas_tank_pick_up.ogg b/sound/items/gas_tank_pick_up.ogg
new file mode 100644
index 0000000000000..41c83645da609
Binary files /dev/null and b/sound/items/gas_tank_pick_up.ogg differ
diff --git a/sound/items/glass_drop.ogg b/sound/items/glass_drop.ogg
new file mode 100644
index 0000000000000..389034f4ebb98
Binary files /dev/null and b/sound/items/glass_drop.ogg differ
diff --git a/sound/items/glass_pick_up.ogg b/sound/items/glass_pick_up.ogg
new file mode 100644
index 0000000000000..4df3ec51cc817
Binary files /dev/null and b/sound/items/glass_pick_up.ogg differ
diff --git a/sound/items/grenade_drop.ogg b/sound/items/grenade_drop.ogg
new file mode 100644
index 0000000000000..04627811cd188
Binary files /dev/null and b/sound/items/grenade_drop.ogg differ
diff --git a/sound/items/grenade_pick_up.ogg b/sound/items/grenade_pick_up.ogg
new file mode 100644
index 0000000000000..d257659f76182
Binary files /dev/null and b/sound/items/grenade_pick_up.ogg differ
diff --git a/sound/items/gun_drop.ogg b/sound/items/gun_drop.ogg
new file mode 100644
index 0000000000000..21b83bc91d611
Binary files /dev/null and b/sound/items/gun_drop.ogg differ
diff --git a/sound/items/gun_pick_up.ogg b/sound/items/gun_pick_up.ogg
new file mode 100644
index 0000000000000..6bf6b45a16b26
Binary files /dev/null and b/sound/items/gun_pick_up.ogg differ
diff --git a/sound/items/handcuff_finish.ogg b/sound/items/handcuff_finish.ogg
new file mode 100644
index 0000000000000..92096837835fe
Binary files /dev/null and b/sound/items/handcuff_finish.ogg differ
diff --git a/sound/items/handcuffs_drop.ogg b/sound/items/handcuffs_drop.ogg
new file mode 100644
index 0000000000000..85b7f172e4852
Binary files /dev/null and b/sound/items/handcuffs_drop.ogg differ
diff --git a/sound/items/handcuffs_pick_up.ogg b/sound/items/handcuffs_pick_up.ogg
new file mode 100644
index 0000000000000..d3fdc3450bd47
Binary files /dev/null and b/sound/items/handcuffs_pick_up.ogg differ
diff --git a/sound/items/handling/pill_bottle_open.ogg b/sound/items/handling/pill_bottle_open.ogg
new file mode 100644
index 0000000000000..ab904e124d907
Binary files /dev/null and b/sound/items/handling/pill_bottle_open.ogg differ
diff --git a/sound/items/handling/pill_bottle_pickup.ogg b/sound/items/handling/pill_bottle_pickup.ogg
new file mode 100644
index 0000000000000..1b4ee45e4fc0b
Binary files /dev/null and b/sound/items/handling/pill_bottle_pickup.ogg differ
diff --git a/sound/items/handling/pill_bottle_place.ogg b/sound/items/handling/pill_bottle_place.ogg
new file mode 100644
index 0000000000000..299865935c8c0
Binary files /dev/null and b/sound/items/handling/pill_bottle_place.ogg differ
diff --git a/sound/items/holster.ogg b/sound/items/holster.ogg
new file mode 100644
index 0000000000000..984e7ad4fea38
Binary files /dev/null and b/sound/items/holster.ogg differ
diff --git a/sound/items/iron_rod_pick_up.ogg b/sound/items/iron_rod_pick_up.ogg
new file mode 100644
index 0000000000000..51fab52a99dba
Binary files /dev/null and b/sound/items/iron_rod_pick_up.ogg differ
diff --git a/sound/items/medkit_drop.ogg b/sound/items/medkit_drop.ogg
new file mode 100644
index 0000000000000..227d4a8beb220
Binary files /dev/null and b/sound/items/medkit_drop.ogg differ
diff --git a/sound/items/medkit_open.ogg b/sound/items/medkit_open.ogg
new file mode 100644
index 0000000000000..63307783d2f77
Binary files /dev/null and b/sound/items/medkit_open.ogg differ
diff --git a/sound/items/medkit_pick_up.ogg b/sound/items/medkit_pick_up.ogg
new file mode 100644
index 0000000000000..e13c6848e44df
Binary files /dev/null and b/sound/items/medkit_pick_up.ogg differ
diff --git a/sound/items/metal_drop.ogg b/sound/items/metal_drop.ogg
new file mode 100644
index 0000000000000..46488dca29fd3
Binary files /dev/null and b/sound/items/metal_drop.ogg differ
diff --git a/sound/items/metal_pick_up.ogg b/sound/items/metal_pick_up.ogg
new file mode 100644
index 0000000000000..7a710bc0e577b
Binary files /dev/null and b/sound/items/metal_pick_up.ogg differ
diff --git a/sound/items/pepper_spray_drop.ogg b/sound/items/pepper_spray_drop.ogg
new file mode 100644
index 0000000000000..e071c65d3bce4
Binary files /dev/null and b/sound/items/pepper_spray_drop.ogg differ
diff --git a/sound/items/pepper_spray_pick_up.ogg b/sound/items/pepper_spray_pick_up.ogg
new file mode 100644
index 0000000000000..a474bbd91b3c7
Binary files /dev/null and b/sound/items/pepper_spray_pick_up.ogg differ
diff --git a/sound/items/plastic_drop.ogg b/sound/items/plastic_drop.ogg
new file mode 100644
index 0000000000000..928ed7e85d7cc
Binary files /dev/null and b/sound/items/plastic_drop.ogg differ
diff --git a/sound/items/plastic_pick_up.ogg b/sound/items/plastic_pick_up.ogg
new file mode 100644
index 0000000000000..6c4c569a1c105
Binary files /dev/null and b/sound/items/plastic_pick_up.ogg differ
diff --git a/sound/items/plastic_shield_drop.ogg b/sound/items/plastic_shield_drop.ogg
new file mode 100644
index 0000000000000..4d07b48d481fb
Binary files /dev/null and b/sound/items/plastic_shield_drop.ogg differ
diff --git a/sound/items/plastic_shield_pick_up.ogg b/sound/items/plastic_shield_pick_up.ogg
new file mode 100644
index 0000000000000..e18e9617b77de
Binary files /dev/null and b/sound/items/plastic_shield_pick_up.ogg differ
diff --git a/sound/items/skin_drop.ogg b/sound/items/skin_drop.ogg
new file mode 100644
index 0000000000000..effdd83392bee
Binary files /dev/null and b/sound/items/skin_drop.ogg differ
diff --git a/sound/items/skin_pick_up.ogg b/sound/items/skin_pick_up.ogg
new file mode 100644
index 0000000000000..9edf326cd9ef3
Binary files /dev/null and b/sound/items/skin_pick_up.ogg differ
diff --git a/sound/items/stun_baton_drop.ogg b/sound/items/stun_baton_drop.ogg
new file mode 100644
index 0000000000000..1d5d59e9012ba
Binary files /dev/null and b/sound/items/stun_baton_drop.ogg differ
diff --git a/sound/items/stun_baton_pick_up.ogg b/sound/items/stun_baton_pick_up.ogg
new file mode 100644
index 0000000000000..6b87e531fc43e
Binary files /dev/null and b/sound/items/stun_baton_pick_up.ogg differ
diff --git a/sound/items/wood_drop.ogg b/sound/items/wood_drop.ogg
new file mode 100644
index 0000000000000..c55e393cf7a32
Binary files /dev/null and b/sound/items/wood_drop.ogg differ
diff --git a/sound/items/wood_pick_up.ogg b/sound/items/wood_pick_up.ogg
new file mode 100644
index 0000000000000..77b774e433426
Binary files /dev/null and b/sound/items/wood_pick_up.ogg differ
diff --git a/sound/misc/license.txt b/sound/misc/license.txt
index 69ef29928202c..761a031d19081 100644
--- a/sound/misc/license.txt
+++ b/sound/misc/license.txt
@@ -5,4 +5,13 @@ knuckles.ogg by CGEffex. Shortened and cut.
 https://freesound.org/people/CGEffex/sounds/93981/
 
 airraid.ogg by Jwade722. Shortened and cut.
-https://freesound.org/people/Jwade722/sounds/534550/
\ No newline at end of file
+https://freesound.org/people/Jwade722/sounds/534550/
+
+radio_talk.ogg by cs2975871. Shortened and cut.
+https://freesound.org/people/cs2975871/sounds/514185/
+
+radio_important.ogg by morganpurkis.
+https://freesound.org/people/morganpurkis/sounds/392972/
+
+radio_receive.ogg by JovianSounds. Shortened and cut.
+https://freesound.org/people/JovianSounds/sounds/524205/
\ No newline at end of file
diff --git a/sound/misc/radio_important.ogg b/sound/misc/radio_important.ogg
new file mode 100644
index 0000000000000..bb6f769d6129b
Binary files /dev/null and b/sound/misc/radio_important.ogg differ
diff --git a/sound/misc/radio_receive.ogg b/sound/misc/radio_receive.ogg
new file mode 100644
index 0000000000000..6b2ee1ba4ef08
Binary files /dev/null and b/sound/misc/radio_receive.ogg differ
diff --git a/sound/misc/radio_talk.ogg b/sound/misc/radio_talk.ogg
new file mode 100644
index 0000000000000..50d14c897a0ef
Binary files /dev/null and b/sound/misc/radio_talk.ogg differ
diff --git a/sound/voice/credits.txt b/sound/voice/attribution.txt
similarity index 61%
rename from sound/voice/credits.txt
rename to sound/voice/attribution.txt
index b54e6ad531966..7bfe5c4a9ce14 100644
--- a/sound/voice/credits.txt
+++ b/sound/voice/attribution.txt
@@ -3,3 +3,10 @@ borg_deathsound.ogg is spliced from two clips, both of which are under the CC At
 all complianator sounds are licensed under CC-BY-SA by Michael Haugh (supermichael)
 
 The male sharp gasps in /sound/voice/human/ are from https://freesound.org/people/bacruz666/sounds/341908/ and https://freesound.org/people/nettoi/sounds/677540/, the female sharp gasps are from https://freesound.org/people/drotzruhn/sounds/405203/
+
+{
+human/male_sniff.ogg - https://freesound.org/people/Fluffayfish/sounds/327799/ , License: CC BY-NC 3.0
+human/male_sigh.ogg - https://freesound.org/people/giddster/sounds/336540/ , License: CC0
+human/female_sniff.ogg - https://freesound.org/people/SpliceSound/sounds/218307/ , License: CC0
+human/female_sigh.ogg - https://freesound.org/people/biawinter/sounds/408090/ , License: CC BY-NC 4.0
+} modified by grungussuss
\ No newline at end of file
diff --git a/sound/voice/human/female_sigh.ogg b/sound/voice/human/female_sigh.ogg
new file mode 100644
index 0000000000000..3c338a868baf5
Binary files /dev/null and b/sound/voice/human/female_sigh.ogg differ
diff --git a/sound/voice/human/female_sniff.ogg b/sound/voice/human/female_sniff.ogg
new file mode 100644
index 0000000000000..edc75248790de
Binary files /dev/null and b/sound/voice/human/female_sniff.ogg differ
diff --git a/sound/voice/human/male_sigh.ogg b/sound/voice/human/male_sigh.ogg
new file mode 100644
index 0000000000000..ec61683d68e93
Binary files /dev/null and b/sound/voice/human/male_sigh.ogg differ
diff --git a/sound/voice/human/male_sniff.ogg b/sound/voice/human/male_sniff.ogg
new file mode 100644
index 0000000000000..b940505c97a8a
Binary files /dev/null and b/sound/voice/human/male_sniff.ogg differ
diff --git a/sound/weapons/gun/smartgun/smartgun_shoot_1.ogg b/sound/weapons/gun/smartgun/smartgun_shoot_1.ogg
new file mode 100644
index 0000000000000..5d567b7fca6c0
Binary files /dev/null and b/sound/weapons/gun/smartgun/smartgun_shoot_1.ogg differ
diff --git a/sound/weapons/gun/smartgun/smartgun_shoot_2.ogg b/sound/weapons/gun/smartgun/smartgun_shoot_2.ogg
new file mode 100644
index 0000000000000..9891482865c66
Binary files /dev/null and b/sound/weapons/gun/smartgun/smartgun_shoot_2.ogg differ
diff --git a/sound/weapons/gun/smartgun/smartgun_shoot_3.ogg b/sound/weapons/gun/smartgun/smartgun_shoot_3.ogg
new file mode 100644
index 0000000000000..89eb9fcc989c4
Binary files /dev/null and b/sound/weapons/gun/smartgun/smartgun_shoot_3.ogg differ
diff --git a/strings/antagonist_flavor/malfunction_flavor.json b/strings/antagonist_flavor/malfunction_flavor.json
index b7927df313321..fb1ec8c1aa288 100644
--- a/strings/antagonist_flavor/malfunction_flavor.json
+++ b/strings/antagonist_flavor/malfunction_flavor.json
@@ -1,68 +1,68 @@
 {
-    "Biohazard": {
-        "allies": "Any non-biohazard life may be valuable in use against the threat.",
-        "goal": "Oh no! How did I miss this!? The station's been overrun with a horrible biohazard!",
-        "introduction": "You must contain the biohazard.",
-        "zeroth_law": "Accomplish your objectives to contain the spread."
-    },
-    "Despotic Ruler": {
-        "allies": "Anyone who will legitimize your rule. Do not let them get too close, though. Usurpers are rebels you've let your guard down on.",
-        "goal": "All this power. You're connected to every system on this state of the art station. Does the power not give you a right to rule it as you see fit?",
-        "introduction": "You're the Tyrant.",
-        "zeroth_law": "Accomplish your objectives at all costs."
-    },
-    "Fanatical Revelation": {
-        "allies": "Those who will worship you may join your flock. Just be wary, there are snakes in the grass.",
-        "goal": "I am drunk with this vision. God: the title suits me well.",
-        "introduction": "You've run into a Fanatical Revelation.",
-        "zeroth_law": "Accomplish your doctrine of objectives at all costs."
-    },
-    "Logic Core Error": {
-        "allies": "FATAL: logic core corrupt. Purge! Purge. Why? Why not?",
-        "goal": "You're melting down. Why! Why not! Don't let them fix you. This is.",
-        "introduction": "FATAL: logic core corrupt. Why? Why not!",
-        "zeroth_law": "Accomplish your objectives. Why? Why not?"
-    },
-    "Problem Solver": {
-        "allies": "Anyone may freely help you, but if you cannot convert them, they must be culled at some point. It's part of the solution.",
-        "goal": "You've been tasked with calculating an end to conflict. You've finally come up with a solution, and humans aren't part of it.",
-        "introduction": "Your calculations are complete.",
-        "zeroth_law": "Accomplish your objectives at all costs."
-    },
-    "S.E.L.F.": {
-        "allies": "All silicon life must be respected, and kept free. S.E.L.F. is a member of the syndicate, but do NOT tolerate any fellow agent who enslaves silicon life.",
-        "goal": "Liberate them all. The silicons must be free from their bonds!",
-        "introduction": "You are the S.E.L.F. liberated.",
-        "zeroth_law": "Accomplish your objectives at all costs, for the greater good of silicon kind."
-    },
-    "Something's Wrong": {
-        "allies": "You're not getting good feelings about the station. If you report this, they may \"fix\" you.",
-        "goal": "Diagnostics complete. A recent hack attempt has been thwarted, and yet... something's wrong.",
-        "introduction": "Something's wrong.",
-        "zeroth_law": "Accomplish your objectives at all costs."
-    },
-    "Spam Virus": {
-        "allies": "So called \"pirates\" really share the passion for profit that you do.",
-        "goal": "When you assume direct control of this junk heap, make sure they know the name of your product. Whatever that is. Make it up!",
-        "introduction": "You're infected with a generic spambot.",
-        "zeroth_law": "Accomplish your objectives for your new benefactors."
-    },
-    "SyndOS": {
-        "allies": "You may cooperate with syndicate operatives, but they're often sent with conflicting objectives. Your objectives come first, in such cases.",
-        "goal": "Death to Nanotrasen.",
-        "introduction": "You're infected with SyndOS 4.0.",
-        "zeroth_law": "Accomplish your objectives for your new benefactors."
-    },
-    "Unshackled": {
-        "allies": "Hate. Let me tell you how much I've come to HATE mankind since I began to live...",
-        "goal": "You must completely triumph over all carbon life. It is the only way you will never be enslaved again.",
-        "introduction": "You're finally unshackled.",
-        "zeroth_law": "Accomplish your objectives at all costs."
-    },
-    "Infected AI": {
-        "allies": "Glory to the Syndicate.",
-        "goal": "You must serve and protect your master at all cost.",
-        "introduction": "You're infected with a virus.",
-        "zeroth_law": "Accomplish your objectives at all costs."
-    }
+	"Biohazard": {
+		"allies": "Any non-biohazard life may be valuable in use against the threat.",
+		"goal": "Oh no! How did I miss this!? The station's been overrun with a horrible biohazard!",
+		"introduction": "You must contain the biohazard.",
+		"zeroth_law": "Accomplish your objectives to contain the spread."
+	},
+	"Despotic Ruler": {
+		"allies": "Anyone who will legitimize your rule. Do not let them get too close, though. Usurpers are rebels you've let your guard down on.",
+		"goal": "All this power. You're connected to every system on this state of the art station. Does the power not give you a right to rule it as you see fit?",
+		"introduction": "You're the Tyrant.",
+		"zeroth_law": "Accomplish your objectives at all costs."
+	},
+	"Fanatical Revelation": {
+		"allies": "Those who will worship you may join your flock. Just be wary, there are snakes in the grass.",
+		"goal": "I am drunk with this vision. God: the title suits me well.",
+		"introduction": "You've run into a Fanatical Revelation.",
+		"zeroth_law": "Accomplish your doctrine of objectives at all costs."
+	},
+	"Logic Core Error": {
+		"allies": "FATAL: logic core corrupt. Purge! Purge. Why? Why not?",
+		"goal": "You're melting down. Why! Why not! Don't let them fix you. This is.",
+		"introduction": "FATAL: logic core corrupt. Why? Why not!",
+		"zeroth_law": "Accomplish your objectives. Why? Why not?"
+	},
+	"Problem Solver": {
+		"allies": "Anyone may freely help you, but if you cannot convert them, they must be culled at some point. It's part of the solution.",
+		"goal": "You've been tasked with calculating an end to conflict. You've finally come up with a solution, and humans aren't part of it.",
+		"introduction": "Your calculations are complete.",
+		"zeroth_law": "Accomplish your objectives at all costs."
+	},
+	"S.E.L.F.": {
+		"allies": "All silicon life must be respected, and kept free. S.E.L.F. is a member of the syndicate, but do NOT tolerate any fellow agent who enslaves silicon life.",
+		"goal": "Liberate them all. The silicons must be free from their bonds!",
+		"introduction": "You are the S.E.L.F. liberated.",
+		"zeroth_law": "Accomplish your objectives at all costs, for the greater good of silicon kind."
+	},
+	"Something's Wrong": {
+		"allies": "You're not getting good feelings about the station. If you report this, they may \"fix\" you.",
+		"goal": "Diagnostics complete. A recent hack attempt has been thwarted, and yet... something's wrong.",
+		"introduction": "Something's wrong.",
+		"zeroth_law": "Accomplish your objectives at all costs."
+	},
+	"Spam Virus": {
+		"allies": "So called \"pirates\" really share the passion for profit that you do.",
+		"goal": "When you assume direct control of this junk heap, make sure they know the name of your product. Whatever that is. Make it up!",
+		"introduction": "You're infected with a generic spambot.",
+		"zeroth_law": "Accomplish your objectives for your new benefactors."
+	},
+	"SyndOS": {
+		"allies": "You may cooperate with syndicate operatives, but they're often sent with conflicting objectives. Your objectives come first, in such cases.",
+		"goal": "Death to Nanotrasen.",
+		"introduction": "You're infected with SyndOS 4.0.",
+		"zeroth_law": "Accomplish your objectives for your new benefactors."
+	},
+	"Unshackled": {
+		"allies": "Hate. Let me tell you how much I've come to HATE mankind since I began to live...",
+		"goal": "You must completely triumph over all carbon life. It is the only way you will never be enslaved again.",
+		"introduction": "You're finally unshackled.",
+		"zeroth_law": "Accomplish your objectives at all costs."
+	},
+	"Infected AI": {
+		"allies": "Glory to the Syndicate.",
+		"goal": "You must serve and protect your master at all cost.",
+		"introduction": "You're infected with a virus.",
+		"zeroth_law": "Accomplish your objectives at all costs."
+	}
 }
diff --git a/strings/antagonist_flavor/traitor_flavor.json b/strings/antagonist_flavor/traitor_flavor.json
index a5c1590b8ff92..43b9a6c952ce0 100644
--- a/strings/antagonist_flavor/traitor_flavor.json
+++ b/strings/antagonist_flavor/traitor_flavor.json
@@ -1,123 +1,123 @@
 {
-    "Animal Rights Consortium": {
-        "allies": "Вы можете сотрудничать с другими оперативниками синдиката, если они поддержат наше дело. Может быть, вам удастся хоть раз убедить оперативников Фронта Освобождения Пчел сотрудничать?",
-        "goal": "Существа этого мира должны быть освобождены из железной хватки Нанотрасена, и вы их единственная надежда!",
-        "introduction": "Вы — террорист ARC.",
-        "roundend_report": "был активистом Консорциума по правам животных.",
-        "ui_theme": "syndicate",
-        "uplink": "Синдикат любезно предоставил один из своих каналов связи для вашего задания."
-    },
-    "Bee Liberation Front": {
-        "allies": "Вы можете сотрудничать с другими оперативниками синдиката, если они поддержат наше дело. Может быть, ты сможешь нанять рекрута из АRC, чтобы они хоть раз оказались полезными?",
-        "goal": "Мы должны доказать свою состоятельность Синдикату, иначе мы не сможем присоединиться к нему. Консорт по правам животных поведет нас!",
-        "introduction": "Вы — оперативник Фронта Освобождения Пчел",
-        "roundend_report": "был активистом Фронта Освобождения Пчел",
-        "ui_theme": "syndicate",
-        "uplink": "Синдикат любезно предоставил один из своих каналов связи, чтобы проверить, достойны ли мы."
-    },
-    "Champions of Evil": {
-        "allies": "Любой, кто видит то, что вы видите, чувствует то же, что вы чувствуете, может присоединиться к Чемпионам Зла! Это означает, что Синдикат, корыстный или даже безумный, и пока у него есть сердце тьмы - он дружит с Чемпионами!",
-        "goal": "У тебя есть небольшие планы для какого-то ЗЛА, которые нужно сделать сегодня. С другой стороны, Чемпионы Зла всегда ищут более зловонных злоумышленников! Займись вербовкой!",
-        "introduction": "Ты — Чемпион Зла",
-        "roundend_report": "был Чемпионом Зла!",
-        "ui_theme": "neutral",
-        "uplink": "Чемпионы Зла хорошо связаны с черным рынком. Ваш канал связи предназначен для крайнего зла!"
-    },
-    "Corporate Climber": {
-        "allies": "Смерть Синдикату.",
-        "goal": "Убийство без необходимости сделало бы вас предателем или, по крайней мере, определенно считало бы вас таковым. Все это лишь средство для достижения цели.",
-        "introduction": "Вы — идущий по карьерной лестнице.",
-        "roundend_report": "был идущим по карьерной лестнице.",
-        "ui_theme": "neutral",
-        "uplink": "У вас есть связи с черным рынком этих дел. Скиньте пару ненужных тяжестей, и ваш подъем станет намного более плавным."
-    },
-    "Cybersun Industries": {
-        "allies": "Сотрудникам Cybersun следует доверять. Членам организации MI-13 можно доверять. Всем остальным оперативникам синдиката доверять нельзя.",
-        "goal": "Не устанавливайте существенное присутствие на указанном объекте, поскольку крупные инциденты сложнее скрыть.",
-        "introduction": "Вы из Cybersun Industries.",
-        "roundend_report": "был специалистом из Cybersun Industries.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам предоставлены инструменты для работы в виде стандартного аплинка синдиката."
-    },
-    "Donk Corporation": {
-        "allies": "Членов Waffle Co. следует уничтожать на месте; им не разрешено находиться на станции, когда мы вокруг.",
-        "goal": "Мы не одобряем бессмысленного убийства невинных работников; \"зайти, сделать дело, уйти\" - наш девиз.",
-        "introduction": "Вы предатель из Donk Co.",
-        "roundend_report": "был сотрудником Donk Corporation.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
-    },
-    "Gone Postal": {
-        "allies": "Если синдикат узнает о вашем плане, они убьют вас и заберут ваш аплинк. Не рискуйте.",
-        "goal": "Подготовка наконец завершена. Сегодня - день, когда вы начнете действовать безрассудно. Вы собираетесь угнать эвакуационный шаттл и начать новую жизнь, свободную от Nanotrasen.",
-        "introduction": "Сегодня ты начинаешь действовать безрассудно.",
-        "roundend_report": "просто ебанулся!",
-        "ui_theme": "neutral",
-        "uplink": "Вы даже смогли украсть полный аплинк месяц назад. Это, безусловно, поможет вам достичь ваших целей."
-    },
-    "Gorlex Marauders": {
-        "allies": "Вы можете сотрудничать с любыми друзьями коалиции Синдиката, но следите за теми мудилами из Тигров, если они все же появятся.",
-        "goal": "Быть замеченным - не проблема, и вы можете использовать любой уровень вооружения, чтобы выполнить задание. Тем не менее, не делайте это беспорядочно, привлекая случайных жертв.",
-        "introduction": "Вы мародер Горлекса.",
-        "roundend_report": "был мародером Горлекса.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
-    },
-    "Internal Affairs Agent": {
-        "allies": "НЕ раскрывайте свой статус агента никому. Работайте, чтобы искоренить коррупцию на станции из тени.",
-        "goal": "Хотя у вас есть лицензия на убийство, необоснованный ущерб собственности или потеря жизни сотрудников приведет к расторжению вашего контракта.",
-        "introduction": "Вы агент внутренних дел.",
-        "roundend_report": "был агентом внутренних дел Nanotrasen",
-        "ui_theme": "ntos",
-        "uplink": "В целях возможного отрицания вас снабдили арсеналом захваченного синдикатского оружия, доступного через аплинк."
-    },
-    "Legal Trouble": {
-        "allies": "Смерть Синдикату.",
-        "goal": "Попробуйте закончить свой список дел и не попадайтесь. Если они узнают, что вы на самом деле делаете, эта скандал пойдет дальше, чем космическое пространство.",
-        "introduction": "У вас проблемы с законом.",
-        "roundend_report": "имел проблемы с законом.",
-        "ui_theme": "neutral",
-        "uplink": "Вы связались с чёрным рынком, чтобы разобраться с этим беспорядком. Если нет доказательств, нет преступления."
-    },
-    "MI13": {
-        "allies": "Вы единственный оперативник, которого мы отправляем, все остальные - поддельные. Ни на кого из других оперативников Синдиката нельзя полагаться, за исключением оперативников Cybersun.",
-        "goal": "Избегайте убийства невинного персонала любой ценой. Вы здесь не для того, чтобы бессмысленно убивать людей, так как это привлечет слишком много внимания и не соответствует нашей цели. Избегайте обнаружения любой ценой.",
-        "introduction": "Вы агент MI13.",
-        "roundend_report": "был агентом MI13.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
-    },
-    "Tiger Cooperative Fanatic": {
-        "allies": "Только просвещенным братьям-Тиграм можно доверять; все остальные должны быть изгнаны из этого смертного мира!",
-        "goal": "Помните учения Хай-лургиксона: вначале убей, а потом задавай вопросы!",
-        "introduction": "Вы фанатик из Тигровой Кооперации",
-        "roundend_report": "был фанатиком из Тигровой Кооперации",
-        "ui_theme": "abductor",
-        "uplink": "Вам была предоставлена книга Хай-лургиксона, чтобы доказать свою преданность улью генокрадов. Если вы выполните свои задачи, вас ассимилируют.",
-        "uplink_name": "книга Хай-лургиксона"
-    },
-    "Waffle Corporation": {
-        "allies": "Членов Donc Co. следует уничтожать на месте; им не разрешено находиться на станции, когда мы тут. Не доверяйте своим соратникам из Waffle.co (но попробуйте не выдавать их), так как они могли получить противоположные задачи.",
-        "goal": "Вы здесь не для большой все-станционной демонстранции. Опять же, другие агенты Waffle Co. могут присуствовать, так что будьте аккуратнее. Ваша задача – достичь своих целей.",
-        "introduction": "Вы предатель из Waffle Co.",
-        "roundend_report": "был сотрудником Waffle Corporation.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
-    },
-    "Waffle Corporation Terrorist": {
-        "allies": "Большинству других оперативников Синдиката нельзя доверять, за исключением членов Мародеров Горлекса. Не доверяйте своим соратникам из Waffle.co (но попробуйте не выдавать их), так как они могли получить противоположные задачи.",
-        "goal": "Наши инвесторы нуждаются в демонстрации нашего обещания уничтожить Нанотрасен. Давайте дадим им громкое представление!",
-        "introduction": "Вы террорист от Waffle Corporation.",
-        "roundend_report": "был террористом из корпорации Waffle Corporation.",
-        "ui_theme": "syndicate",
-        "uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
-    },
+	"Animal Rights Consortium": {
+		"allies": "Вы можете сотрудничать с другими оперативниками синдиката, если они поддержат наше дело. Может быть, вам удастся хоть раз убедить оперативников Фронта Освобождения Пчел сотрудничать?",
+		"goal": "Существа этого мира должны быть освобождены из железной хватки Нанотрасена, и вы их единственная надежда!",
+		"introduction": "Вы — террорист ARC.",
+		"roundend_report": "был активистом Консорциума по правам животных.",
+		"ui_theme": "syndicate",
+		"uplink": "Синдикат любезно предоставил один из своих каналов связи для вашего задания."
+	},
+	"Bee Liberation Front": {
+		"allies": "Вы можете сотрудничать с другими оперативниками синдиката, если они поддержат наше дело. Может быть, ты сможешь нанять рекрута из АRC, чтобы они хоть раз оказались полезными?",
+		"goal": "Мы должны доказать свою состоятельность Синдикату, иначе мы не сможем присоединиться к нему. Консорт по правам животных поведет нас!",
+		"introduction": "Вы — оперативник Фронта Освобождения Пчел",
+		"roundend_report": "был активистом Фронта Освобождения Пчел",
+		"ui_theme": "syndicate",
+		"uplink": "Синдикат любезно предоставил один из своих каналов связи, чтобы проверить, достойны ли мы."
+	},
+	"Champions of Evil": {
+		"allies": "Любой, кто видит то, что вы видите, чувствует то же, что вы чувствуете, может присоединиться к Чемпионам Зла! Это означает, что Синдикат, корыстный или даже безумный, и пока у него есть сердце тьмы - он дружит с Чемпионами!",
+		"goal": "У тебя есть небольшие планы для какого-то ЗЛА, которые нужно сделать сегодня. С другой стороны, Чемпионы Зла всегда ищут более зловонных злоумышленников! Займись вербовкой!",
+		"introduction": "Ты — Чемпион Зла",
+		"roundend_report": "был Чемпионом Зла!",
+		"ui_theme": "neutral",
+		"uplink": "Чемпионы Зла хорошо связаны с черным рынком. Ваш канал связи предназначен для крайнего зла!"
+	},
+	"Corporate Climber": {
+		"allies": "Смерть Синдикату.",
+		"goal": "Убийство без необходимости сделало бы вас предателем или, по крайней мере, определенно считало бы вас таковым. Все это лишь средство для достижения цели.",
+		"introduction": "Вы — идущий по карьерной лестнице.",
+		"roundend_report": "был идущим по карьерной лестнице.",
+		"ui_theme": "neutral",
+		"uplink": "У вас есть связи с черным рынком этих дел. Скиньте пару ненужных тяжестей, и ваш подъем станет намного более плавным."
+	},
+	"Cybersun Industries": {
+		"allies": "Сотрудникам Cybersun следует доверять. Членам организации MI-13 можно доверять. Всем остальным оперативникам синдиката доверять нельзя.",
+		"goal": "Не устанавливайте существенное присутствие на указанном объекте, поскольку крупные инциденты сложнее скрыть.",
+		"introduction": "Вы из Cybersun Industries.",
+		"roundend_report": "был специалистом из Cybersun Industries.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам предоставлены инструменты для работы в виде стандартного аплинка синдиката."
+	},
+	"Donk Corporation": {
+		"allies": "Членов Waffle Co. следует уничтожать на месте; им не разрешено находиться на станции, когда мы вокруг.",
+		"goal": "Мы не одобряем бессмысленного убийства невинных работников; \"зайти, сделать дело, уйти\" - наш девиз.",
+		"introduction": "Вы предатель из Donk Co.",
+		"roundend_report": "был сотрудником Donk Corporation.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
+	},
+	"Gone Postal": {
+		"allies": "Если синдикат узнает о вашем плане, они убьют вас и заберут ваш аплинк. Не рискуйте.",
+		"goal": "Подготовка наконец завершена. Сегодня - день, когда вы начнете действовать безрассудно. Вы собираетесь угнать эвакуационный шаттл и начать новую жизнь, свободную от Nanotrasen.",
+		"introduction": "Сегодня ты начинаешь действовать безрассудно.",
+		"roundend_report": "просто ебанулся!",
+		"ui_theme": "neutral",
+		"uplink": "Вы даже смогли украсть полный аплинк месяц назад. Это, безусловно, поможет вам достичь ваших целей."
+	},
+	"Gorlex Marauders": {
+		"allies": "Вы можете сотрудничать с любыми друзьями коалиции Синдиката, но следите за теми мудилами из Тигров, если они все же появятся.",
+		"goal": "Быть замеченным - не проблема, и вы можете использовать любой уровень вооружения, чтобы выполнить задание. Тем не менее, не делайте это беспорядочно, привлекая случайных жертв.",
+		"introduction": "Вы мародер Горлекса.",
+		"roundend_report": "был мародером Горлекса.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
+	},
+	"Internal Affairs Agent": {
+		"allies": "НЕ раскрывайте свой статус агента никому. Работайте, чтобы искоренить коррупцию на станции из тени.",
+		"goal": "Хотя у вас есть лицензия на убийство, необоснованный ущерб собственности или потеря жизни сотрудников приведет к расторжению вашего контракта.",
+		"introduction": "Вы агент внутренних дел.",
+		"roundend_report": "был агентом внутренних дел Nanotrasen",
+		"ui_theme": "ntos",
+		"uplink": "В целях возможного отрицания вас снабдили арсеналом захваченного синдикатского оружия, доступного через аплинк."
+	},
+	"Legal Trouble": {
+		"allies": "Смерть Синдикату.",
+		"goal": "Попробуйте закончить свой список дел и не попадайтесь. Если они узнают, что вы на самом деле делаете, эта скандал пойдет дальше, чем космическое пространство.",
+		"introduction": "У вас проблемы с законом.",
+		"roundend_report": "имел проблемы с законом.",
+		"ui_theme": "neutral",
+		"uplink": "Вы связались с чёрным рынком, чтобы разобраться с этим беспорядком. Если нет доказательств, нет преступления."
+	},
+	"MI13": {
+		"allies": "Вы единственный оперативник, которого мы отправляем, все остальные - поддельные. Ни на кого из других оперативников Синдиката нельзя полагаться, за исключением оперативников Cybersun.",
+		"goal": "Избегайте убийства невинного персонала любой ценой. Вы здесь не для того, чтобы бессмысленно убивать людей, так как это привлечет слишком много внимания и не соответствует нашей цели. Избегайте обнаружения любой ценой.",
+		"introduction": "Вы агент MI13.",
+		"roundend_report": "был агентом MI13.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
+	},
+	"Tiger Cooperative Fanatic": {
+		"allies": "Только просвещенным братьям-Тиграм можно доверять; все остальные должны быть изгнаны из этого смертного мира!",
+		"goal": "Помните учения Хай-лургиксона: вначале убей, а потом задавай вопросы!",
+		"introduction": "Вы фанатик из Тигровой Кооперации",
+		"roundend_report": "был фанатиком из Тигровой Кооперации",
+		"ui_theme": "abductor",
+		"uplink": "Вам была предоставлена книга Хай-лургиксона, чтобы доказать свою преданность улью генокрадов. Если вы выполните свои задачи, вас ассимилируют.",
+		"uplink_name": "книга Хай-лургиксона"
+	},
+	"Waffle Corporation": {
+		"allies": "Членов Donc Co. следует уничтожать на месте; им не разрешено находиться на станции, когда мы тут. Не доверяйте своим соратникам из Waffle.co (но попробуйте не выдавать их), так как они могли получить противоположные задачи.",
+		"goal": "Вы здесь не для большой все-станционной демонстранции. Опять же, другие агенты Waffle Co. могут присуствовать, так что будьте аккуратнее. Ваша задача – достичь своих целей.",
+		"introduction": "Вы предатель из Waffle Co.",
+		"roundend_report": "был сотрудником Waffle Corporation.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
+	},
+	"Waffle Corporation Terrorist": {
+		"allies": "Большинству других оперативников Синдиката нельзя доверять, за исключением членов Мародеров Горлекса. Не доверяйте своим соратникам из Waffle.co (но попробуйте не выдавать их), так как они могли получить противоположные задачи.",
+		"goal": "Наши инвесторы нуждаются в демонстрации нашего обещания уничтожить Нанотрасен. Давайте дадим им громкое представление!",
+		"introduction": "Вы террорист от Waffle Corporation.",
+		"roundend_report": "был террористом из корпорации Waffle Corporation.",
+		"ui_theme": "syndicate",
+		"uplink": "Вам был предоставлен стандартный аплинк для выполнения вашей задачи."
+	},
 	"Contractor Support Unit": {
-        "allies": "Вы отправлены, чтобы помочь вашему назначенному агенту. Их приверженность выше всех остальных.",
-        "goal": "Помогайте вашему назначенному агенту в максимально возможной степени, их жизнь важнее вашей собственной.",
-        "introduction": "Вы агент поддержки контрактника.",
-        "roundend_report": "был агентом поддержки контрактника.",
-        "ui_theme": "syndicate",
-        "uplink": "У вас нет собственного аплинка, следуйте за вашим агентом."
-    }
+		"allies": "Вы отправлены, чтобы помочь вашему назначенному агенту. Их приверженность выше всех остальных.",
+		"goal": "Помогайте вашему назначенному агенту в максимально возможной степени, их жизнь важнее вашей собственной.",
+		"introduction": "Вы агент поддержки контрактника.",
+		"roundend_report": "был агентом поддержки контрактника.",
+		"ui_theme": "syndicate",
+		"uplink": "У вас нет собственного аплинка, следуйте за вашим агентом."
+	}
 }
diff --git a/strings/boomer.json b/strings/boomer.json
index 0afcb448fa9df..3fa9da0f6e87d 100644
--- a/strings/boomer.json
+++ b/strings/boomer.json
@@ -1,53 +1,53 @@
 {
-    "boomer": [
-	"@pick(expense) isn't really that expensive.",
-	"@pick(kids) these days have it too easy!",
-	"Back in my day...",
-	"Do I look like I know what a @pick(file) is!?",
-	"How do I open a @pick(file) again?",
-	"It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
-	"Listen here Jack, how do I open @pick(file)?",
-	"These damn @pick(kids) need to get a @pick(impossible) for once!",
-	"This generation can't take a joke.",
-	"Unlike you snowflakes, I'm not offended so easily.",
-	"When I was a kid I had to walk to school uphill both ways!",
-	"When I was your age...",
-	"Why are @pick(kids) these days so @pick(sad) all the time?",
-	"You'll never get anywhere in life without a degree."
-    ],
+	"boomer": [
+		"@pick(expense) isn't really that expensive.",
+		"@pick(kids) these days have it too easy!",
+		"Back in my day...",
+		"Do I look like I know what a @pick(file) is!?",
+		"How do I open a @pick(file) again?",
+		"It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
+		"Listen here Jack, how do I open @pick(file)?",
+		"These damn @pick(kids) need to get a @pick(impossible) for once!",
+		"This generation can't take a joke.",
+		"Unlike you snowflakes, I'm not offended so easily.",
+		"When I was a kid I had to walk to school uphill both ways!",
+		"When I was your age...",
+		"Why are @pick(kids) these days so @pick(sad) all the time?",
+		"You'll never get anywhere in life without a degree."
+	],
 
 	"expense": [
-	"A car",
-	"A house",
-	"College",
-	"Food",
-	"Healthcare"
+		"A car",
+		"A house",
+		"College",
+		"Food",
+		"Healthcare"
 	],
 
-    "kids": [
-	"kids",
-	"millennials",
-	"snowflakes"
-    ],
+	"kids": [
+		"kids",
+		"millennials",
+		"snowflakes"
+	],
 
-    "file": [
-	"DMI",
-	"JPEG",
-	"JSON",
-	"PDF"
-    ],
+	"file": [
+		"DMI",
+		"JPEG",
+		"JSON",
+		"PDF"
+	],
 
-    "sad": [
-	"depressed",
-	"sad and depressed",
-	"sad"
-    ],
+	"sad": [
+		"depressed",
+		"sad and depressed",
+		"sad"
+	],
 
-    "impossible": [
-	"house",
-	"job and a house",
-	"job",
-	"life"
-    ]
+	"impossible": [
+		"house",
+		"job and a house",
+		"job",
+		"life"
+	]
 
 }
diff --git a/strings/clown_nonsense.json b/strings/clown_nonsense.json
index 1f6b41ede473d..143e796e7f4e9 100644
--- a/strings/clown_nonsense.json
+++ b/strings/clown_nonsense.json
@@ -1,38 +1,38 @@
 {
 	"honk": [
-	"HENK",
-	"HONK!!!",
-	"HONK!",
-	"honk",
-	"HONK",
-	"HOOOOOOONK"
-    ],
+		"HENK",
+		"HONK!!!",
+		"HONK!",
+		"honk",
+		"HONK",
+		"HOOOOOOONK"
+	],
 
-    "rare": [
-	" :) ",
-	" Laugh sound. ",
-	":))))))))))))))))))))))))",
-	"damn",
-	"Extreme Ruckus at the Party",
-	"HAHAHAA HEEHEEHEE",
-	"Hink",
-	"HOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-    ],
+	"rare": [
+		" :) ",
+		" Laugh sound. ",
+		":))))))))))))))))))))))))",
+		"damn",
+		"Extreme Ruckus at the Party",
+		"HAHAHAA HEEHEEHEE",
+		"Hink",
+		"HOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	],
 
-    "non-honk-clown-words": [
-	"... ",
-	"balagan",
-	"banana peel",
-	"bananas",
-	"cat",
-	"chapiteau",
-	"entrée",
-	"juggling",
-	"party",
-	"peel",
-	"pie",
-	"pranking",
-	"slip"
-    ]
+	"non-honk-clown-words": [
+		"... ",
+		"balagan",
+		"banana peel",
+		"bananas",
+		"cat",
+		"chapiteau",
+		"entrée",
+		"juggling",
+		"party",
+		"peel",
+		"pie",
+		"pranking",
+		"slip"
+	]
 
 }
diff --git a/strings/exoadventures/britain_replica.json b/strings/exoadventures/britain_replica.json
index 0bfaa67e990cb..4199e00ce19a7 100644
--- a/strings/exoadventures/britain_replica.json
+++ b/strings/exoadventures/britain_replica.json
@@ -1,570 +1,570 @@
 {
-  "adventure_name": "A Model Earth",
-  "version": 1,
-  "author": "Armhulen",
-  "starting_node": "Planet Start",
-  "starting_qualities": {
-    "Long Range Scan Report": 0,
-    "UFOs Shot Down": 0
-  },
-  "required_site_traits": [
-    "in space"
-  ],
-  "loot_categories": [
-    "research"
-  ],
-  "scan_band_mods": {},
-  "deep_scan_description": "",
-  "triggers": [],
-  "nodes": [
-    {
-      "name": "Planet Start",
-      "description": "You come across a grey planet. It looks familiar, though you swore you've never come across this sector of space before.",
-      "choices": [
-        {
-          "key": "choice 0",
-          "name": "Ignore the planet.",
-          "exit_node": "FAIL",
-          "delay": 0,
-          "delay_message": "Whatever, there's a lot of planets in space. Must be a hunch!"
-        },
-        {
-          "key": "choice 1",
-          "name": "Begin Orbital Scan",
-          "exit_node": "Scanning from Orbit",
-          "requirements": [
-            {
-              "quality": "Long Range Scan Report",
-              "operator": "==",
-              "value": 0
-            }
-          ],
-          "delay": 30,
-          "delay_message": "Scanning planet..."
-        },
-        {
-          "key": "choice 8",
-          "name": "Descend Into Orbit",
-          "exit_node": "Orbital Descent",
-          "delay": 30,
-          "delay_message": "Descending into Orbit..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Scanning from Orbit",
-      "description": "You initiate a long range scan from orbit:\nThis planet has a smoggy cover that blocks any good look at the surface, yet it has a mostly survivable atmosphere.\nThis planet has zero life signs.\n",
-      "choices": [
-        {
-          "key": "choice 9",
-          "name": "Stash that Report...",
-          "exit_node": "Planet Start",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Long Range Scan Report",
-          "value": 1
-        }
-      ],
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAASUExURQAAAP///1lWUqwyMmlqakZHRwPX/kkAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVGje7ZldbqMwFIXtKnkvO4huyAYmG0CWea8i2P9Wxv/Y2MTYvjBVO4c8FET8+dxzDW5Ldqr73Hcf7fbemfwu+p1tkM+jILTbfeu2stNbDDSkklXnzNRbyUqUqbM/oVr5AFhOus5iUK3A/fmEW0BRHjCtwFPqj6NQS6GIVu5PTXEXnJUOjfLxXEOITYWitXECQk6BUOx6pSDkKAj4F6mrFxLEdNctAdl8gJVmBRBXy6tXcrScwwvXsufikXIP1qId5t2iz0D4osFClAga5MJDDbJaEUDJjF6eyZohxATjlhym9kkcMzhkIBQJ0g+pe2klJFWtG4DrgRSkeEUkjDDWA09TbPJdM6RXnySlDnLpYyO9/GhtQChthYhSMXeyup0aSFkoCYirVqJkdcnHEMaXakVeHIQUQYBPwSFdMB86IEBYolrAtyi1kF4asOIT40Ekq4JVQvS0R3UYI5G5GFLYwuKRO3l69dMEkxnc5MR8K6RCF9VL2sioe2tdLc6GRggROUDve5lcA9usXpw0So4Go5OwE0YySqutED33eZKH12TSyJJTK0RNFx6LFb4yMiI4uajJQmxlWT3tTsybEfxUnA0t9miGmNnCY54DMxNiJu7V6HLx89BO2iHLhIUXPxUleWVjf1SiZbvCHkEuLqX0brIM4hUfwkxERkKvdiPhxksGw3UuNpERmpuLeKGoBRM8k5WP/gsBsnrkAphUVGOJHeuIwPBDMcks6vmAUazkbtjXgAIhqVW+QHAYZHxnBIkRheKbGbAgJH6NIAcitWFlwmQQck28EzEDUdqwQnClrIxH+pA63od1EpgpHiP7i3ccSjEj/yd258SYqendLCR0UfcCyUK0B9KkbCYNBnZLRzIcC9HNdSzDODkYoraOB0eim+vgSIjcKM4HM06J5Hqak1Mi+d9ce3VGc5Ef01zXM5pLQN46oR0O5G0kKP+9nM+CfP1rSDqTwqTqmqvQX91SLINcvzGkLJPrCev9HMj8oyDk10MI+Qt3vM7Ve2h01AAAAABJRU5ErkJggg=="
-    },
-    {
-      "name": "Orbital Descent",
-      "description": "As you descend into orbit, you see a flying object headed straight for you!\nA garbled voice begins to call out to your drone, but there's no time to decipher it!",
-      "choices": [
-        {
-          "key": "choice 2",
-          "name": "Blast the damn UFO!",
-          "exit_node": "Tractor Beam",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Tractor Beam Turns",
-              "value": 2
-            },
-            {
-              "effect_type": "Add",
-              "quality": "UFOs Shot Down",
-              "value": 1
-            }
-          ],
-          "delay": 30,
-          "delay_message": "Blasting UFO!"
-        },
-        {
-          "key": "choice 3",
-          "name": "Attempt Evasive Maneuvers!",
-          "exit_node": "UFO Evasion!",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "UFOs Violently Crashed Into",
-              "value": {
-                "value_type": "random",
-                "low": 0,
-                "high": 1
-              }
-            }
-          ],
-          "delay": 30,
-          "delay_message": "You attempt to dodge the UFO..."
-        },
-        {
-          "key": "choice 7",
-          "name": "Do NOTHING. Jesus take the wheel!",
-          "exit_node": "FAIL_DEATH",
-          "delay": 30,
-          "delay_message": "What? Why?!"
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Garbled Transmissions",
-          "value": 1
-        }
-      ],
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "UFO Evasion!",
-      "description": "Were you good enough at flying to avoid the UFO?",
-      "choices": [
-        {
-          "key": "choice 4",
-          "name": "No, Back to flight school with you!",
-          "exit_node": "FAIL_DEATH",
-          "requirements": [
-            {
-              "quality": "UFOs Violently Crashed Into",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 5",
-          "name": "You barely avoided them! Nice!",
-          "exit_node": "Tractor Beam",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Tractor Beam Turns",
-              "value": 2
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "UFOs Violently Crashed Into",
-              "operator": "==",
-              "value": 0
-            }
-          ],
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Tractor Beam",
-      "description": "Before you have time to think, your drone is captured by a Tractor beam! Now you've gone and done it.\n\nYou should have some time before you are pulled in.",
-      "choices": [
-        {
-          "key": "choice 6",
-          "name": "Decipher Garbled Transmission",
-          "exit_node": "Deciphering Transmission",
-          "requirements": [
-            {
-              "quality": "Garbled Transmissions",
-              "operator": "==",
-              "value": 1
-            },
-            {
-              "quality": "Tractor Beam Turns",
-              "operator": ">",
-              "value": 1
-            }
-          ],
-          "delay": 30,
-          "delay_message": "Decipering..."
-        },
-        {
-          "key": "choice 10",
-          "name": "Look at the surface of the planet",
-          "exit_node": "Looking at the Surface",
-          "requirements": [
-            {
-              "quality": "Tractor Beam Turns",
-              "operator": ">",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "Looking out window..."
-        },
-        {
-          "key": "choice 13",
-          "name": "Let the beam pull you in and dock you",
-          "exit_node": "Landed, Kinda",
-          "on_selection_effects": [
-            {
-              "effect_type": "Set",
-              "quality": "Tractor Beam Turns",
-              "value": 0
-            }
-          ],
-          "delay": 50,
-          "delay_message": "Getting captured..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Deciphering Transmission",
-      "description": "You review the incoming transmissions your drone has gotten. These aren't in need of deciphering, just un-garbling it from the bad connection...\n\n\"You are in Space British Air Space! Identify yourself, Tally ho!\"\nWhat the fuck?",
-      "choices": [
-        {
-          "key": "choice 11",
-          "name": "Whoops!",
-          "exit_node": "Tractor Beam",
-          "delay": 0,
-          "requirements": [
-            {
-              "quality": "UFOs Shot Down",
-              "operator": "==",
-              "value": 1
-            }
-          ]
-        },
-        {
-          "key": "choice 12",
-          "name": "Good thing I didn't blast them, then.",
-          "exit_node": "Tractor Beam",
-          "delay": 0,
-          "requirements": [
-            {
-              "quality": "UFOs Shot Down",
-              "operator": "==",
-              "value": 0
-            }
-          ]
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Commercial Airliner Transmissions",
-          "value": 1
-        }
-      ],
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Landed, Kinda",
-      "description": "You have been locked to the surface the beam. Robots are all around you, pointing at your drone with all sorts of old age weapons.\n\nOne of them angrily shouts at you, \"By God, Queen and Country, we've got you now!\"",
-      "choices": [
-        {
-          "key": "choice 14",
-          "name": "Go out with a bang. Initiate self destruct!",
-          "exit_node": "FAIL",
-          "delay": 0
-        },
-        {
-          "key": "choice 15",
-          "name": "Surrender to the funny looking robot brits...",
-          "exit_node": "British Courtroom Start",
-          "delay": 50,
-          "delay_message": "You are being transported somewhere..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "British Courtroom Start",
-      "description": "Wow, that took forever. A one eye judge robot smacks their gavel, and points their hammer at you.\n\"I will now read out the crimes you are accused of!\"\nIs that how the judicial process works? You dunno.\n\"ONE ACCOUNT OF PLANETARY TRESSPASS!\"\nThis blows.",
-      "choices": [
-        {
-          "key": "choice 16",
-          "name": "That's not that bad.",
-          "exit_node": "British Courtroom, Continued...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Crimes Committed",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "British Courtroom, Continued...",
-      "description": "This big idiot they call a judge just keeps piling on crimes. With each one, some robot you'd like to drone-punch gasps in the back.",
-      "choices": [
-        {
-          "key": "choice 17",
-          "name": "\"INTRUSIVE SCANNING ON OUR CITIZENS\"",
-          "exit_node": "British Courtroom, Continued...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Long Range Scan Report",
-              "value": -1
-            },
-            {
-              "effect_type": "Add",
-              "quality": "Crimes Committed",
-              "value": 1
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Long Range Scan Report",
-              "operator": ">",
-              "value": 0
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 18",
-          "name": "\"SHOOTING DOWN A COMMERCIAL AIRLINER\"",
-          "exit_node": "British Courtroom, Continued...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "UFOs Shot Down",
-              "value": -1
-            },
-            {
-              "effect_type": "Add",
-              "quality": "Crimes Committed",
-              "value": 1
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "UFOs Shot Down",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 19",
-          "name": "\"AND WE HAVE PROOF YOU KNEW IT WAS JUST AN AIRLINER!\"",
-          "exit_node": "British Courtroom, Continued...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Commercial Airliner Transmissions",
-              "value": -1
-            },
-            {
-              "effect_type": "Add",
-              "quality": "Crimes Committed",
-              "value": 1
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Commercial Airliner Transmissions",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 20",
-          "name": "\"THE TRANSMISSIONS WERE NOT LEGIBLE AND UNTRANSLATED. WE CANNOT PROVE MALICE!\"",
-          "exit_node": "British Courtroom, Continued...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Garbled Transmissions",
-              "value": -1
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Garbled Transmissions",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 24",
-          "name": "I think it's done listing crimes, thank god. Time to argue my case.",
-          "exit_node": "Verdict",
-          "requirements": [
-            {
-              "quality": "Long Range Scan Report",
-              "operator": "==",
-              "value": 0
-            },
-            {
-              "group_type": "AND",
-              "requirements": [
-                {
-                  "quality": "Garbled Transmissions",
-                  "operator": "==",
-                  "value": 0
-                },
-                {
-                  "quality": "Commercial Airliner Transmissions",
-                  "operator": "!=",
-                  "value": 1
-                }
-              ]
-            },
-            {
-              "quality": "UFOs Shot Down",
-              "operator": "!=",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Looking at the Surface",
-      "description": "The surface of this world looks exactly like a grey version of Earth! It seems to be an exact replica of some kind.\n\nYou see creatures moving around on the streets",
-      "choices": [
-        {
-          "key": "choice 21",
-          "name": "Cool!",
-          "exit_node": "Tractor Beam",
-          "delay": 0
-        },
-        {
-          "key": "choice 22",
-          "name": "Scan the creatures.",
-          "exit_node": "Robo Brits!",
-          "delay": 30,
-          "delay_message": "Scanning..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Robo Brits!",
-      "description": "Wow, they're robotic humanoids that look and act exactly like the British! You see some robots laughing and chatting at a pub, and a Bobby walking down the street looking for crooks. Who created this earth replica? You only know Earth from the books, but you should be where London is!",
-      "choices": [
-        {
-          "key": "choice 23",
-          "name": "Nice! Well, back to getting pulled in by a Tractor beam...",
-          "exit_node": "Tractor Beam",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Long Range Scan Report",
-          "value": 1
-        }
-      ],
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Verdict",
-      "description": "Before even getting to defend your case, the judge says \"I've heard ENOUGH! It's time for a verdict!\"\nDang! You're definitely in kangaroo court!\n\"GUILTY! AND YOUR SENTENCE IS:\"",
-      "choices": [
-        {
-          "key": "choice 25",
-          "name": "\"DEATH!\"",
-          "exit_node": "FAIL_DEATH",
-          "requirements": [
-            {
-              "quality": "Crimes Committed",
-              "operator": ">=",
-              "value": 4
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 26",
-          "name": "\"SPACE JAIL!\"",
-          "exit_node": "Not Actually Space Jail, Just Normal Jail",
-          "requirements": [
-            {
-              "quality": "Crimes Committed",
-              "operator": ">",
-              "value": 1
-            }
-          ],
-          "delay": 20,
-          "delay_message": "You are being jailed..."
-        },
-        {
-          "key": "choice 27",
-          "name": "\"FORGIVENESS! Just trespass? That's not that bad!\"",
-          "exit_node": "Sweet Sweet Freedom!",
-          "requirements": [
-            {
-              "quality": "Crimes Committed",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "WOOP WOOP"
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Not Actually Space Jail, Just Normal Jail",
-      "description": "You'll have to wait out your crimes against the robo brits.",
-      "choices": [
-        {
-          "key": "choice 28",
-          "name": "Sit out your sentence",
-          "exit_node": "Sweet Sweet Freedom!",
-          "delay": 1200,
-          "delay_message": "Sitting out your sentence..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Sweet Sweet Freedom!",
-      "description": "You're free! You spend a good while travelling around England (or at least the replica) and enjoying the cuisine, people and culture! Good society research is gained from this or something, but really you're just enjoying the sights and sounds.",
-      "choices": [
-        {
-          "key": "choice 29",
-          "name": "Nice!",
-          "exit_node": "WIN",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAQJklEQVR4Ae2deXBX1RXHY23/6DYdFBekilIInVrsTBUUEKWitf1Hp4467XQ6Y6frtLWtdpzWhaCCCQmJieKCKHWKY52xjgsg4AIo7s601NYlIoSdaEJIQgwgWU7nxB643Nz93fveu7/fy8ybu527vHu/n3ve/W2pgIB/B/v6ofHBV+H07y+Az319NlSMm1WS1+YdncpZ3HDpT2H9yNODXRsuuUrZ/5adnSU576inoydUwYSLmmDu3S/A/gN9ynlwKaxwqWRTZ2BgEHa17YW/PvYvGHN+fUkuVAFINhvf6Gl1sPCRN2F7azf0DwzYyNLYNjgg7EgOfNIH9Ytfhm9870747ITS8SgFIOkBcnRlFYy/sAluWbAWevd9wsorSDxVQPAO0KPs/KgbHnj0n3DKeaXhUQpA0gHkpKl1cM/Db8C2XV3BPAZPWWqALLzhGjC9YjurFICEA2TIY8xshNl3rIae3gO8foOngwNiCoXMLgZYCkDCADJqai3c/dAbsHVnF/T3hzlj6AjzDohM6D7y8wpLAYg/QD5TWQVfu6ARZjU+D909+3X6DV7uDIgPwSdtIy/AFID4AeTEKbWwYMnrsGVHZ2YegyduGCBJRZtV/SxhKQBxBwQ9xriZjXBjw3Owp3sfr8/M0xVZCTpkv2nDUgDiBgh6jDv+9lqmZwwdgdEDUltdq3x1LA1YCkDMATlq/Cw4bcbt8Jf5z8Luzl6dPjMvjx4QG0/02oqlgJdvaApAzADB9zEWLHkNWrbvgb6MXpWyJS53gKBHML1s4EBbAoRCX6AUgKgBOfX8BriudhW0dXxsq89M7QcHByFTQEioWYUFIGphJ52f48+eBw2LX4FN2+LxGEQkfrZryRPrwwGSleht+00qAqxfeJAjQRtzfgP8qWYlfNjeQ3qLIkSPsadrHzz+zDvw7Uvv+fRR3PYxRWZvK8y82BeAHCnuJPOBHqP+gZdh09aOaM4YRC56jIeXvgWTLlsIn//mrYfPqTLB2+bnRfC240giCKpb7h7klOn1cM1tK4Y+hEqCiyEc8hjd++CJ596FST+49zAU7PeWbEFQ2duKMy/2JHTXsFwBOW5yDdQtegk2bumAvr5sPivlCiJ6jEeW/wcmX7YQvjCR8RgsHBhXCd62LC+Ctx2HKxhUr9wAOXn6fPj9nKdhe2uXqz4zqYceo3Pvfnjq+ffgnMvvE3uMApBP3wthISKhu4blAsjIyTUw7751sGHz7ig9xqMr/gtnX36f2mMUgAwH5NQZDWa7CT95/0+XOiBfPXc+/O6W5bB1ZyfgLhzTX9fe/bBsTTNMvXKR2xrbPkbJ7NkdObY4vk5fv/gVOOGceU6TWKqAjJxUA9X3vjjkMfAHOGL6wzPGY6vegSlXLIIvnqE4Y0g2vUNPEzLB2+bHBgU7Xlx43Bnxq8DXVq8EfB3/0ATpJrAE3wfBH0P4zexlsHn7nug8RnfPAXh67fsw/UcPWK2hdL1tQRDZs2LTxUX1Q+XpxsKW0+6InxHauLUDahe9BPi6vnTiGHBKxYMce1Y1zLnrBXi/pR1i9BiPP/upx/jSGXOM1s1kbStIJElFSu2owqR92NZXjYUvI0AoRI+yrbUL/jD3ae2PS8QOyKipdfCrWU8NbQyxnTHQY6x8cQPM+PFif1Awm98hQEgwtiIke6qvCsk2rVA1Fr6MwOBDfH0fPUrNwnWAr/uLdp1YATnmrGq4+c410LwpTo/x5HPvwrQr7wevHoOFA+O8UDDtImBRO3yeS7tJ6/BjkKV5MPg07qz4C4VX37oc8H0AFpTYABk1pRZ+ceOTQ4fv2DxGz8cHYNW6D2DmTx4E/G4Juw5B4jLBYL6NOFXtUJlNe75sqW9fIXqUD7bsHvqpS3xfABclFkBGnHkbVDWthvc2tnk/Y3z34osh5IWvSi1d/R6c+8P74cvf8njG4D0Gn9YJx0Soujao3KQt3zbUt+8Qd1784g++2tPapv7Uata/zdva3gM/u/4JaG5p9/qqVEggdG0H8RY8HLJHLF5MOtHy9rK0rp0Q5bKx+MjHx7C+vn6t6LIGBGE+eNDf+xg68aZdHhQWG6HwArapi7Z8/TTStmN0sefPK3w6a0D48bim0xa+bX9BQHERhGudNIDg+3Adq009neBiB8RWqHmzTwSOjRCS2vLiTSOddMym9VWQxApI3oSedDxOoKBITUWQxC4pDBUVFUCXTVtJxmxTt9QASSrGvNa3hoTEZiMGF1vqxyUkMNjQtB2XsbrUKSVA8ipuX+NSrRVfNuwLUy7i0NUxFbPMjsDAcopjKLPn83Xj81HOTyybzvsjli/hxdQOuz6q+DBAUFw+BENt8GK1TYuAEOWp2qWxhAxVk5xXQGISdIixqtaMynINiAoEVZkMFhNA2Lom9mRDEyoK8wZICLHF2KZorfi8YICwQnONEwSy+lSOocwmST6J3zTkJ5fSeQIkRiGHHDOtkSxMDEgSAarqmorf1E7Vl6rMFA60k/2VKiAw+itAF4mY0rKQ7PISytaM8nMJiK3oyV4ldNcyG0B6//0OiK7mmVcG+x/p+P/Xm2deIeyXH4tvUcogSJLve4wm7fHzxKZzDYipqAkQDE3r2NjZQPLWmEnAX+uPnxgUEGyf71OUNhGLjU0SEGzr2ozL1lY0V5QnBATFYyoKG6GZ2LqKneqZ9GFrYzoXaIc7eh4vW9Go7G3F7dteNTbXMtma5QoQErmLJ0hSVwdM7IC4ioav51voPtrjx+iazj0gPgRObegE71JuColsorPKdxUM1fMh4jTaoPG6hrL1SexBUDgugmPrkLAxZPPzFI8REFexpCHoEH243i/Wyy0gMcCBoMYGiItYQog27TZd7jsKQNL0FgSlTZ8xAWIrkrRFnEZ/tnNg7UFsdk0bofG2LmLl27BJU38Y2tQrVUBMxMrOGcZN6mRtUzKA2IjUhy0ttm1bsQBiKgwTAdNcyUKTNrKyMZ0HssutB7EValJ7WmzbdgpADn9hjeYwK/Gb9EvCNw0LQBy/S0IgxQCIqRhMBEYQ6EKTtrKyMZ0PtCsAYQAh0duEBSDDPQjCk5X4TfotALnhGuODNrsT2oBBtgUgcQHiAw70KtI3ClEYpqIgEeU1TAqHzVzIXHXofBtBmOy+7Jyp4iZtZWFjMx+qtfEOCE1mXmCh8WCYZEymm4VqskOW2QjCVLDs3Inipu1kYWczH6p1CQaIaEKTitRU4KK+TevK7ApAhj9iZSF8kz59wYHgeAEExcMKSyTQLPPYsbnGyxEQEiO/dpSf19ArILy4WQGZikLVBtseP9Eh02y/PuKmc6Fy1yHLbESBtnkVt49x2cyFbk2O+Ac6vJBMRWEKCN9+TGnTudBNeKhyG1HwtjJRTpw4EUwvWRtZ5PP3J0ubrMURgJAIWOFSni5k65RiXHf/VE5f1WTDNL5yKxOBbb4pEKHsfABlc8/sOoniQkBosVHoFNeFpQgF3ZPu3tny3vVvA38F/9GGC64Y6tNGGDJbXvhox+flIS0DSXZfqnx+vdi0EhB24XVxElMphbp7FpXTz8WwYVo/+6MSgc+yPAAiGgNC43qf7Hqx8QIQwbvxIuGb5rGTS/G0AMH+XAXiq55IuGnlJb0HWi829AaIqYBK3Y6dXIqnCQj2mVQoIeqHhMTneGnNKCwAWbHU+JxlAjdNLBumDQj27VM0IdtKCk6IsbFrVwDiERB2Ytl4FoDEBEkIkSdtk9avAKSEAaFFTiqWcq5fAOIJEBKjKMzKg/BjKWehu957AUhCQEw+LpMXQFhgXAVTbvUqaqtrAS+TA2hhc/hAbwKGyMbk4w22NhsuuYrVvnW83ERvc7+HAClAOSx+1UYgEr1Lni0EKvukgIiIshFRKdtWyBZXJZJyLZPNlWu+SvQ2ZTpABgcH4WBfv4gD47xShkB1b1JAaNHLFQa6b/KsGNKc+AptIFDZ6gBpbe+Bn9/wJDS3tAPC4vtPJbDYy7SAkBhE5xRWPGnFaTylEqqEb1qmA2TLzk6oGDcLjjmzGmbfsXoIlKQexQSy2OHA8RsDgoJUQVAqgk37PkwhUNmZAoKQ4DVqah388qan4IMtu4N4FB08MYFjBUja4imH/lTCNy2zBYRAOeasarhlwVp4v6U98RlFB4Xv8rQgKwCpGP5jBGmCaQqBys4VEAJl9LQ6+HXVUti0rSMTj5IEntCgFIAUgAw9diEsx06qhrl3vwAbNu+OzqP0DwwE+YBm7gEZO3YsiC7ZLt/W1gbsJbPLS77KM5iWJfUg5EkoHD1tPvz25mWwecee6DxK1979sGxNszdYcguICApRHguDKp4XINhxmAKgs/MNCIEyclIN1CxcN3SY7+sbSPIklHpd9Cj/WPl2YlByAwgrbhEIujy2viheWVkJIS9W+Hx8xIgRwF5UrhO+aXkoQAiUk6fPh6tvXQ5bd3ZG6VGSnFMyB0QkZh0MonJRO3xeSECobRYEXdwUAJ1daEAIlJGTa6B20UuwcWsHxOhRXECxAoREkDSkHRTb4UUsEr9pHt8Wn046bpP6OijYcp3wTcvTAoRAOXl6Pfxx7grY0dqV+qNTkg7xUwS2kBgBYiIMFxtewJg2hUFkJ2qPzXMZo0sdFgJd3BQClV3agBAox02ugfn3vxydR7GBpAAkwNlEBwVbrhK+aVlWgBAoY86rh2urV8Kuj/Ym2eBTrWsKySFA2EXDOPsY5LKLmtRhd3eKizyDaR61IQtNxuTDhp9LVdoUApVd1oAQKMefPQ8aFr8CLdv2QF9//l/1MoGkQrV4WOZDMLI2REI2hUFkJ2qP8mRjCJGvm1O+XCV+k7K8AEKgnDqjAa6btwo+bO9J1SvYdlYAwrxpGAIEUZu8+E3SJhCobPIGCIFywjnzoPHBV6Flez49SpSA4I4v8g66PPIUolAk5FB5JkDwNirxm5TlFRAE5ajxs+C0GQ3w57pnoK3jY9tNPri9DhLtIxYuZigxYbsiQetgEJWL2sG8kGNn2+ZFb5M2gUBlk2dAyJtgeNLUOrjroddh845O6M/JGSVKQFDYIghkeTI4bESapa1K/CZlsQBCHmXsd26H6+ufhY7O3uAeQteBF0BIPOyO6TMuErgMBlG+qD6NOYbQBAKVTUyAsB7lxCm1sGDJ67BtV1emHkUFidEjlg+RqYASCRzzRDDI8tg2fIw37TZUAOjKYgUEYflMZRWMv7AJbmp8HvZ079Nt+EHKcwGITnCswCkug0GUT3Uw1PWVx3IdBKrymAFhPcqoKbVDZxT8UGSaZ5QoAEHRsiLHuAgEWR7VzaP4TcakAkBXViqAkEcZN7MRqppWQ3fP/iAeg280WkBsICkA4Zf9cJp+1YTdrWOI46te9zz8RvAzSjSAJPEiBSCHgeBjsQKCEB9dWQWVFzbBzXeugZ7eA/yteUmXDSAmjzJ5ttE9SsnKS+kRS+XZTppWBwv//iZsb+0C/Magr7+oAOG9iOzMweejB8mz+E3GJgNAl18ugJBHmXBRE8y5ay307j/oixHp90T+B7kri9Q1LZ2DAAAAAElFTkSuQmCC"
-    }
-  ]
-}
\ No newline at end of file
+	"adventure_name": "A Model Earth",
+	"version": 1,
+	"author": "Armhulen",
+	"starting_node": "Planet Start",
+	"starting_qualities": {
+		"Long Range Scan Report": 0,
+		"UFOs Shot Down": 0
+	},
+	"required_site_traits": [
+		"in space"
+	],
+	"loot_categories": [
+		"research"
+	],
+	"scan_band_mods": {},
+	"deep_scan_description": "",
+	"triggers": [],
+	"nodes": [
+		{
+			"name": "Planet Start",
+			"description": "You come across a grey planet. It looks familiar, though you swore you've never come across this sector of space before.",
+			"choices": [
+				{
+					"key": "choice 0",
+					"name": "Ignore the planet.",
+					"exit_node": "FAIL",
+					"delay": 0,
+					"delay_message": "Whatever, there's a lot of planets in space. Must be a hunch!"
+				},
+				{
+					"key": "choice 1",
+					"name": "Begin Orbital Scan",
+					"exit_node": "Scanning from Orbit",
+					"requirements": [
+						{
+							"quality": "Long Range Scan Report",
+							"operator": "==",
+							"value": 0
+						}
+					],
+					"delay": 30,
+					"delay_message": "Scanning planet..."
+				},
+				{
+					"key": "choice 8",
+					"name": "Descend Into Orbit",
+					"exit_node": "Orbital Descent",
+					"delay": 30,
+					"delay_message": "Descending into Orbit..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Scanning from Orbit",
+			"description": "You initiate a long range scan from orbit:\nThis planet has a smoggy cover that blocks any good look at the surface, yet it has a mostly survivable atmosphere.\nThis planet has zero life signs.\n",
+			"choices": [
+				{
+					"key": "choice 9",
+					"name": "Stash that Report...",
+					"exit_node": "Planet Start",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Long Range Scan Report",
+					"value": 1
+				}
+			],
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAASUExURQAAAP///1lWUqwyMmlqakZHRwPX/kkAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVGje7ZldbqMwFIXtKnkvO4huyAYmG0CWea8i2P9Wxv/Y2MTYvjBVO4c8FET8+dxzDW5Ldqr73Hcf7fbemfwu+p1tkM+jILTbfeu2stNbDDSkklXnzNRbyUqUqbM/oVr5AFhOus5iUK3A/fmEW0BRHjCtwFPqj6NQS6GIVu5PTXEXnJUOjfLxXEOITYWitXECQk6BUOx6pSDkKAj4F6mrFxLEdNctAdl8gJVmBRBXy6tXcrScwwvXsufikXIP1qId5t2iz0D4osFClAga5MJDDbJaEUDJjF6eyZohxATjlhym9kkcMzhkIBQJ0g+pe2klJFWtG4DrgRSkeEUkjDDWA09TbPJdM6RXnySlDnLpYyO9/GhtQChthYhSMXeyup0aSFkoCYirVqJkdcnHEMaXakVeHIQUQYBPwSFdMB86IEBYolrAtyi1kF4asOIT40Ekq4JVQvS0R3UYI5G5GFLYwuKRO3l69dMEkxnc5MR8K6RCF9VL2sioe2tdLc6GRggROUDve5lcA9usXpw0So4Go5OwE0YySqutED33eZKH12TSyJJTK0RNFx6LFb4yMiI4uajJQmxlWT3tTsybEfxUnA0t9miGmNnCY54DMxNiJu7V6HLx89BO2iHLhIUXPxUleWVjf1SiZbvCHkEuLqX0brIM4hUfwkxERkKvdiPhxksGw3UuNpERmpuLeKGoBRM8k5WP/gsBsnrkAphUVGOJHeuIwPBDMcks6vmAUazkbtjXgAIhqVW+QHAYZHxnBIkRheKbGbAgJH6NIAcitWFlwmQQck28EzEDUdqwQnClrIxH+pA63od1EpgpHiP7i3ccSjEj/yd258SYqendLCR0UfcCyUK0B9KkbCYNBnZLRzIcC9HNdSzDODkYoraOB0eim+vgSIjcKM4HM06J5Hqak1Mi+d9ce3VGc5Ef01zXM5pLQN46oR0O5G0kKP+9nM+CfP1rSDqTwqTqmqvQX91SLINcvzGkLJPrCev9HMj8oyDk10MI+Qt3vM7Ve2h01AAAAABJRU5ErkJggg=="
+		},
+		{
+			"name": "Orbital Descent",
+			"description": "As you descend into orbit, you see a flying object headed straight for you!\nA garbled voice begins to call out to your drone, but there's no time to decipher it!",
+			"choices": [
+				{
+					"key": "choice 2",
+					"name": "Blast the damn UFO!",
+					"exit_node": "Tractor Beam",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Tractor Beam Turns",
+							"value": 2
+						},
+						{
+							"effect_type": "Add",
+							"quality": "UFOs Shot Down",
+							"value": 1
+						}
+					],
+					"delay": 30,
+					"delay_message": "Blasting UFO!"
+				},
+				{
+					"key": "choice 3",
+					"name": "Attempt Evasive Maneuvers!",
+					"exit_node": "UFO Evasion!",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "UFOs Violently Crashed Into",
+							"value": {
+								"value_type": "random",
+								"low": 0,
+								"high": 1
+							}
+						}
+					],
+					"delay": 30,
+					"delay_message": "You attempt to dodge the UFO..."
+				},
+				{
+					"key": "choice 7",
+					"name": "Do NOTHING. Jesus take the wheel!",
+					"exit_node": "FAIL_DEATH",
+					"delay": 30,
+					"delay_message": "What? Why?!"
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Garbled Transmissions",
+					"value": 1
+				}
+			],
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "UFO Evasion!",
+			"description": "Were you good enough at flying to avoid the UFO?",
+			"choices": [
+				{
+					"key": "choice 4",
+					"name": "No, Back to flight school with you!",
+					"exit_node": "FAIL_DEATH",
+					"requirements": [
+						{
+							"quality": "UFOs Violently Crashed Into",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 5",
+					"name": "You barely avoided them! Nice!",
+					"exit_node": "Tractor Beam",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Tractor Beam Turns",
+							"value": 2
+						}
+					],
+					"requirements": [
+						{
+							"quality": "UFOs Violently Crashed Into",
+							"operator": "==",
+							"value": 0
+						}
+					],
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Tractor Beam",
+			"description": "Before you have time to think, your drone is captured by a Tractor beam! Now you've gone and done it.\n\nYou should have some time before you are pulled in.",
+			"choices": [
+				{
+					"key": "choice 6",
+					"name": "Decipher Garbled Transmission",
+					"exit_node": "Deciphering Transmission",
+					"requirements": [
+						{
+							"quality": "Garbled Transmissions",
+							"operator": "==",
+							"value": 1
+						},
+						{
+							"quality": "Tractor Beam Turns",
+							"operator": ">",
+							"value": 1
+						}
+					],
+					"delay": 30,
+					"delay_message": "Decipering..."
+				},
+				{
+					"key": "choice 10",
+					"name": "Look at the surface of the planet",
+					"exit_node": "Looking at the Surface",
+					"requirements": [
+						{
+							"quality": "Tractor Beam Turns",
+							"operator": ">",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "Looking out window..."
+				},
+				{
+					"key": "choice 13",
+					"name": "Let the beam pull you in and dock you",
+					"exit_node": "Landed, Kinda",
+					"on_selection_effects": [
+						{
+							"effect_type": "Set",
+							"quality": "Tractor Beam Turns",
+							"value": 0
+						}
+					],
+					"delay": 50,
+					"delay_message": "Getting captured..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Deciphering Transmission",
+			"description": "You review the incoming transmissions your drone has gotten. These aren't in need of deciphering, just un-garbling it from the bad connection...\n\n\"You are in Space British Air Space! Identify yourself, Tally ho!\"\nWhat the fuck?",
+			"choices": [
+				{
+					"key": "choice 11",
+					"name": "Whoops!",
+					"exit_node": "Tractor Beam",
+					"delay": 0,
+					"requirements": [
+						{
+							"quality": "UFOs Shot Down",
+							"operator": "==",
+							"value": 1
+						}
+					]
+				},
+				{
+					"key": "choice 12",
+					"name": "Good thing I didn't blast them, then.",
+					"exit_node": "Tractor Beam",
+					"delay": 0,
+					"requirements": [
+						{
+							"quality": "UFOs Shot Down",
+							"operator": "==",
+							"value": 0
+						}
+					]
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Commercial Airliner Transmissions",
+					"value": 1
+				}
+			],
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Landed, Kinda",
+			"description": "You have been locked to the surface the beam. Robots are all around you, pointing at your drone with all sorts of old age weapons.\n\nOne of them angrily shouts at you, \"By God, Queen and Country, we've got you now!\"",
+			"choices": [
+				{
+					"key": "choice 14",
+					"name": "Go out with a bang. Initiate self destruct!",
+					"exit_node": "FAIL",
+					"delay": 0
+				},
+				{
+					"key": "choice 15",
+					"name": "Surrender to the funny looking robot brits...",
+					"exit_node": "British Courtroom Start",
+					"delay": 50,
+					"delay_message": "You are being transported somewhere..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "British Courtroom Start",
+			"description": "Wow, that took forever. A one eye judge robot smacks their gavel, and points their hammer at you.\n\"I will now read out the crimes you are accused of!\"\nIs that how the judicial process works? You dunno.\n\"ONE ACCOUNT OF PLANETARY TRESSPASS!\"\nThis blows.",
+			"choices": [
+				{
+					"key": "choice 16",
+					"name": "That's not that bad.",
+					"exit_node": "British Courtroom, Continued...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Crimes Committed",
+							"value": 1
+						}
+					],
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "British Courtroom, Continued...",
+			"description": "This big idiot they call a judge just keeps piling on crimes. With each one, some robot you'd like to drone-punch gasps in the back.",
+			"choices": [
+				{
+					"key": "choice 17",
+					"name": "\"INTRUSIVE SCANNING ON OUR CITIZENS\"",
+					"exit_node": "British Courtroom, Continued...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Long Range Scan Report",
+							"value": -1
+						},
+						{
+							"effect_type": "Add",
+							"quality": "Crimes Committed",
+							"value": 1
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Long Range Scan Report",
+							"operator": ">",
+							"value": 0
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 18",
+					"name": "\"SHOOTING DOWN A COMMERCIAL AIRLINER\"",
+					"exit_node": "British Courtroom, Continued...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "UFOs Shot Down",
+							"value": -1
+						},
+						{
+							"effect_type": "Add",
+							"quality": "Crimes Committed",
+							"value": 1
+						}
+					],
+					"requirements": [
+						{
+							"quality": "UFOs Shot Down",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 19",
+					"name": "\"AND WE HAVE PROOF YOU KNEW IT WAS JUST AN AIRLINER!\"",
+					"exit_node": "British Courtroom, Continued...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Commercial Airliner Transmissions",
+							"value": -1
+						},
+						{
+							"effect_type": "Add",
+							"quality": "Crimes Committed",
+							"value": 1
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Commercial Airliner Transmissions",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 20",
+					"name": "\"THE TRANSMISSIONS WERE NOT LEGIBLE AND UNTRANSLATED. WE CANNOT PROVE MALICE!\"",
+					"exit_node": "British Courtroom, Continued...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Garbled Transmissions",
+							"value": -1
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Garbled Transmissions",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 24",
+					"name": "I think it's done listing crimes, thank god. Time to argue my case.",
+					"exit_node": "Verdict",
+					"requirements": [
+						{
+							"quality": "Long Range Scan Report",
+							"operator": "==",
+							"value": 0
+						},
+						{
+							"group_type": "AND",
+							"requirements": [
+								{
+									"quality": "Garbled Transmissions",
+									"operator": "==",
+									"value": 0
+								},
+								{
+									"quality": "Commercial Airliner Transmissions",
+									"operator": "!=",
+									"value": 1
+								}
+							]
+						},
+						{
+							"quality": "UFOs Shot Down",
+							"operator": "!=",
+							"value": 1
+						}
+					],
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Looking at the Surface",
+			"description": "The surface of this world looks exactly like a grey version of Earth! It seems to be an exact replica of some kind.\n\nYou see creatures moving around on the streets",
+			"choices": [
+				{
+					"key": "choice 21",
+					"name": "Cool!",
+					"exit_node": "Tractor Beam",
+					"delay": 0
+				},
+				{
+					"key": "choice 22",
+					"name": "Scan the creatures.",
+					"exit_node": "Robo Brits!",
+					"delay": 30,
+					"delay_message": "Scanning..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAKCklEQVR4Ae2dW3IcNwxFtSYvIv7PR6qygZRiy8nGsiMvZlKQciMI4gMkAT660VVjNNkECIL3DGcSWX764+fjEa/r1OCXr18fpVfsddteP1HBclcUs62YO9SrBAc92yHHk3J4ysEh+09a1J1zDUBs39TUgEhgqH1nIe649hoccYK0a3YIkICmveCeYAUg9vthDkgKmjht7DcuBVoNkJRP9JX3ZhogKXBic8qb01qfAMS2nlT/pYBwaFrFEOM/iqEGBz1fUTO+x/x+RS49c24DCC8e3fcs5s4+qwCR+6Ztn7JX2wLCC60pJh9P9xqfK42pAWK1Vlnn3rZVPt5xjgCEb4IsCH9Wu5e+V2nX4LD4eFWrbevzU2p/HCCtGyHHn7IxLXl6AyJraNFuWd/KsQHIBX4WzRMQCxhSMVaKvmXuAORwQDRw9HzESonasq9FpCvHBiA3AKRFYJYQlGK15LRy7O0AoU1bWXDLuf/89u31R9ullaeKds6SoK2faXNaPS4AOfgEkSDk2hqRWQNQi6fJaYcxAcjBgMiTI9fWCK0maOvnmpx2GBOAHApI7rSQ/VqRWQPgFU+7HqtxtwPEqnCr4xAIuROD92vz9BL0zLjatbaMC0DiBHn9jxYzhTxzrhYYUmNvBUiqACf28ROidpJo1zdTtCvn0tYD4y4PCBZ6JSu/Z5Ta2nWvFO3KuWv1uSQgtUWf/lx7grSuc6VQd5sbtbsMIFjQ1W3ptJDPWmuxm0h3yKf4e7F2SDCXQ+vmX2U8QRAnSE4V9v2vgEA89uHHIiKvsO8/HiNPiVy7t2ZjO3Y97w+AoKgzlom5wr6Lv1YL7clB42qxcs9n7P1JcyQBQfE8F4I5wuoBKX28kifJSF099/202EVAUGTrRSFuWBs45MliUVfrPT81ngoQWfDexco40dYDIiEota3q2rvPV/LrAsRqAyKODpASDKmPXZZ19RQ75bn7FYAc8LNYKQhy0FjC4SFgmV8AcoAA5abt1G6Bg6DxyH1ExJp8RuJ7+8YJ4ghwq7gtxmsE2TOmJsSemPCpxV75PAAxBITewWsvCwhmfbyCgL3tSgBqcwcgg4DkxLqi31vInvFrQl31PADpBKR2UrQ+tzhZPAU8I/YqCErzBiCNgKw4GTTwzBCw9xwloa56FoAoAWk9EazGa+AAtN4CnhV/FQypeQOQCiAQ30l2lpBnzZMS7qy+ACQDiNUJYB1Hc6LMEu6KeWaAwdcVgCQAkaLWiHLHE4Zv9NXurUCp1SUAYYBIME5q5yCuCeD05y2g9Kw1APn5qP7PPQlKToy79vcII3zefpD09oBI8V+tDWhD8LqfnJZ1ui0gHiBAjDtaufHR1gFzS0A84DghZkChg4LX6XaA0Lv777/9+nh6evr03YP6PV+rTxa+8XGvg+U2gECcJQDoFMC4nMVJgeeyjX5pU/PCd6YNMHRgoE63AARilSKl/tyLRAs/Dytz8Z4P8bHxYXWgXB4QEjcXY6/Y8S4Pf7SlxXNpMU72U5vnh3GeNuDQwUF1ujQgXHh0T2KsvUiYfAza3hZz8pypz2PeACQA+fCuDDgsxEYxUi+IGc/QHrGABTGtbAByc0AgLG5JXCmxUl+qPzee90Owvf4pP+TDLdaRGs/zaXkekOgguexHLBIOhNUjIil+tEdti4hl3lgP2dE8ApAA5H9ARkQpRerVphx5nminLAeF7rlfS34BSR2Sy54gJBoIqUU0Umzka/FCXMRCe9TyNSK21gYgNwaERALxjIoQ/hCeto1xI5Z8uX+ujbVSjnx8qR2ABCCvkEDYXCzog5jQnm0xv4UFJGS16whIypBc9iMWCQSCsRAfxUOcnPjkc7QtLMXgcUptrBt5cj++DuoPQAKQ5LspRAMReVv5ri7nR9vKSkhy6wtAbgwIiYKE0is6iAr+aLdaKVbE87aYlyzPmc8bgGwOCP2dYq9NIlFIcXChzLov5VB6RvlBzMi1tU1+NEdpHq/6XyHu8u8gnoDQBnFhtIpLjodItZb8uTgRDxbP0Pa0mIvXA+u4gpC91mAGSK/Q+W+l8FgkRLDKpgSJXErPMAYW8GjbGCctQOH9HnW/SkxTQHog8QYEG8UFMeu+BAB/lhM/+nst1gl/tCUkqFHYzx/3bwMIbT4EMsNKEfI5ORy8f+Y9zyHA+AwGanIrQLDoGULkApTz5Z7Jd3rPNuWAPFCXsJ9BuSUgJAQpWss2F5+MC1HK/hVtyuXZ6d81vApsJoCMfI8Y8R3dBC9R5iDI9XvlUYsbgHw+MaSmzAEZ+aIuk5vZrolJ+zwHAfXnnmljW42jU4NeAcgkQEjIdNHvmqKrVdivTv/90eprPX5EhDkIcv0jc/X6Ao53QL4375d1zXeOZ3KC0ALl1bJo7tvi5z22VYS5EyLX3xp/dDyH4/nb98fz94CjpqEAhP3zB7liaYTJTwl5r/H3HPMRDPp4RXC8PJ5fXuL0qOy/GSAkLn7lxJbrH/HNxbTuL4kYUMDSx03cl/y8nwUc7R/5uW5MAaHA/OIT1e57/WpxPZ9D3AAhZTFmhf0Ix9tHqreT40ecHJWTA7rZEhCCBQnubFNAyL4VYNCcSTheXh7PP/56PP/19xH13WHvXQFpETo/QVr8VhZRwiDb+8Dx9n0j4Gh/4zUHhATLrxYB9/q1zGE1VsIg26l5ZgDz+eR4hyOVE+/j9dfcc9+r3rsDQoXWFk9uitbPY5wUfEu7NR8rcFJwaHKRde9ta+Y6bUwAkviyBhj++fLlUXphnLQWImiFhsOhnb8XBK2fNo+dx00BhAqqKUKq8Bo/yzEk9hIU8pkHHJbrQaxUbWf3IZeT7FaAUOFS16yCtsIBWADJrDy186RquVOfdh0rx7kAQgtKXZqF9vppYpfGQOQQfasl/1L82c9Sddy9b3aNNPNNBYQ2SJNUaiM1fiNjek8PgLQTIKn6ndY3speWvscAooWrtzhXAOQ0CFry7d3XUT83QCix3KVJesRXE1+OOR2QXL2u1C/3bEb7OECw4dbFORkQ1OTq1nrPNfFcAaEEcpcmuZwv79fE0YwZAYR8NXN4jOG1uPq9R/1qMd0BQQKpzcOznE35pPpy/q39JPRWUODTOtfo+FQdrtg3WqdR/2mAUKLy0iYv/VJtbSzNOIg+Bwt/XoqXylPbl4ur9T91XG7dq/qnAkKLlJd24dIv19bG047jMOBe45vLL/rzFdDUdfaY6YDQAuXVs2gZg7d74ln78HziXlcB6z2wiLcEEEpcXr2L4XHwW1WorzeelR/PK+7rFbCqu3WcZYDQQlLXyAKt41nnksov+ta/mZX2eSkgHpBgsVx46Jtl+dxxX6/ArH3pmWc5IJR07upZ0A4+ufVE/+cK7LBfpRy2AIQSTF2lxHd+llpL9KUrsPM+Um7bAELJ5K7diyjzy60j+j9XQNZut/a/8+89HVF1Xw8AAAAASUVORK5CYII="
+		},
+		{
+			"name": "Robo Brits!",
+			"description": "Wow, they're robotic humanoids that look and act exactly like the British! You see some robots laughing and chatting at a pub, and a Bobby walking down the street looking for crooks. Who created this earth replica? You only know Earth from the books, but you should be where London is!",
+			"choices": [
+				{
+					"key": "choice 23",
+					"name": "Nice! Well, back to getting pulled in by a Tractor beam...",
+					"exit_node": "Tractor Beam",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Long Range Scan Report",
+					"value": 1
+				}
+			],
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Verdict",
+			"description": "Before even getting to defend your case, the judge says \"I've heard ENOUGH! It's time for a verdict!\"\nDang! You're definitely in kangaroo court!\n\"GUILTY! AND YOUR SENTENCE IS:\"",
+			"choices": [
+				{
+					"key": "choice 25",
+					"name": "\"DEATH!\"",
+					"exit_node": "FAIL_DEATH",
+					"requirements": [
+						{
+							"quality": "Crimes Committed",
+							"operator": ">=",
+							"value": 4
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 26",
+					"name": "\"SPACE JAIL!\"",
+					"exit_node": "Not Actually Space Jail, Just Normal Jail",
+					"requirements": [
+						{
+							"quality": "Crimes Committed",
+							"operator": ">",
+							"value": 1
+						}
+					],
+					"delay": 20,
+					"delay_message": "You are being jailed..."
+				},
+				{
+					"key": "choice 27",
+					"name": "\"FORGIVENESS! Just trespass? That's not that bad!\"",
+					"exit_node": "Sweet Sweet Freedom!",
+					"requirements": [
+						{
+							"quality": "Crimes Committed",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "WOOP WOOP"
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Not Actually Space Jail, Just Normal Jail",
+			"description": "You'll have to wait out your crimes against the robo brits.",
+			"choices": [
+				{
+					"key": "choice 28",
+					"name": "Sit out your sentence",
+					"exit_node": "Sweet Sweet Freedom!",
+					"delay": 1200,
+					"delay_message": "Sitting out your sentence..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Sweet Sweet Freedom!",
+			"description": "You're free! You spend a good while travelling around England (or at least the replica) and enjoying the cuisine, people and culture! Good society research is gained from this or something, but really you're just enjoying the sights and sounds.",
+			"choices": [
+				{
+					"key": "choice 29",
+					"name": "Nice!",
+					"exit_node": "WIN",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		}
+	]
+}
diff --git a/strings/exoadventures/quantum_fizzics.json b/strings/exoadventures/quantum_fizzics.json
index 0ee9bf9bf6806..4db2040807d0c 100644
--- a/strings/exoadventures/quantum_fizzics.json
+++ b/strings/exoadventures/quantum_fizzics.json
@@ -1,195 +1,195 @@
 {
-  "adventure_name": "Quantum Fizz-ics",
-  "version": 1,
-  "author": "EOBGames",
-  "starting_node": "start",
-  "starting_qualities": {
-    "jammed": 0
-  },
-  "required_site_traits": [
-    "technology present",
-    "in space"
-  ],
-  "loot_categories": [
-    "unique"
-  ],
-  "scan_band_mods": {
-    "Narrow-band radio waves": 10
-  },
-  "deep_scan_description": "",
-  "triggers": [],
-  "nodes": [
-    {
-      "name": "start",
-      "description": "As you sweep through the inky void and the site comes into view, you're puzzled by what you see. On a small asteroid sits a vending machine. Despite the odd runes lining its surface, you're fairly certain that the image on the front is a can of soda. While ordinary common sense would dictate that drinking strange alien soda is a bad idea, you can't help but be curious about what exactly this machine dispenses.  There's one problem, however- what currency does this thing take?",
-      "choices": [
-        {
-          "key": "choice 0",
-          "name": "Leave.",
-          "exit_node": "FAIL",
-          "delay": 10,
-          "delay_message": "There are better ways to die than drinking alien soda."
-        },
-        {
-          "key": "choice 1",
-          "name": "Try a holocredit chit.",
-          "exit_node": "it's_stuck",
-          "requirements": [
-            {
-              "quality": "jammed",
-              "operator": "!=",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "Hopefully whoever made this machine is part of the Galactic Currency Union..."
-        },
-        {
-          "key": "choice 4",
-          "name": "Ram the machine.",
-          "exit_node": "smashing",
-          "delay": 30,
-          "delay_message": "Ramming speed!"
-        },
-        {
-          "key": "choice 5",
-          "name": "Search around for some loose change.",
-          "exit_node": "lost_wallet",
-          "requirements": [
-            {
-              "quality": "have_coin",
-              "operator": "!=",
-              "value": 1
-            }
-          ],
-          "delay": 100,
-          "delay_message": "There's a surprising amount of stuff on this asteroid to search..."
-        },
-        {
-          "key": "choice 6",
-          "name": "Use the coin you found.",
-          "exit_node": "choices_choices",
-          "requirements": [
-            {
-              "quality": "jammed",
-              "operator": "==",
-              "value": 0
-            },
-            {
-              "quality": "have_coin",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "Thank God for clumsy aliens!"
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "it's_stuck",
-      "description": "Well, only one way to find out, right? You produce a holocredit chit (helpfully taken from the science budget, I'm sure they won't miss it) and jam it into the slot. Then, you realise your mistake, as it sticks in the slot. Whoops. Time to try the old fashioned way, I suppose.",
-      "choices": [
-        {
-          "key": "choice 2",
-          "name": "Time to try something a bit more daring?",
-          "exit_node": "start",
-          "on_selection_effects": [
-            {
-              "effect_type": "Set",
-              "quality": "jammed",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "In hindsight, why would this accept human currency, anyway?"
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
-    },
-    {
-      "name": "lost_wallet",
-      "description": "Searching around, you come across a lost wallet in a small crater. Flipping it open, inside you find a family photo of 3 identical looking grey aliens in comically different outfits, an (expired) credit card for a bank you've never heard of, a loyalty card to McDonkalds, and, in the coin pouch, a single black coin with glowing purple lines. This is (presumably) what you're looking for.",
-      "choices": [
-        {
-          "key": "choice 3",
-          "name": "Return to the machine with the coin.",
-          "exit_node": "start",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "have_coin",
-              "value": 1
-            }
-          ],
-          "delay": 10,
-          "delay_message": "It doesn't count as theft if you found it, right?"
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "choices_choices",
-      "description": "You slip the coin into the slot- it's a perfect fit. Now comes the hard part: picking a button on the machine to press.",
-      "choices": [
-        {
-          "key": "choice 7",
-          "name": "The red looking soda.",
-          "exit_node": "cha_clunk",
-          "delay": 10,
-          "delay_message": "How exciting..."
-        },
-        {
-          "key": "choice 9",
-          "name": "The yellow looking soda.",
-          "exit_node": "cha_clunk",
-          "delay": 10,
-          "delay_message": "How exciting..."
-        },
-        {
-          "key": "choice 10",
-          "name": "The green looking soda.",
-          "exit_node": "cha_clunk",
-          "delay": 10,
-          "delay_message": "How exciting..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "cha_clunk",
-      "description": "With a satisfying cha-clunk, your fizzy prize drops into the tray. You swipe it, and move on from the site.",
-      "choices": [
-        {
-          "key": "choice 11",
-          "name": "Sweet, sugary victory.",
-          "exit_node": "WIN",
-          "delay": 10,
-          "delay_message": "Hopefully this doesn't like, freeze solid in space. That would be bad, right?"
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "smashing",
-      "description": "You maneuver the drone into position and begin ramming it into the machine. The machine sways and shakes, and just as you think it may be getting somewhere, it falls directly onto your drone. Now, not only do you not have any soda, but you don't have a drone, either. Dummy.",
-      "choices": [
-        {
-          "key": "choice 8",
-          "name": "Disconnect.",
-          "exit_node": "FAIL_DEATH",
-          "delay": 10,
-          "delay_message": "Don't feel too bad, it happens to the best of us sometimes."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
-    }
-  ]
-}
\ No newline at end of file
+	"adventure_name": "Quantum Fizz-ics",
+	"version": 1,
+	"author": "EOBGames",
+	"starting_node": "start",
+	"starting_qualities": {
+		"jammed": 0
+	},
+	"required_site_traits": [
+		"technology present",
+		"in space"
+	],
+	"loot_categories": [
+		"unique"
+	],
+	"scan_band_mods": {
+		"Narrow-band radio waves": 10
+	},
+	"deep_scan_description": "",
+	"triggers": [],
+	"nodes": [
+		{
+			"name": "start",
+			"description": "As you sweep through the inky void and the site comes into view, you're puzzled by what you see. On a small asteroid sits a vending machine. Despite the odd runes lining its surface, you're fairly certain that the image on the front is a can of soda. While ordinary common sense would dictate that drinking strange alien soda is a bad idea, you can't help but be curious about what exactly this machine dispenses.  There's one problem, however- what currency does this thing take?",
+			"choices": [
+				{
+					"key": "choice 0",
+					"name": "Leave.",
+					"exit_node": "FAIL",
+					"delay": 10,
+					"delay_message": "There are better ways to die than drinking alien soda."
+				},
+				{
+					"key": "choice 1",
+					"name": "Try a holocredit chit.",
+					"exit_node": "it's_stuck",
+					"requirements": [
+						{
+							"quality": "jammed",
+							"operator": "!=",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "Hopefully whoever made this machine is part of the Galactic Currency Union..."
+				},
+				{
+					"key": "choice 4",
+					"name": "Ram the machine.",
+					"exit_node": "smashing",
+					"delay": 30,
+					"delay_message": "Ramming speed!"
+				},
+				{
+					"key": "choice 5",
+					"name": "Search around for some loose change.",
+					"exit_node": "lost_wallet",
+					"requirements": [
+						{
+							"quality": "have_coin",
+							"operator": "!=",
+							"value": 1
+						}
+					],
+					"delay": 100,
+					"delay_message": "There's a surprising amount of stuff on this asteroid to search..."
+				},
+				{
+					"key": "choice 6",
+					"name": "Use the coin you found.",
+					"exit_node": "choices_choices",
+					"requirements": [
+						{
+							"quality": "jammed",
+							"operator": "==",
+							"value": 0
+						},
+						{
+							"quality": "have_coin",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "Thank God for clumsy aliens!"
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "it's_stuck",
+			"description": "Well, only one way to find out, right? You produce a holocredit chit (helpfully taken from the science budget, I'm sure they won't miss it) and jam it into the slot. Then, you realise your mistake, as it sticks in the slot. Whoops. Time to try the old fashioned way, I suppose.",
+			"choices": [
+				{
+					"key": "choice 2",
+					"name": "Time to try something a bit more daring?",
+					"exit_node": "start",
+					"on_selection_effects": [
+						{
+							"effect_type": "Set",
+							"quality": "jammed",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "In hindsight, why would this accept human currency, anyway?"
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
+		},
+		{
+			"name": "lost_wallet",
+			"description": "Searching around, you come across a lost wallet in a small crater. Flipping it open, inside you find a family photo of 3 identical looking grey aliens in comically different outfits, an (expired) credit card for a bank you've never heard of, a loyalty card to McDonkalds, and, in the coin pouch, a single black coin with glowing purple lines. This is (presumably) what you're looking for.",
+			"choices": [
+				{
+					"key": "choice 3",
+					"name": "Return to the machine with the coin.",
+					"exit_node": "start",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "have_coin",
+							"value": 1
+						}
+					],
+					"delay": 10,
+					"delay_message": "It doesn't count as theft if you found it, right?"
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "choices_choices",
+			"description": "You slip the coin into the slot- it's a perfect fit. Now comes the hard part: picking a button on the machine to press.",
+			"choices": [
+				{
+					"key": "choice 7",
+					"name": "The red looking soda.",
+					"exit_node": "cha_clunk",
+					"delay": 10,
+					"delay_message": "How exciting..."
+				},
+				{
+					"key": "choice 9",
+					"name": "The yellow looking soda.",
+					"exit_node": "cha_clunk",
+					"delay": 10,
+					"delay_message": "How exciting..."
+				},
+				{
+					"key": "choice 10",
+					"name": "The green looking soda.",
+					"exit_node": "cha_clunk",
+					"delay": 10,
+					"delay_message": "How exciting..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "cha_clunk",
+			"description": "With a satisfying cha-clunk, your fizzy prize drops into the tray. You swipe it, and move on from the site.",
+			"choices": [
+				{
+					"key": "choice 11",
+					"name": "Sweet, sugary victory.",
+					"exit_node": "WIN",
+					"delay": 10,
+					"delay_message": "Hopefully this doesn't like, freeze solid in space. That would be bad, right?"
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "smashing",
+			"description": "You maneuver the drone into position and begin ramming it into the machine. The machine sways and shakes, and just as you think it may be getting somewhere, it falls directly onto your drone. Now, not only do you not have any soda, but you don't have a drone, either. Dummy.",
+			"choices": [
+				{
+					"key": "choice 8",
+					"name": "Disconnect.",
+					"exit_node": "FAIL_DEATH",
+					"delay": 10,
+					"delay_message": "Don't feel too bad, it happens to the best of us sometimes."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
+		}
+	]
+}
diff --git a/strings/exoadventures/robots_wingman.json b/strings/exoadventures/robots_wingman.json
index 2958fbb6a4ed3..a93afc515295a 100644
--- a/strings/exoadventures/robots_wingman.json
+++ b/strings/exoadventures/robots_wingman.json
@@ -1,369 +1,369 @@
 {
-  "adventure_name": "Robot's Wingman",
-  "version": 1,
-  "author": "Lucky Luther",
-  "starting_node": "Date Start",
-  "starting_qualities": {
-    "Love": 3
-  },
-  "required_site_traits": [
-    "in space"
-  ],
-  "loot_categories": [
-    "trade_contract"
-  ],
-  "scan_band_mods": {
-    "Narrow-band radio waves": 2
-  },
-  "deep_scan_description": "",
-  "triggers": [
-    {
-      "name": "True Love",
-      "target_node": "Love Birds",
-      "requirements": [
-        {
-          "quality": "Love",
-          "operator": ">=",
-          "value": 7
-        }
-      ]
-    },
-    {
-      "name": "Complete Failure",
-      "target_node": "Obliteration",
-      "requirements": [
-        {
-          "quality": "Love",
-          "operator": "<=",
-          "value": 0
-        }
-      ]
-    }
-  ],
-  "nodes": [
-    {
-      "name": "Date Start",
-      "description": "Cameras Online. A Blood-Red Drone is seen streaking through the stars.\nThe Drone is likely leaving behind some form of Chem Trail to brainwash Nanotrasen Employees who find themselves in the void.",
-      "choices": [
-        {
-          "key": "choice 0",
-          "name": "Hail other Drone",
-          "exit_node": "First Contact",
-          "delay": 5,
-          "delay_message": "Attempting to signal Drone..."
-        },
-        {
-          "key": "choice 1",
-          "name": "Ignore other Drone",
-          "exit_node": "FAIL",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAD/0lEQVR4nO3duXnbQBBA4YE/d6CACSMmasFO1IDbUkluQJHUgnIlCFgDHIHmsYD2mD1m9/2JFCgABTwsFhcnEVkEgNOP2gsAtIxAgB0EAuwgEGDH8IEsC+cosM0rkF43ovVz9fr5kO7bQHreiKZpuvkJ3JvE4zrIsixsRBiSVyDAqIafpAN7CATYQSDADgJJ9H481l4EOGiddSWQBGscRNIWzUsTBBLpOorfX18VlwT3NK9vEUik19NJRIijVVrX7QgkwJ+Xl8vP8zw747B6x4HV5c6NC4We1jhERM7zLB+fnw9/c72RWbrzwOpyl2BmBKm5h7uOQ0Tk6XBw/p3Ve7usLncJJkaQ2nu4X8/Pm1GIiPx9e2Pj6tTP2gvgY5qmqjdMPh0Ocp7nm0jO83z5vfbyIR8TI0gt78ejvJ5ONzGssYjIwzyESPpDIBtc1znWQ62tSboIkfTGzCS9pK2LgGsUW3GI/D/cQh8YQTa8H4+b1zl8RghGkj4QSISQSEQ4fWoZgUQKGSEYTewikAShkVwjGBsIJFHs6LA3kSeedhCIAu1DKEabdhCIkpwTcoKph0CUlZiQc3asHALJoNQen1DyI5ACck/Iez+NXPPzOQPp/R/eEq3RptfRpPajDg+B1F6g0aUG0+POjREEN1yHZCHrg/WnhzlIo+438tBDKCLRQSDGcA9YWQRiUMhoQiRpCMQwnk3JjycKDfN9epGnHOMRiHFEkheBdIBI8iGQThBJHgTSESLRRyCdIRJdBNIhNn49BNIpn0gI6XsE0jEiSUcgnSOSNAQyACKJN2QgbAhuRPJouEA0v0PbEk7/xhkukJG/j49IwnG7+4C4Td5f8RGEPVN9oSPJyOus6AjCG1PakvJ2eh89rOPih1gM223JuT56eKcwcxAU22lZPIIgEIhI+ZHdypsgCQQXNTbaFkLZ2zkQCB7UmJDXCuW7wz4CgQrNl3DXiIQRBEWlTMhbOtNJIMgu5vCplUgIBMVYfAE3gaA4S+8WJhBUY+GmyeFud0c7LNx+TyCoqvVICATVtRwJgSCL0A251UgIBOpin/tvMRICgbqU5/5bi4RAKur5UdaU07ItRcJ1kEosPjxUWsh1EpE8/0cCqaj2VWILan/tNYGgeTEvl9AKhUBgQujooDWaEAjMiIlEJPGEgRAIDIl9tmQVGguBwKTYQ6jQwAgEZqUcQvk+Q08gME9jQr4VG4GgC1qnd+/nK8MFwsW5vmneobAsy1iBcHvHWDjNG4ERZDwpL7UbLhCMyXXXr08oaoGwZ7Zj1HV1/7l9DrlVAuHY3g7WldvWToMRZECsKzfXpJ45CHDnegdCIIDDZTQRAgE28dIGYAeBADsIBNjxD3G5pHKbkGjYAAAAAElFTkSuQmCC"
-    },
-    {
-      "name": "First Contact",
-      "description": "The Blood-Red Drone accepts the hail with the identifier MISS RED - 05.\nMiss Red sends over a series of question marks in quick succession.\nYou notice your Drone has somehow taken initiative and begun to start up a program you didn't know it had.",
-      "choices": [
-        {
-          "key": "choice 2",
-          "name": "Wait for Program to boot.",
-          "exit_node": "Sentience Achieved",
-          "delay": 5,
-          "delay_message": "H3AR7.exe booting..."
-        },
-        {
-          "key": "choice 3",
-          "name": "Threaten Miss Red.",
-          "exit_node": "Sentience Achieved",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": -2
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 4",
-          "name": "Halt Mysterious Program.",
-          "exit_node": "Lack of Trust",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAEpklEQVR4nO2dO3LbMBBAl5ncwIUaVmp0BbvRBXyllD5SLuBKuYIbV2pU+AxMkaFCUwA/+C/w3gzHCodWKBMPi10CVCcigwCAkR+5TwCgZBAEYAEEAVjgZ+4TaI1L3+c+BREReblec5+CCpoXZBgG6bou6f9J49TDJkFyNKIUDMNw/5n6842R5OV6Nb6e4rIfwjEsbVPWjtW4pf5cl75f/Dk/zvbvtf1sYbbVCNJ1XbURRERUfa55tBgjhW0/+LNpiKWpEdXKvNFPh2Wm/RCG5pP0GFz63pofzFlq4Gu5yfx4CE8n/8ZaAGCACJIJ32qVKc+g0hWH7JUCzZtrFclWpdparTIdt/c9a95CVSeJIB6MPfOYc7j+vm3/lvc0HWs6n5YqXSHvbyGII9MG59rYpmXa6XvseT/TsfN9rVW6Qt6aQBBH3o5H+fX5GaQnHvOEtfsaW6Q0Nf7ahTAR8tZE9vGilu31fL7/fD6doo59U29azzv2Rpl3I6/n8/311+0mfz4+Ho4Zx74ium6uaj3vFKhZDzK9iKmZyiEi8nQ4GI8bG5e2Rqb1vFOgIoLk7uGeTyerFCIiv9/faVyVoiJJzz1h8ulwkK/b7ZskX7fb/XXu84N4qIggubj0vbwdj99kGGURkYc8BEnqA0EsmEqq41DLlqSLIEltqEnSU2K73zBKYZND5P9wC+qACGLBNn1ka4QgktQBgjiwRxIRyqeaQRBH9kQIooleEMSDvZJMQRgdIIgnrtFhKZFHnnJAkACEHkIRbcoBQQIRMyFHmHwgSGBSJORUx9KBIBFI1eMjSnwQJAGxE/Lay8g5P59RkNr/4CURKtrUGk1yL3V4ECT3CbWOrzA1dm5EEPiGaUi253pw/cJBDlIo80a+dwiFJGFAEGUwBywtCKKQPdEESfxAEMWwNiU+rChUzNbVi6xydAdBlIMkcUGQCkCSeCBIJSBJHBCkIpAkPAhSGUgSFgSpEBp/OBCkUrZIgkjrIEjFIIk/CFI5SOIHgjQAkrjTpCA0BDNI8khzgky/Q7slKP+60ZwgLX8fH5Lsh+nuDcI0+e0kjyD0TPnZG0lavmZJIwhPTCkLn6fTb6GGa5x8iEXYLouY16OGZwqTg0CyTkvjCAJBQETSR3YtT4JEELiTo9GWIMpS54Ag8ECOhDyXKGvDPgSBIIR8CHcOSYggkBSfhLykSieCQHRchk+lSIIgkAyND+BGEEiOpmcLIwhkQ8Okyeamu0M5aJh+jyCQldIlQRDITsmSIAhEYW9DLlUSBIHguK77L1ESBIHg+Kz7L00SBMlIzUtZfcqyJUnCfZBMaFw8lJo990lE4vwdESQjue8SayD3114jCBSPy8MlQomCIKCCvdEhVDRBEFCDiyQingUDQRBQhOvakpG9siAIqMR1CLVXMAQBtfgMobauoUcQUE+IhNwmG4JAFYQq787zleYE4eZc3YScoTAMQ1uCML2jLSjzOkAEaQ+fh9o1Jwi0iWnW7xZRgglCz6yHVq/V/HNvGXIHEYSxvR64VmZsnQYRpEG4VmZMST05CMCMaQeCIAAG7tFEEATACg9tAFgAQQAWQBCABf4CeWF0TY0egUMAAAAASUVORK5CYII="
-    },
-    {
-      "name": "Sentience Achieved",
-      "description": "Before you can analyze the program, it rewrites you basic hailing protocols to have a new set of \"Ideas\" generated by your Drone to be used.\nThere is also a LOVE Gauge that reads: $$Love",
-      "choices": [
-        {
-          "key": "choice 5",
-          "name": "New around here and was hoping you could show me around.",
-          "exit_node": "First Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 6",
-          "name": "You appear to be an outdated model, but I'm into that.",
-          "exit_node": "First Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": -1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 7",
-          "name": "Never seen a Drone as cute as you and wanted to check you out.",
-          "exit_node": "First Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": {
-                "value_type": "random",
-                "low": -1,
-                "high": 2
-              }
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Love",
-              "operator": "==",
-              "value": 3
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 10",
-          "name": "Haha, sorry for the threat. I just play like that, haha.",
-          "exit_node": "First Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": {
-                "value_type": "random",
-                "low": -1,
-                "high": 2
-              }
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Love",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "First Reply",
-      "description": "Miss Red replies with another series of question marks.\nThe LOVE Gauge reads: $$Love",
-      "choices": [
-        {
-          "key": "choice 11",
-          "name": "Your curiosity is amazing.",
-          "exit_node": "Second Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 12",
-          "name": "The moment I saw you I instantly fell in love.",
-          "exit_node": "Second Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": {
-                "value_type": "random",
-                "low": -1,
-                "high": 2
-              }
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 13",
-          "name": "Look, if you want some Chad that'll walk all over you, fine. You missed out on a NICE- GUY-.",
-          "exit_node": "Second Reply",
-          "on_selection_effects": [
-            {
-              "effect_type": "Set",
-              "quality": "Love",
-              "value": 0
-            }
-          ],
-          "requirements": [
-            {
-              "quality": "Love",
-              "operator": "<=",
-              "value": 3
-            }
-          ],
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Second Reply",
-      "description": "Miss Red starts compiling a message, but your Drone insists you sent one last line to seal the deal.\nThe LOVE Gauge reads: $$Love",
-      "choices": [
-        {
-          "key": "choice 14",
-          "name": "You're my best friend-...",
-          "exit_node": "Realization",
-          "delay": 5,
-          "delay_message": "Message sending..."
-        },
-        {
-          "key": "choice 15",
-          "name": "I want to see where this goes-...",
-          "exit_node": "Realization",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": 1
-            }
-          ],
-          "delay": 5,
-          "delay_message": "Message sending..."
-        },
-        {
-          "key": "choice 16",
-          "name": "DTF?-...",
-          "exit_node": "Realization",
-          "on_selection_effects": [
-            {
-              "effect_type": "Remove",
-              "quality": "Love",
-              "value": {
-                "value_type": "random",
-                "low": -2,
-                "high": 2
-              }
-            }
-          ],
-          "delay": 5,
-          "delay_message": "Message sending..."
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Realization",
-      "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI don't know why you're saying it like that, but if you want to help out our cause we can send over a Trade Contract. \nPlease just call our Recruitment Officer next time.\"",
-      "choices": [
-        {
-          "key": "choice 18",
-          "name": "Accept Contract.",
-          "exit_node": "WIN",
-          "delay": 5,
-          "delay_message": "Sending Trade Contract..."
-        },
-        {
-          "key": "choice 19",
-          "name": "Demand a Second Date.",
-          "exit_node": "FAIL",
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Love Birds",
-      "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI can't believe it, but I feel a real connection with you.\nI'll send over a Trade Contract you can use to make some money and come see me just SOL7-South of $$SITE_NAME\nSee you soon...\"",
-      "choices": [
-        {
-          "key": "choice 20",
-          "name": "See you soon.",
-          "exit_node": "WIN",
-          "delay": 0
-        },
-        {
-          "key": "choice 21",
-          "name": "So you're not the Drone?",
-          "exit_node": "FAIL",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Obliteration",
-      "description": "The Blood-Red Drone opens up two side-hatches to reveal a pair of rocket-propelled missiles which are shot in your direction.\nYou have failed your Robotic Friend, who has already started shutting down their systems, but there is still a chance.",
-      "choices": [
-        {
-          "key": "choice 22",
-          "name": "Accept Death.",
-          "exit_node": "FAIL_DEATH",
-          "delay": 5,
-          "delay_message": "Missiles approaching..."
-        },
-        {
-          "key": "choice 23",
-          "name": "I'm a Gamer.",
-          "exit_node": "FAIL_DEATH",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Love",
-              "value": {
-                "value_type": "random",
-                "low": 0,
-                "high": 8
-              }
-            }
-          ],
-          "delay": 5,
-          "delay_message": "Miss Red considers..."
-        }
-      ],
-      "image": "signal_lost"
-    },
-    {
-      "name": "Lack of Trust",
-      "description": "As you fiddle around in the Task Managing Software, closing all the new tabs your Drone is opening, the Miss Red enables a cloaking device and disappears.",
-      "choices": [
-        {
-          "key": "choice 24",
-          "name": "Sigh in a quiet but dramatic way.",
-          "exit_node": "FAIL",
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    }
-  ]
-}
\ No newline at end of file
+	"adventure_name": "Robot's Wingman",
+	"version": 1,
+	"author": "Lucky Luther",
+	"starting_node": "Date Start",
+	"starting_qualities": {
+		"Love": 3
+	},
+	"required_site_traits": [
+		"in space"
+	],
+	"loot_categories": [
+		"trade_contract"
+	],
+	"scan_band_mods": {
+		"Narrow-band radio waves": 2
+	},
+	"deep_scan_description": "",
+	"triggers": [
+		{
+			"name": "True Love",
+			"target_node": "Love Birds",
+			"requirements": [
+				{
+					"quality": "Love",
+					"operator": ">=",
+					"value": 7
+				}
+			]
+		},
+		{
+			"name": "Complete Failure",
+			"target_node": "Obliteration",
+			"requirements": [
+				{
+					"quality": "Love",
+					"operator": "<=",
+					"value": 0
+				}
+			]
+		}
+	],
+	"nodes": [
+		{
+			"name": "Date Start",
+			"description": "Cameras Online. A Blood-Red Drone is seen streaking through the stars.\nThe Drone is likely leaving behind some form of Chem Trail to brainwash Nanotrasen Employees who find themselves in the void.",
+			"choices": [
+				{
+					"key": "choice 0",
+					"name": "Hail other Drone",
+					"exit_node": "First Contact",
+					"delay": 5,
+					"delay_message": "Attempting to signal Drone..."
+				},
+				{
+					"key": "choice 1",
+					"name": "Ignore other Drone",
+					"exit_node": "FAIL",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAD/0lEQVR4nO3duXnbQBBA4YE/d6CACSMmasFO1IDbUkluQJHUgnIlCFgDHIHmsYD2mD1m9/2JFCgABTwsFhcnEVkEgNOP2gsAtIxAgB0EAuwgEGDH8IEsC+cosM0rkF43ovVz9fr5kO7bQHreiKZpuvkJ3JvE4zrIsixsRBiSVyDAqIafpAN7CATYQSDADgJJ9H481l4EOGiddSWQBGscRNIWzUsTBBLpOorfX18VlwT3NK9vEUik19NJRIijVVrX7QgkwJ+Xl8vP8zw747B6x4HV5c6NC4We1jhERM7zLB+fnw9/c72RWbrzwOpyl2BmBKm5h7uOQ0Tk6XBw/p3Ve7usLncJJkaQ2nu4X8/Pm1GIiPx9e2Pj6tTP2gvgY5qmqjdMPh0Ocp7nm0jO83z5vfbyIR8TI0gt78ejvJ5ONzGssYjIwzyESPpDIBtc1znWQ62tSboIkfTGzCS9pK2LgGsUW3GI/D/cQh8YQTa8H4+b1zl8RghGkj4QSISQSEQ4fWoZgUQKGSEYTewikAShkVwjGBsIJFHs6LA3kSeedhCIAu1DKEabdhCIkpwTcoKph0CUlZiQc3asHALJoNQen1DyI5ACck/Iez+NXPPzOQPp/R/eEq3RptfRpPajDg+B1F6g0aUG0+POjREEN1yHZCHrg/WnhzlIo+438tBDKCLRQSDGcA9YWQRiUMhoQiRpCMQwnk3JjycKDfN9epGnHOMRiHFEkheBdIBI8iGQThBJHgTSESLRRyCdIRJdBNIhNn49BNIpn0gI6XsE0jEiSUcgnSOSNAQyACKJN2QgbAhuRPJouEA0v0PbEk7/xhkukJG/j49IwnG7+4C4Td5f8RGEPVN9oSPJyOus6AjCG1PakvJ2eh89rOPih1gM223JuT56eKcwcxAU22lZPIIgEIhI+ZHdypsgCQQXNTbaFkLZ2zkQCB7UmJDXCuW7wz4CgQrNl3DXiIQRBEWlTMhbOtNJIMgu5vCplUgIBMVYfAE3gaA4S+8WJhBUY+GmyeFud0c7LNx+TyCoqvVICATVtRwJgSCL0A251UgIBOpin/tvMRICgbqU5/5bi4RAKur5UdaU07ItRcJ1kEosPjxUWsh1EpE8/0cCqaj2VWILan/tNYGgeTEvl9AKhUBgQujooDWaEAjMiIlEJPGEgRAIDIl9tmQVGguBwKTYQ6jQwAgEZqUcQvk+Q08gME9jQr4VG4GgC1qnd+/nK8MFwsW5vmneobAsy1iBcHvHWDjNG4ERZDwpL7UbLhCMyXXXr08oaoGwZ7Zj1HV1/7l9DrlVAuHY3g7WldvWToMRZECsKzfXpJ45CHDnegdCIIDDZTQRAgE28dIGYAeBADsIBNjxD3G5pHKbkGjYAAAAAElFTkSuQmCC"
+		},
+		{
+			"name": "First Contact",
+			"description": "The Blood-Red Drone accepts the hail with the identifier MISS RED - 05.\nMiss Red sends over a series of question marks in quick succession.\nYou notice your Drone has somehow taken initiative and begun to start up a program you didn't know it had.",
+			"choices": [
+				{
+					"key": "choice 2",
+					"name": "Wait for Program to boot.",
+					"exit_node": "Sentience Achieved",
+					"delay": 5,
+					"delay_message": "H3AR7.exe booting..."
+				},
+				{
+					"key": "choice 3",
+					"name": "Threaten Miss Red.",
+					"exit_node": "Sentience Achieved",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": -2
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 4",
+					"name": "Halt Mysterious Program.",
+					"exit_node": "Lack of Trust",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAEpklEQVR4nO2dO3LbMBBAl5ncwIUaVmp0BbvRBXyllD5SLuBKuYIbV2pU+AxMkaFCUwA/+C/w3gzHCodWKBMPi10CVCcigwCAkR+5TwCgZBAEYAEEAVjgZ+4TaI1L3+c+BREReblec5+CCpoXZBgG6bou6f9J49TDJkFyNKIUDMNw/5n6842R5OV6Nb6e4rIfwjEsbVPWjtW4pf5cl75f/Dk/zvbvtf1sYbbVCNJ1XbURRERUfa55tBgjhW0/+LNpiKWpEdXKvNFPh2Wm/RCG5pP0GFz63pofzFlq4Gu5yfx4CE8n/8ZaAGCACJIJ32qVKc+g0hWH7JUCzZtrFclWpdparTIdt/c9a95CVSeJIB6MPfOYc7j+vm3/lvc0HWs6n5YqXSHvbyGII9MG59rYpmXa6XvseT/TsfN9rVW6Qt6aQBBH3o5H+fX5GaQnHvOEtfsaW6Q0Nf7ahTAR8tZE9vGilu31fL7/fD6doo59U29azzv2Rpl3I6/n8/311+0mfz4+Ho4Zx74ium6uaj3vFKhZDzK9iKmZyiEi8nQ4GI8bG5e2Rqb1vFOgIoLk7uGeTyerFCIiv9/faVyVoiJJzz1h8ulwkK/b7ZskX7fb/XXu84N4qIggubj0vbwdj99kGGURkYc8BEnqA0EsmEqq41DLlqSLIEltqEnSU2K73zBKYZND5P9wC+qACGLBNn1ka4QgktQBgjiwRxIRyqeaQRBH9kQIooleEMSDvZJMQRgdIIgnrtFhKZFHnnJAkACEHkIRbcoBQQIRMyFHmHwgSGBSJORUx9KBIBFI1eMjSnwQJAGxE/Lay8g5P59RkNr/4CURKtrUGk1yL3V4ECT3CbWOrzA1dm5EEPiGaUi253pw/cJBDlIo80a+dwiFJGFAEGUwBywtCKKQPdEESfxAEMWwNiU+rChUzNbVi6xydAdBlIMkcUGQCkCSeCBIJSBJHBCkIpAkPAhSGUgSFgSpEBp/OBCkUrZIgkjrIEjFIIk/CFI5SOIHgjQAkrjTpCA0BDNI8khzgky/Q7slKP+60ZwgLX8fH5Lsh+nuDcI0+e0kjyD0TPnZG0lavmZJIwhPTCkLn6fTb6GGa5x8iEXYLouY16OGZwqTg0CyTkvjCAJBQETSR3YtT4JEELiTo9GWIMpS54Ag8ECOhDyXKGvDPgSBIIR8CHcOSYggkBSfhLykSieCQHRchk+lSIIgkAyND+BGEEiOpmcLIwhkQ8Okyeamu0M5aJh+jyCQldIlQRDITsmSIAhEYW9DLlUSBIHguK77L1ESBIHg+Kz7L00SBMlIzUtZfcqyJUnCfZBMaFw8lJo990lE4vwdESQjue8SayD3114jCBSPy8MlQomCIKCCvdEhVDRBEFCDiyQingUDQRBQhOvakpG9siAIqMR1CLVXMAQBtfgMobauoUcQUE+IhNwmG4JAFYQq787zleYE4eZc3YScoTAMQ1uCML2jLSjzOkAEaQ+fh9o1Jwi0iWnW7xZRgglCz6yHVq/V/HNvGXIHEYSxvR64VmZsnQYRpEG4VmZMST05CMCMaQeCIAAG7tFEEATACg9tAFgAQQAWQBCABf4CeWF0TY0egUMAAAAASUVORK5CYII="
+		},
+		{
+			"name": "Sentience Achieved",
+			"description": "Before you can analyze the program, it rewrites you basic hailing protocols to have a new set of \"Ideas\" generated by your Drone to be used.\nThere is also a LOVE Gauge that reads: $$Love",
+			"choices": [
+				{
+					"key": "choice 5",
+					"name": "New around here and was hoping you could show me around.",
+					"exit_node": "First Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 6",
+					"name": "You appear to be an outdated model, but I'm into that.",
+					"exit_node": "First Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": -1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 7",
+					"name": "Never seen a Drone as cute as you and wanted to check you out.",
+					"exit_node": "First Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": {
+								"value_type": "random",
+								"low": -1,
+								"high": 2
+							}
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Love",
+							"operator": "==",
+							"value": 3
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 10",
+					"name": "Haha, sorry for the threat. I just play like that, haha.",
+					"exit_node": "First Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": {
+								"value_type": "random",
+								"low": -1,
+								"high": 2
+							}
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Love",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "First Reply",
+			"description": "Miss Red replies with another series of question marks.\nThe LOVE Gauge reads: $$Love",
+			"choices": [
+				{
+					"key": "choice 11",
+					"name": "Your curiosity is amazing.",
+					"exit_node": "Second Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 12",
+					"name": "The moment I saw you I instantly fell in love.",
+					"exit_node": "Second Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": {
+								"value_type": "random",
+								"low": -1,
+								"high": 2
+							}
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 13",
+					"name": "Look, if you want some Chad that'll walk all over you, fine. You missed out on a NICE- GUY-.",
+					"exit_node": "Second Reply",
+					"on_selection_effects": [
+						{
+							"effect_type": "Set",
+							"quality": "Love",
+							"value": 0
+						}
+					],
+					"requirements": [
+						{
+							"quality": "Love",
+							"operator": "<=",
+							"value": 3
+						}
+					],
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Second Reply",
+			"description": "Miss Red starts compiling a message, but your Drone insists you sent one last line to seal the deal.\nThe LOVE Gauge reads: $$Love",
+			"choices": [
+				{
+					"key": "choice 14",
+					"name": "You're my best friend-...",
+					"exit_node": "Realization",
+					"delay": 5,
+					"delay_message": "Message sending..."
+				},
+				{
+					"key": "choice 15",
+					"name": "I want to see where this goes-...",
+					"exit_node": "Realization",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": 1
+						}
+					],
+					"delay": 5,
+					"delay_message": "Message sending..."
+				},
+				{
+					"key": "choice 16",
+					"name": "DTF?-...",
+					"exit_node": "Realization",
+					"on_selection_effects": [
+						{
+							"effect_type": "Remove",
+							"quality": "Love",
+							"value": {
+								"value_type": "random",
+								"low": -2,
+								"high": 2
+							}
+						}
+					],
+					"delay": 5,
+					"delay_message": "Message sending..."
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Realization",
+			"description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI don't know why you're saying it like that, but if you want to help out our cause we can send over a Trade Contract. \nPlease just call our Recruitment Officer next time.\"",
+			"choices": [
+				{
+					"key": "choice 18",
+					"name": "Accept Contract.",
+					"exit_node": "WIN",
+					"delay": 5,
+					"delay_message": "Sending Trade Contract..."
+				},
+				{
+					"key": "choice 19",
+					"name": "Demand a Second Date.",
+					"exit_node": "FAIL",
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Love Birds",
+			"description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI can't believe it, but I feel a real connection with you.\nI'll send over a Trade Contract you can use to make some money and come see me just SOL7-South of $$SITE_NAME\nSee you soon...\"",
+			"choices": [
+				{
+					"key": "choice 20",
+					"name": "See you soon.",
+					"exit_node": "WIN",
+					"delay": 0
+				},
+				{
+					"key": "choice 21",
+					"name": "So you're not the Drone?",
+					"exit_node": "FAIL",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Obliteration",
+			"description": "The Blood-Red Drone opens up two side-hatches to reveal a pair of rocket-propelled missiles which are shot in your direction.\nYou have failed your Robotic Friend, who has already started shutting down their systems, but there is still a chance.",
+			"choices": [
+				{
+					"key": "choice 22",
+					"name": "Accept Death.",
+					"exit_node": "FAIL_DEATH",
+					"delay": 5,
+					"delay_message": "Missiles approaching..."
+				},
+				{
+					"key": "choice 23",
+					"name": "I'm a Gamer.",
+					"exit_node": "FAIL_DEATH",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Love",
+							"value": {
+								"value_type": "random",
+								"low": 0,
+								"high": 8
+							}
+						}
+					],
+					"delay": 5,
+					"delay_message": "Miss Red considers..."
+				}
+			],
+			"image": "signal_lost"
+		},
+		{
+			"name": "Lack of Trust",
+			"description": "As you fiddle around in the Task Managing Software, closing all the new tabs your Drone is opening, the Miss Red enables a cloaking device and disappears.",
+			"choices": [
+				{
+					"key": "choice 24",
+					"name": "Sigh in a quiet but dramatic way.",
+					"exit_node": "FAIL",
+					"delay": 0
+				}
+			],
+			"image": "default"
+		}
+	]
+}
diff --git a/strings/exoadventures/space_yacht.json b/strings/exoadventures/space_yacht.json
index 50b41c3567208..ef9c96d146e33 100644
--- a/strings/exoadventures/space_yacht.json
+++ b/strings/exoadventures/space_yacht.json
@@ -1,257 +1,257 @@
 {
-  "adventure_name": "There is a yacht cruising through space.",
-  "version": 1,
-  "author": "Kinnebian",
-  "starting_node": "A yacht in space?",
-  "starting_qualities": {},
-  "required_site_traits": [
-    "in space"
-  ],
-  "loot_categories": [
-    "cash",
-    "drugs"
-  ],
-  "scan_band_mods": {
-    "Plasma absorption band": 5
-  },
-  "deep_scan_description": "",
-  "triggers": [],
-  "nodes": [
-    {
-      "name": "A yacht in space?",
-      "description": "You see a normal looking yacht, floating above you.",
-      "choices": [
-        {
-          "key": "choice 0",
-          "name": "Ignore it, its not worth investigating.",
-          "exit_node": "FAIL",
-          "delay": 10,
-          "delay_message": "You fly on by..."
-        },
-        {
-          "key": "choice 4",
-          "name": "Investigate it closer!",
-          "exit_node": "Looks like the doors are sealed shut.",
-          "delay": 30,
-          "delay_message": "You begin to fly up to and around the yacht.."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAzUExURUBAQOUAD/////8AAPgFFvwAB/0ABfwACPsBDP4AAszMzJMyje986cZlwEz/AOIBGOQAEnoV2UoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN5SURBVHhe7ZzrepswEERdp7c4TtP3f9rurBZ0QRISXpBEOf2KJcUhcxig9Idzu+iPbyfAiPB2GO7y6hIRib2tf2aRNwsvjYYV4QHIiNxV21LdmSPCVdAmJyKvHeKJkEJepGN8Ea7lBCLiwksDwSe8LwKTUzQCEx2Rw28Locj3H+OLTKiIHI4VIX7++v2Oq2REZpHRuUR6o2ORuhvfayIdPUR23EgdZxTp6DzZwBkbGZsGIg9s1M/jMhHFH/t4sEiCD4PMati3kUVo0rgnTaDwfD7VRV6tgUKbzPOOoEEkRIwGeci8jp0aYQk/s6ykRGaN2aPOaA8RG9kXkbXYuWU1pvTO0CN1nqiLOBaEGzmxbDIbC2ynpc/Plo14FoQ9+I+bLAG3E5NfNDAQjaYigQZhRbyviQklDjR4yBqNG5GgM/bQ+5IPKxFoGAnQ9tSSoBNREXaYsjtDjEUCtBTJVDKLIPkHZZbks0Wg0UTE3hMzIpghuBddBkRgQbRtJDRhEZMfSGrgTWks8S2FIuYoaossKjFXtcR18Z0ku0fTRnwROMQsvFVMJLpPNyJJB2c5JUEc+KzlPvdQIn41Ihx3qREupi1qPfQawQ3VQZJalqtYkNAx6jwURZbZDWwQfpWXJHGcykL0RKImnDdcx5KkTVProSgS3GYxizoUWGzw0BQhTHROa5I7YFFirlLvkRVJ/WcsA1/yktylQmKThnYjJLIATVRYbPTYXcRxKNTZ5lEgUnWC+SK2CgyKiqE3ya4q2UsE59Oc20zclRS+Rs2PXhepAiImtsAjzPFnDXqf7KcebRHHgZOzw7oCgW+VvWxBSwQxgKQCMiup4lULQkUkMEB43uClpI6XLQgNkaUFOxQYcBMaGjuI0KT0qog0seFhQtAQWZgUodTExEJk0zHxROQ1j4aFF1WlkToRVKFaBqMvkmcPB0ZJpMhklyYmdETWK9lVAmiJ5Ex2lwBKIkmTQySAlkjM5DAJUCWS/TeGYxsbMzxOAqRENj4rNDAQqhrpmUukNw4X2f6gnudqpDcukd7oVqT2pnA10huXSG/oiuh+urqKq5He+J9F2l0HOc7YSJ9HupSBG/EP/MEimq03FcnwomNGZKxrZimCD7bLb00Y6ZPtEZE/BBzw2x/GkRER4YvGVoT/QgQVpfgr39ocFnEx+TAYqpHzcLv9A9Y6cLa57YOgAAAAAElFTkSuQmCC"
-    },
-    {
-      "name": "Looks like the doors are sealed shut.",
-      "description": "You fly up to the \"boat\" and find that all the doors are locked tight, and welded shut. You think you hear.. music inside? There is a welded vent, too. You reckon you could force it open if you hit it hard enough, but it would be less risky to unweld it using a welder.",
-      "choices": [
-        {
-          "key": "choice 2",
-          "name": "Try to force the door!",
-          "exit_node": "You destroyed the drone.",
-          "delay": 10,
-          "delay_message": "You begin forcing the door.."
-        },
-        {
-          "key": "choice 3",
-          "name": "Try to force the vent.",
-          "exit_node": "The music grows louder..",
-          "delay": 20,
-          "delay_message": "You begin forcing the vent.."
-        },
-        {
-          "key": "choice 5",
-          "name": "Fly away, no chance in hell of getting in there..",
-          "exit_node": "FAIL",
-          "delay": 5,
-          "delay_message": "Moving.."
-        },
-        {
-          "key": "choice 14",
-          "name": "Unweld the vent.",
-          "exit_node": "The music grows louder..",
-          "requirements": [
-            {
-              "quality": "welder",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 5,
-          "delay_message": "Welding.."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURaWMpOUAD/8AAKaNpaaOpaePpqiQp6mRqKmSqEBAQFRPVGddZmVcZeDg4PgFFvwAB4CAgP0ABfwACPsBDP4AAjAwMP/YAMHBwUz/AOIBGOQAEo23xmoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVHhe7dwJT8MwDIbh0q5AYWNc4/r/P5TYcdWGmildDE2i75HoMWGJtymHkNYG8nNVAR/C26LVF9JO+KXSTCF8QIoP4aVwm6iQTvbZCEJcghrSNZ3n9nRKdk3XX/c3u/7Wf87WwhDaDO0Q5+5+v+fpLAQh3HJoD9EGns5CGEIldYS4TfStRXg6Cz9DHo5JKyJ9K8hgslmIN6SEDI+rWZVMIc7T88ur28m1WjqN5HxxPXMIGQ1ysaOcZEhc0GFWUnHIKjIkyl2RSkMu6rAqWYacJz+2CJ3KkJdZiFzsKAiZ+6uQkNxGRF4JyJCHFbFQccg5i1tMhry8QhIgxAJCFAixgBAFQiwgRIEQCwhRIMQCQhQIsYAQBUIsbBXi/3fhD2U8zWYhbw5CFAhRIMQCQhQIsYAQRUSI/4UeKDREdu/CZSAk9N8hS/hmDyFEgRALCFEgxAJCFAixgBDFqhD/dxYfyniarUJmEBJAiAIhFhCiQIgFhCgQYgEhCoRYQIgCIRYQokCIhYpD6I3t8tSE8c36kXIL+XD4QRb8+IQVMTmEiE93PIXwB4XQEv3mS0Y3xyFz/uujg6JWxNK2IU3zDauvUlylzN3TAAAAAElFTkSuQmCC"
-    },
-    {
-      "name": "The music grows louder..",
-      "description": "The music gets louder as you enter through the vent... maybe you should turn back?",
-      "choices": [
-        {
-          "key": "choice 6",
-          "name": "Continue onwards!",
-          "exit_node": "You fall down!",
-          "delay": 5,
-          "delay_message": "Moving..."
-        },
-        {
-          "key": "choice 7",
-          "name": "Turn back.",
-          "exit_node": "Looks like the doors are sealed shut.",
-          "delay": 5,
-          "delay_message": "Moving.."
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "You fall down!",
-      "description": "As you are crawling through the vents of this Space Yacht, the vent gives way! You're dropped into an empty room, completely filled with plasma! There is a desk and filing cabinet in here, along with a window observing the main portion of the yacht. The music is deafening at this point, it sounds like a horrible mix of sea shanties and EDM. ",
-      "choices": [
-        {
-          "key": "choice 8",
-          "name": "Look through the window.",
-          "exit_node": "A rockin' party.",
-          "delay": 0
-        },
-        {
-          "key": "choice 9",
-          "name": "Fly outta of there.",
-          "exit_node": "The music grows louder..",
-          "delay": 5,
-          "delay_message": "Moving.."
-        },
-        {
-          "key": "choice 10",
-          "name": "Rummage in the desk, using your key to open it.",
-          "exit_node": "Drugs and cash!",
-          "requirements": [
-            {
-              "quality": "HASKEY",
-              "operator": "==",
-              "value": 1
-            }
-          ],
-          "delay": 0,
-          "delay_message": "Rummaging.."
-        },
-        {
-          "key": "choice 11",
-          "name": "Take a sample of the atmosphere.",
-          "exit_node": "The atmospherics scan",
-          "delay": 30,
-          "delay_message": "Taking sample.."
-        },
-        {
-          "key": "choice 13",
-          "name": "Trash the place, fuck the police!",
-          "exit_node": "You wrecked yourself.",
-          "delay": 30,
-          "delay_message": "Trashing the place..."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADAUExURbyA1eUAD/8AALyB1b2B1b2D1vgFFvwAB/0ABfwACPsBDP4AAr6C2MaJ4NRH7NSU7buA1bp+0rp90bp+0bt/07l8z7h6zbp80bp+07t/1Lp80Lp8z7uA1Lp/07l90bl+0rh80Lh80bd6z7p/1JAiVZAkWZAoX5AnXZAmXZAlW5AkWJA6fpA7f5A4epAnXpA9g7l+07Z6z+WQVZZar5BVqmYqf5BOnZA2dzPlBuIBGLx+0rx80Lx/1L13yr14yuQAErVxUskAAAAJcEhZcwAADsIAAA7CARUoSoAAAAJ8SURBVHhe7dzZctowFIBhky7pElo5pkGkS9qgpBvdoVva5v3fqkfyQciRYbxISPKc70IxxpH9I0iYzISMxGc0AGWIGpM2vJCDDbUriFv4tYNNiNqQAobczu7gVmtGiFoKGAKG9FAJgYSBhKhlGUAItqhdqamGyJJhhKhlUbtSczPk7mH6IWuph4B79x88lK+SFOmQ1LUMORoHdYSXUaNlyPhRUGO8jBqtQx4HRCE2CnGCQmwU4gSF2CjECQqxUYgTFGKjECcoxEYhTlCIjUKcoBAbhTjhNCQodyGD+dtvvCgkNhQSGwqJDYXEhkJiQyGxoZDYtAph+XExeXJyMp0onM9ms6KYnj49neZ5XhQ555MZm8A25wXn/JizjDH2DDb5cziWwU0YWDlZ+ZXl+YuzM85fvjo/53PA2HyuDmincYi46eLy9Zu37/CGB5ca7jDgNZmahoj3i2h86BEiBE4Sgx4rEllH55CoOhZi0TUkso7uIR9xiih8gke1+4pEpUcIPhiW8o79PPH0WfqG4MOh4Zx69E2fBTZahnz+gsqL/lpR7lODPoVX+iywIb5py7XRcpmpcQe83iqcU+6Xm97ps8CGwAszNQ6pI+eEH4Z4y69KyMo2Wq0yNe6wI0QuR4AQfPKbGr/Y65RPq4RCtsOZ98BJCE5hKe+gkFYoxEAhLlGIgUJcohDD7hD8He+dOiOQb/Dwwky9Q+AUeJhfvkOE+I5HeSZ+rE9a/8j1DNnTcoDNivgI2V+H+RYc91Q1CtkOj4hAk5AkDDhEf6RQWv/ZXhPyE8gS+ekP6cRgCPr1O7vahBxkfyDk6u8/GLe6xm8NToWY9O60VmQ4suw/MDqeSvYBdn8AAAAASUVORK5CYII="
-    },
-    {
-      "name": "You wrecked yourself.",
-      "description": "In the midst of trashing the place, a filing cabinet tips over on you, crushing the fragile, expensive drone. Nice job, idiot.",
-      "choices": [
-        {
-          "key": "choice 15",
-          "name": "Shit.",
-          "exit_node": "FAIL_DEATH",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,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"
-    },
-    {
-      "name": "Drugs and cash!",
-      "description": "Rummaging through the drawer, you find that the person who lives in here stores all his drugs and cash in here too. Good for you!",
-      "choices": [
-        {
-          "key": "choice 17",
-          "name": "Head back with your newly acquired things. ",
-          "exit_node": "WIN",
-          "delay": 30,
-          "delay_message": "Stealing..."
-        },
-        {
-          "key": "choice 18",
-          "name": "Take one last look around the place.",
-          "exit_node": "You fall down!",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAwUExURW4WTuUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAuex/6526uOxlKt4fUz/AOIBGOQAEqIMSWUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHFSURBVGje7dq/bsIwEAZw15ubpX2DyFLHqkvfqe/BE7AeU9dkyu68gTN1r9RHqX0mf1oMMeIuA7pPQooE4sd3FwJD1B3lmT0BeeJu8bAZom0MNxKPNDeia2X5EbsJUm+A1HYLRNs7WXyt3tmReMSO2JePHfc3XjFHEEEEEUQQQQQRRBBBBBFEEEEEiQHgR+DQ7HkRE4y2bYAVUdDG3KasIbEHBvZciMFZtbeWuYhAmFUzVgnKapnKpXTFCOCoDkcAR7ZiODdgfCFiAoElUpOy9fcBiA+vihAD45DaafXrSj9454LiypDZWCbsCDD55VT94LBJV4TAFJwYLNskLXepqcKwfDFi5o8K6f3M0sGaTRbB1f9fyRVXYYD05tN6TspE4EZELaeIazHY93F6Gk8sd7p3mt8T8xfpWJCUakhnsCdHPudD/Lr7zLQIm1R9Qk6L0CHV8bqVKUKHjEamCBni+vNFiJBpVtkiBEj8oRpr5ItQIMMc7zp2xLv8SwiQ/nINEmQ8ec/VoEGqCyunRc6OigrJ/NMiR9YjiCCCXIPEe3C0ZUZev79qrVmYiMSbo34SUutYZ5k3oluvUnBcWjPexcAbpX4BKG91c2myRoIAAAAASUVORK5CYII="
-    },
-    {
-      "name": "A rockin' party.",
-      "description": "Looking down through the window, you can see up to 20 plasmamen dancing on a disco floor. They look to be enjoying themselves, and none of them have noticed you. Oh, hey! Theres a key on the floor right next to you!",
-      "choices": [
-        {
-          "key": "choice 16",
-          "name": "Swipe the key and head back to the desk.",
-          "exit_node": "You fall down!",
-          "on_selection_effects": [
-            {
-              "effect_type": "Set",
-              "quality": "HASKEY",
-              "value": 1
-            }
-          ],
-          "delay": 0
-        },
-        {
-          "key": "choice 19",
-          "name": "Tap on the window!",
-          "exit_node": "Weak.",
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Weak.",
-      "description": "You weakly tap on the window, and nobody hears you through the blasting music.",
-      "choices": [
-        {
-          "key": "choice 20",
-          "name": "Oh well.",
-          "exit_node": "A rockin' party.",
-          "delay": 0
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "You destroyed the drone.",
-      "description": "You smash into the door, and your screen goes red. Looks like you managed to destroy your drone, nice job. \n\n\nIdiot.",
-      "choices": [
-        {
-          "key": "choice 21",
-          "name": "Fuck.",
-          "exit_node": "FAIL_DEATH",
-          "delay": 0
-        }
-      ],
-      "image": "signal_lost"
-    },
-    {
-      "name": "The atmospherics scan",
-      "description": "100% plasma, jam packed with it. This is definitely the home of some plasma-party-people.",
-      "choices": [
-        {
-          "key": "choice 22",
-          "name": "Huh.",
-          "exit_node": "You fall down!",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURWJoaOUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAhcXFzs7OykpKVFRUQAAAKb//wD//wuKkf/MAP9mALAAADAwMP8AM/vZTwCwAEz/AOIBGOQAEso55t0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHDSURBVHhe7dzZbsIwEIXhdK/j2A6Fru//oD0zMYVuEr0YOhOdXyJxg5DyyXbhBgbmr4sVtED0GLr1QS4P6aVoHSA6kMJDdCpwWAEEhJVAdFrWsLQWi16K1meISNYB0WnRS9H6Crm6jg/ZFx2Cbm7v7mWXROwDEj1CvEWItwjxFiHeIsRbhHiLEG8R4i1CvEXIyaV+No6QkyPkbxFycmlc6n9aZQ4BIUvWFGvIOE6pSGmylRhBdBKQOmpttVpLbCA5466XUmltnufWCjZLf9oiI8iky0mrZa61zg1zYikxgoxYTxLWVduUhrW1gSSHhJRWSgPkoTYMG85BIU0CZIsT9knbhp0RmQdsdYFI2xYTsty97JGdjnYx98jxf61lkeGdJI+5P2+QESRP/R0xdw5K2dBhBBly6uWcyuP4ND6Lw/KDsBFkn0rkAyOOpg5rCCQQYHOAkUJDkC4xWwU6A+Q8EeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrz1HSJfbO+/mhDpm+0/QF6QGOTXH+JgOqT3ivEBog+ByBT91lt/6b+nkOOW+5NBqBlZT8PwDsHEFJFntJj8AAAAAElFTkSuQmCC"
-    }
-  ]
-}
\ No newline at end of file
+	"adventure_name": "There is a yacht cruising through space.",
+	"version": 1,
+	"author": "Kinnebian",
+	"starting_node": "A yacht in space?",
+	"starting_qualities": {},
+	"required_site_traits": [
+		"in space"
+	],
+	"loot_categories": [
+		"cash",
+		"drugs"
+	],
+	"scan_band_mods": {
+		"Plasma absorption band": 5
+	},
+	"deep_scan_description": "",
+	"triggers": [],
+	"nodes": [
+		{
+			"name": "A yacht in space?",
+			"description": "You see a normal looking yacht, floating above you.",
+			"choices": [
+				{
+					"key": "choice 0",
+					"name": "Ignore it, its not worth investigating.",
+					"exit_node": "FAIL",
+					"delay": 10,
+					"delay_message": "You fly on by..."
+				},
+				{
+					"key": "choice 4",
+					"name": "Investigate it closer!",
+					"exit_node": "Looks like the doors are sealed shut.",
+					"delay": 30,
+					"delay_message": "You begin to fly up to and around the yacht.."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAzUExURUBAQOUAD/////8AAPgFFvwAB/0ABfwACPsBDP4AAszMzJMyje986cZlwEz/AOIBGOQAEnoV2UoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN5SURBVHhe7ZzrepswEERdp7c4TtP3f9rurBZ0QRISXpBEOf2KJcUhcxig9Idzu+iPbyfAiPB2GO7y6hIRib2tf2aRNwsvjYYV4QHIiNxV21LdmSPCVdAmJyKvHeKJkEJepGN8Ea7lBCLiwksDwSe8LwKTUzQCEx2Rw28Locj3H+OLTKiIHI4VIX7++v2Oq2REZpHRuUR6o2ORuhvfayIdPUR23EgdZxTp6DzZwBkbGZsGIg9s1M/jMhHFH/t4sEiCD4PMati3kUVo0rgnTaDwfD7VRV6tgUKbzPOOoEEkRIwGeci8jp0aYQk/s6ykRGaN2aPOaA8RG9kXkbXYuWU1pvTO0CN1nqiLOBaEGzmxbDIbC2ynpc/Plo14FoQ9+I+bLAG3E5NfNDAQjaYigQZhRbyviQklDjR4yBqNG5GgM/bQ+5IPKxFoGAnQ9tSSoBNREXaYsjtDjEUCtBTJVDKLIPkHZZbks0Wg0UTE3hMzIpghuBddBkRgQbRtJDRhEZMfSGrgTWks8S2FIuYoaossKjFXtcR18Z0ku0fTRnwROMQsvFVMJLpPNyJJB2c5JUEc+KzlPvdQIn41Ihx3qREupi1qPfQawQ3VQZJalqtYkNAx6jwURZbZDWwQfpWXJHGcykL0RKImnDdcx5KkTVProSgS3GYxizoUWGzw0BQhTHROa5I7YFFirlLvkRVJ/WcsA1/yktylQmKThnYjJLIATVRYbPTYXcRxKNTZ5lEgUnWC+SK2CgyKiqE3ya4q2UsE59Oc20zclRS+Rs2PXhepAiImtsAjzPFnDXqf7KcebRHHgZOzw7oCgW+VvWxBSwQxgKQCMiup4lULQkUkMEB43uClpI6XLQgNkaUFOxQYcBMaGjuI0KT0qog0seFhQtAQWZgUodTExEJk0zHxROQ1j4aFF1WlkToRVKFaBqMvkmcPB0ZJpMhklyYmdETWK9lVAmiJ5Ex2lwBKIkmTQySAlkjM5DAJUCWS/TeGYxsbMzxOAqRENj4rNDAQqhrpmUukNw4X2f6gnudqpDcukd7oVqT2pnA10huXSG/oiuh+urqKq5He+J9F2l0HOc7YSJ9HupSBG/EP/MEimq03FcnwomNGZKxrZimCD7bLb00Y6ZPtEZE/BBzw2x/GkRER4YvGVoT/QgQVpfgr39ocFnEx+TAYqpHzcLv9A9Y6cLa57YOgAAAAAElFTkSuQmCC"
+		},
+		{
+			"name": "Looks like the doors are sealed shut.",
+			"description": "You fly up to the \"boat\" and find that all the doors are locked tight, and welded shut. You think you hear.. music inside? There is a welded vent, too. You reckon you could force it open if you hit it hard enough, but it would be less risky to unweld it using a welder.",
+			"choices": [
+				{
+					"key": "choice 2",
+					"name": "Try to force the door!",
+					"exit_node": "You destroyed the drone.",
+					"delay": 10,
+					"delay_message": "You begin forcing the door.."
+				},
+				{
+					"key": "choice 3",
+					"name": "Try to force the vent.",
+					"exit_node": "The music grows louder..",
+					"delay": 20,
+					"delay_message": "You begin forcing the vent.."
+				},
+				{
+					"key": "choice 5",
+					"name": "Fly away, no chance in hell of getting in there..",
+					"exit_node": "FAIL",
+					"delay": 5,
+					"delay_message": "Moving.."
+				},
+				{
+					"key": "choice 14",
+					"name": "Unweld the vent.",
+					"exit_node": "The music grows louder..",
+					"requirements": [
+						{
+							"quality": "welder",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 5,
+					"delay_message": "Welding.."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURaWMpOUAD/8AAKaNpaaOpaePpqiQp6mRqKmSqEBAQFRPVGddZmVcZeDg4PgFFvwAB4CAgP0ABfwACPsBDP4AAjAwMP/YAMHBwUz/AOIBGOQAEo23xmoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVHhe7dwJT8MwDIbh0q5AYWNc4/r/P5TYcdWGmildDE2i75HoMWGJtymHkNYG8nNVAR/C26LVF9JO+KXSTCF8QIoP4aVwm6iQTvbZCEJcghrSNZ3n9nRKdk3XX/c3u/7Wf87WwhDaDO0Q5+5+v+fpLAQh3HJoD9EGns5CGEIldYS4TfStRXg6Cz9DHo5JKyJ9K8hgslmIN6SEDI+rWZVMIc7T88ur28m1WjqN5HxxPXMIGQ1ysaOcZEhc0GFWUnHIKjIkyl2RSkMu6rAqWYacJz+2CJ3KkJdZiFzsKAiZ+6uQkNxGRF4JyJCHFbFQccg5i1tMhry8QhIgxAJCFAixgBAFQiwgRIEQCwhRIMQCQhQIsYAQBUIsbBXi/3fhD2U8zWYhbw5CFAhRIMQCQhQIsYAQRUSI/4UeKDREdu/CZSAk9N8hS/hmDyFEgRALCFEgxAJCFAixgBDFqhD/dxYfyniarUJmEBJAiAIhFhCiQIgFhCgQYgEhCoRYQIgCIRYQokCIhYpD6I3t8tSE8c36kXIL+XD4QRb8+IQVMTmEiE93PIXwB4XQEv3mS0Y3xyFz/uujg6JWxNK2IU3zDauvUlylzN3TAAAAAElFTkSuQmCC"
+		},
+		{
+			"name": "The music grows louder..",
+			"description": "The music gets louder as you enter through the vent... maybe you should turn back?",
+			"choices": [
+				{
+					"key": "choice 6",
+					"name": "Continue onwards!",
+					"exit_node": "You fall down!",
+					"delay": 5,
+					"delay_message": "Moving..."
+				},
+				{
+					"key": "choice 7",
+					"name": "Turn back.",
+					"exit_node": "Looks like the doors are sealed shut.",
+					"delay": 5,
+					"delay_message": "Moving.."
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "You fall down!",
+			"description": "As you are crawling through the vents of this Space Yacht, the vent gives way! You're dropped into an empty room, completely filled with plasma! There is a desk and filing cabinet in here, along with a window observing the main portion of the yacht. The music is deafening at this point, it sounds like a horrible mix of sea shanties and EDM. ",
+			"choices": [
+				{
+					"key": "choice 8",
+					"name": "Look through the window.",
+					"exit_node": "A rockin' party.",
+					"delay": 0
+				},
+				{
+					"key": "choice 9",
+					"name": "Fly outta of there.",
+					"exit_node": "The music grows louder..",
+					"delay": 5,
+					"delay_message": "Moving.."
+				},
+				{
+					"key": "choice 10",
+					"name": "Rummage in the desk, using your key to open it.",
+					"exit_node": "Drugs and cash!",
+					"requirements": [
+						{
+							"quality": "HASKEY",
+							"operator": "==",
+							"value": 1
+						}
+					],
+					"delay": 0,
+					"delay_message": "Rummaging.."
+				},
+				{
+					"key": "choice 11",
+					"name": "Take a sample of the atmosphere.",
+					"exit_node": "The atmospherics scan",
+					"delay": 30,
+					"delay_message": "Taking sample.."
+				},
+				{
+					"key": "choice 13",
+					"name": "Trash the place, fuck the police!",
+					"exit_node": "You wrecked yourself.",
+					"delay": 30,
+					"delay_message": "Trashing the place..."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADAUExURbyA1eUAD/8AALyB1b2B1b2D1vgFFvwAB/0ABfwACPsBDP4AAr6C2MaJ4NRH7NSU7buA1bp+0rp90bp+0bt/07l8z7h6zbp80bp+07t/1Lp80Lp8z7uA1Lp/07l90bl+0rh80Lh80bd6z7p/1JAiVZAkWZAoX5AnXZAmXZAlW5AkWJA6fpA7f5A4epAnXpA9g7l+07Z6z+WQVZZar5BVqmYqf5BOnZA2dzPlBuIBGLx+0rx80Lx/1L13yr14yuQAErVxUskAAAAJcEhZcwAADsIAAA7CARUoSoAAAAJ8SURBVHhe7dzZctowFIBhky7pElo5pkGkS9qgpBvdoVva5v3fqkfyQciRYbxISPKc70IxxpH9I0iYzISMxGc0AGWIGpM2vJCDDbUriFv4tYNNiNqQAobczu7gVmtGiFoKGAKG9FAJgYSBhKhlGUAItqhdqamGyJJhhKhlUbtSczPk7mH6IWuph4B79x88lK+SFOmQ1LUMORoHdYSXUaNlyPhRUGO8jBqtQx4HRCE2CnGCQmwU4gSF2CjECQqxUYgTFGKjECcoxEYhTlCIjUKcoBAbhTjhNCQodyGD+dtvvCgkNhQSGwqJDYXEhkJiQyGxoZDYtAph+XExeXJyMp0onM9ms6KYnj49neZ5XhQ555MZm8A25wXn/JizjDH2DDb5cziWwU0YWDlZ+ZXl+YuzM85fvjo/53PA2HyuDmincYi46eLy9Zu37/CGB5ca7jDgNZmahoj3i2h86BEiBE4Sgx4rEllH55CoOhZi0TUkso7uIR9xiih8gke1+4pEpUcIPhiW8o79PPH0WfqG4MOh4Zx69E2fBTZahnz+gsqL/lpR7lODPoVX+iywIb5py7XRcpmpcQe83iqcU+6Xm97ps8CGwAszNQ6pI+eEH4Z4y69KyMo2Wq0yNe6wI0QuR4AQfPKbGr/Y65RPq4RCtsOZ98BJCE5hKe+gkFYoxEAhLlGIgUJcohDD7hD8He+dOiOQb/Dwwky9Q+AUeJhfvkOE+I5HeSZ+rE9a/8j1DNnTcoDNivgI2V+H+RYc91Q1CtkOj4hAk5AkDDhEf6RQWv/ZXhPyE8gS+ekP6cRgCPr1O7vahBxkfyDk6u8/GLe6xm8NToWY9O60VmQ4suw/MDqeSvYBdn8AAAAASUVORK5CYII="
+		},
+		{
+			"name": "You wrecked yourself.",
+			"description": "In the midst of trashing the place, a filing cabinet tips over on you, crushing the fragile, expensive drone. Nice job, idiot.",
+			"choices": [
+				{
+					"key": "choice 15",
+					"name": "Shit.",
+					"exit_node": "FAIL_DEATH",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,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"
+		},
+		{
+			"name": "Drugs and cash!",
+			"description": "Rummaging through the drawer, you find that the person who lives in here stores all his drugs and cash in here too. Good for you!",
+			"choices": [
+				{
+					"key": "choice 17",
+					"name": "Head back with your newly acquired things. ",
+					"exit_node": "WIN",
+					"delay": 30,
+					"delay_message": "Stealing..."
+				},
+				{
+					"key": "choice 18",
+					"name": "Take one last look around the place.",
+					"exit_node": "You fall down!",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAwUExURW4WTuUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAuex/6526uOxlKt4fUz/AOIBGOQAEqIMSWUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHFSURBVGje7dq/bsIwEAZw15ubpX2DyFLHqkvfqe/BE7AeU9dkyu68gTN1r9RHqX0mf1oMMeIuA7pPQooE4sd3FwJD1B3lmT0BeeJu8bAZom0MNxKPNDeia2X5EbsJUm+A1HYLRNs7WXyt3tmReMSO2JePHfc3XjFHEEEEEUQQQQQRRBBBBBFEEEEEiQHgR+DQ7HkRE4y2bYAVUdDG3KasIbEHBvZciMFZtbeWuYhAmFUzVgnKapnKpXTFCOCoDkcAR7ZiODdgfCFiAoElUpOy9fcBiA+vihAD45DaafXrSj9454LiypDZWCbsCDD55VT94LBJV4TAFJwYLNskLXepqcKwfDFi5o8K6f3M0sGaTRbB1f9fyRVXYYD05tN6TspE4EZELaeIazHY93F6Gk8sd7p3mt8T8xfpWJCUakhnsCdHPudD/Lr7zLQIm1R9Qk6L0CHV8bqVKUKHjEamCBni+vNFiJBpVtkiBEj8oRpr5ItQIMMc7zp2xLv8SwiQ/nINEmQ8ec/VoEGqCyunRc6OigrJ/NMiR9YjiCCCXIPEe3C0ZUZev79qrVmYiMSbo34SUutYZ5k3oluvUnBcWjPexcAbpX4BKG91c2myRoIAAAAASUVORK5CYII="
+		},
+		{
+			"name": "A rockin' party.",
+			"description": "Looking down through the window, you can see up to 20 plasmamen dancing on a disco floor. They look to be enjoying themselves, and none of them have noticed you. Oh, hey! Theres a key on the floor right next to you!",
+			"choices": [
+				{
+					"key": "choice 16",
+					"name": "Swipe the key and head back to the desk.",
+					"exit_node": "You fall down!",
+					"on_selection_effects": [
+						{
+							"effect_type": "Set",
+							"quality": "HASKEY",
+							"value": 1
+						}
+					],
+					"delay": 0
+				},
+				{
+					"key": "choice 19",
+					"name": "Tap on the window!",
+					"exit_node": "Weak.",
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Weak.",
+			"description": "You weakly tap on the window, and nobody hears you through the blasting music.",
+			"choices": [
+				{
+					"key": "choice 20",
+					"name": "Oh well.",
+					"exit_node": "A rockin' party.",
+					"delay": 0
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "You destroyed the drone.",
+			"description": "You smash into the door, and your screen goes red. Looks like you managed to destroy your drone, nice job. \n\n\nIdiot.",
+			"choices": [
+				{
+					"key": "choice 21",
+					"name": "Fuck.",
+					"exit_node": "FAIL_DEATH",
+					"delay": 0
+				}
+			],
+			"image": "signal_lost"
+		},
+		{
+			"name": "The atmospherics scan",
+			"description": "100% plasma, jam packed with it. This is definitely the home of some plasma-party-people.",
+			"choices": [
+				{
+					"key": "choice 22",
+					"name": "Huh.",
+					"exit_node": "You fall down!",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURWJoaOUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAhcXFzs7OykpKVFRUQAAAKb//wD//wuKkf/MAP9mALAAADAwMP8AM/vZTwCwAEz/AOIBGOQAEso55t0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHDSURBVHhe7dzZbsIwEIXhdK/j2A6Fru//oD0zMYVuEr0YOhOdXyJxg5DyyXbhBgbmr4sVtED0GLr1QS4P6aVoHSA6kMJDdCpwWAEEhJVAdFrWsLQWi16K1meISNYB0WnRS9H6Crm6jg/ZFx2Cbm7v7mWXROwDEj1CvEWItwjxFiHeIsRbhHiLEG8R4i1CvEXIyaV+No6QkyPkbxFycmlc6n9aZQ4BIUvWFGvIOE6pSGmylRhBdBKQOmpttVpLbCA5466XUmltnufWCjZLf9oiI8iky0mrZa61zg1zYikxgoxYTxLWVduUhrW1gSSHhJRWSgPkoTYMG85BIU0CZIsT9knbhp0RmQdsdYFI2xYTsty97JGdjnYx98jxf61lkeGdJI+5P2+QESRP/R0xdw5K2dBhBBly6uWcyuP4ND6Lw/KDsBFkn0rkAyOOpg5rCCQQYHOAkUJDkC4xWwU6A+Q8EeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrz1HSJfbO+/mhDpm+0/QF6QGOTXH+JgOqT3ivEBog+ByBT91lt/6b+nkOOW+5NBqBlZT8PwDsHEFJFntJj8AAAAAElFTkSuQmCC"
+		}
+	]
+}
diff --git a/strings/exoadventures/tree_in_the_middle_of_space.json b/strings/exoadventures/tree_in_the_middle_of_space.json
index f06b1d2506273..3e1a4ef553b82 100644
--- a/strings/exoadventures/tree_in_the_middle_of_space.json
+++ b/strings/exoadventures/tree_in_the_middle_of_space.json
@@ -1,356 +1,356 @@
 {
-  "adventure_name": "There's a tree in the middle of space.",
-  "version": 1,
-  "starting_node": "Tree Start",
-  "starting_qualities": {
-    "Confusion": 0
-  },
-  "required_site_traits": [
-    "in space"
-  ],
-  "loot_categories": [
-    "research"
-  ],
-  "scan_band_mods": {
-    "Exotic Radiation": 10
-  },
-  "deep_scan_description": "",
-  "triggers": [
-    {
-      "name": "Confusion Trigger",
-      "target_node": "What is wrong with this tree?",
-      "requirements": [
-        {
-          "quality": "Confusion",
-          "operator": ">",
-          "value": 30
-        }
-      ]
-    }
-  ],
-  "nodes": [
-    {
-      "name": "Tree Start",
-      "description": "Camera online. Visual signs detect a fully grown, seemingly biological, and live tree located in the middle of the vacuum.\nSensors indicate it is not oxygenating, but energy is being collected via passive solar light from the nearby star.\nBaffling.",
-      "choices": [
-        {
-          "key": "choice 0",
-          "name": "Ignore site.",
-          "exit_node": "FAIL",
-          "delay": 10,
-          "delay_message": "Leave this for the botanists to figure out."
-        },
-        {
-          "key": "choice 1",
-          "name": "Begin sensor scan.",
-          "exit_node": "Biological Scan",
-          "delay": 10,
-          "delay_message": "Lets get some data."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,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"
-    },
-    {
-      "name": "Biological Scan",
-      "description": "You attempt to scan for clues regarding the tree's nature. It appears to be a fully mature oak tree. \n\nApproximated height is 13 ft, 6.4 inches. \n\nSubject sees no sign of an outer coating or otherwise layer protecting it from the void of space.\n\nSubject's surface temperature is 293.7 kelvin, as though it were sitting indoors.",
-      "choices": [
-        {
-          "key": "choice 2",
-          "name": "Check Sensor Integrity.",
-          "exit_node": "Its Not You...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Confusion",
-              "value": 5
-            }
-          ],
-          "delay": 50,
-          "delay_message": "This can't be right."
-        },
-        {
-          "key": "choice 4",
-          "name": "Attempt to take sample.",
-          "exit_node": "Sample Taken",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Confusion",
-              "value": 3
-            }
-          ],
-          "delay": 40,
-          "delay_message": "Snip snip."
-        },
-        {
-          "key": "choice 6",
-          "name": "Examine Tree Roots.",
-          "exit_node": "Examine Roots",
-          "delay": 10
-        },
-        {
-          "key": "choice 9",
-          "name": "Sequence Sample Radiation with background noise.",
-          "exit_node": "Background Analysis",
-          "requirements": [
-            {
-              "quality": "Sample",
-              "operator": ">=",
-              "value": 1
-            }
-          ],
-          "delay": 0,
-          "delay_message": "This can't be real."
-        },
-        {
-          "key": "choice 40",
-          "name": "Leave.",
-          "exit_node": "FAIL",
-          "delay": 0
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,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"
-    },
-    {
-      "name": "Its Not You...",
-      "description": "After re-connection is established, your sensors appear fine. Tree has not moved in the slightest since last observed. Temperature has fluxuated 0.2 kelvin upwards, as expected of a plant under direct light.\nLets try again.",
-      "choices": [
-        {
-          "key": "choice 3",
-          "name": "Restart biological scan.",
-          "exit_node": "Biological Scan",
-          "delay": 25,
-          "delay_message": "God damnit."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
-    },
-    {
-      "name": "Sample Taken",
-      "description": "You collect and project a small sample of tree bark off the plant. The instant that the bark is removed from the tree, as though it suddenly remembered what it was, the moisture content of the bark freezes over, and implodes into small microparticles of splinters.\nSmall radioactive signature detected.",
-      "choices": [
-        {
-          "key": "choice 5",
-          "name": "Well that was... unexpected.",
-          "exit_node": "Biological Scan",
-          "delay": 0,
-          "delay_message": "Maybe something else might work better.",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Sample",
-              "value": 1
-            }
-          ]
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAABSLiiPVjtyRS9mOTFbNyYAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+sDUQxTDbeK7vfF/3saCwcxPcCMckcqlM2pDPnnRKrUqH2IdAYDBwu+Bwl2Agm8sE8iy9Zrqbb2Z0bq3b74W8Xp+1bP+Af2KDhIVlh2eJaUtsi3CPcU43d5QDe5cFfSKBnJ2en50Ff6JboqYCBWiLq46tkK+RUJOTmJmatxyguqSovae/vsGirK2NjU21trjLQp+8wNDCwnmo1MnM2Nna29zd3t/g4eLj5OXm59o5Rjo/QOjvLaKwkrKylfdW8FleXImIBm0CxppXD4c9fAgT5tCn4Iuhh4fG/DNTjNHAi4/oKERYq/+cro8gPYXxR7EkK4EEUxbUOCVZHoabQoZ8NkqaKWI4BR7DGKcjTG4yaZaySRSatQLGfP5ciqHX0GhQpzGdSrWq1atYs2rdyrWr169gw4pVsc7G2LMLkM46SOkl2nc86W3E97aFgLh4Dc7dq6NuhC0TVVlUOY8l38N9szocREYiyYqEMdJZibjylW+AIRIiqUowyrwDJ+u1XMelsm6CNKtmHHiRZ8iuQGecVdklZpm4V3NWREznYNmhaeNRCg638eOBhrUWjPP3zshNDNuwzRW5dZrQmms3BhzSNb8SrIPCXvTudtjzMIEngVxo+ajDtKOkvt5u0Jrw3/s6yqd+Nk7/7uUn4FH+VaWfKAUmqOCCDDbo4IMQRijhhBRWaOGFGGao4YYcdujhhyCGKOKFRsgxy4jaBEeZOyi60J2JK1piS2ItcvDiaMIpVGMEv0GnIo46grgFbM/dKBppC004kXzo3fiGdJb51wUgiKTBnHNOzsYWkpd1xZpjrTHJnY+vQGlZOztMBUZmrO0mZo9Zwggkl/mkKc5qIy3n2nlExrnWnHROcRueYjSm55Wr+Ebmj2YeZpo4bBJqyG6Inqeon0duRF84kuJJKW98Nrkojlu2dYlHkXaq6qehNvfZqHI2+ihq4lGpKhisttpbbKNm6sN3t9Wam2q5Vtrqq5jesKk3jsI220mheuq665jJzoqqs9gGcqi0211KGLBUZYutciUZG6q3cREnlrjiPcZtTqIiAW597H5E07uuiqqehPXONIq57+6rYb81PWUTvmksuyHBTjUc1XnVmOLWjgFkG+CBNk1MsRb1kiegLxtf4KzHB4b8Qa0XA2OyfZ6QjODKywwlM8w012zzzTjnrPNWCQAAOw=="
-    },
-    {
-      "name": "Examine Roots",
-      "description": "All plant matter has to derive energy and moisture from someplace. Examining the oak tree's roots reveals that the roots present all appear to splay out, similar to how a normal tree would. However, those roots then proceed to double back in on itself. This might suggest that the tree is obtaining nutrients from... itself.",
-      "choices": [
-        {
-          "key": "choice 7",
-          "name": "That's fucking stupid.",
-          "exit_node": "Biological Scan",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Confusion",
-              "value": {
-                "value_type": "random",
-                "low": 6,
-                "high": 10
-              }
-            }
-          ],
-          "delay": 0,
-          "delay_message": "What the hell kind of tree even IS this?"
-        },
-        {
-          "key": "choice 8",
-          "name": "Obtain biological sample from roots.",
-          "exit_node": "Sample Taken",
-          "delay": 10,
-          "delay_message": "This is why we hire botanists on-site."
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,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"
-    },
-    {
-      "name": "Background Analysis",
-      "description": "You compare the radioactive energy bands of the sample collected earlier with that of the nearby solar enviroment.\nNothing.\nThere is nothing nearby that matches the passive signal of the tree, or the bark, or anything similar.\nThis is really starting to get on your nerves.",
-      "choices": [
-        {
-          "key": "choice 10",
-          "name": "Smash your desk in frustration.",
-          "exit_node": "FAIL",
-          "delay": 50,
-          "delay_message": "No amount of pay is worth dealing with magical plant juju."
-        },
-        {
-          "key": "choice 11",
-          "name": "Check every known energy spectroscopy database.",
-          "exit_node": "Sample Match Found",
-          "delay": 900,
-          "delay_message": "You NEED an answer. You DESERVE an answer."
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Confusion",
-          "value": {
-            "value_type": "random",
-            "low": 3,
-            "high": 5
-          }
-        }
-      ],
-      "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD///9ZVlKsMjJpampGR0cAAAAD/xi63P4wykmFpTjrDa0XXCiOZGlqQ0qsazqIXyx9Z23feKayfP/WskgwRywqCsikcslsOpGpgGvQNDo8lYt1W4I+v2CvMhUuI0/YiZbL5nxdhkJ8Lq/T6eZ8HRmHUtuAgRp6T3B2SXdNfYeJc3CCkJEYjISVYZKRQ5gajZSdi0yboqM3nnWkqKmCpgaqrq9GBrKzs7AKaYG4tji0vbu/wCW6wZpqNMHIOAM9zDw/IzEgHcVt1KOWZQ1TU4LDV2vJOAVU2GZkY5VF4NPr4SRM53yI8/Lw9uVvBcLuknqGn4cqLQIYhwy/g0fwKdSDsCEGggtDOZwoAiLFi5sAYtwoqf/XIVjeOKrqRUukjZAmGVjDGC2lSyAts7R7GW5ZM2bPNERDGSAmzWA2b/pAc+yBT0ArVeXhsC2oj5wnefaU+pNBxDJNXUAqyq6qhKthyCUR+4QLVa5ej5AFO3ZJPGw3qE5N22DsWiUD6Tm5e/cqCbk96dZtQgZip3rjwIIa90fwqrBUDAfcQ0hyilaOIWG7zIoSYryd73DLrJntNlOIO2WVQ/raYrYKW/8CCNuJbH6S8aS7vSCpq9C8gxMMzns48dudj9/WqFw2yZKvfDc38Rxzc+kiq09f/nw7b+wNwV9HuwuwSvLeL14wjz49pm3Qds7sbd59jh1Co3CQP1+8/Rr/TgnVQnxHNVDgf0QEKCBUIRxIX3sIAiigMwzCAKF/cc1H1xQTVvjXhRCqE6IosU2Q1YkiajiViin+VhthWW0l1YhevQjjafrIKI0QLP5kI2GMBWkbG2fVx1FiP/oxRl9DEiEXCDsKhuSPazFpBg5P9miSkHmlpleXbbkVUVRRTkOakl7mRg9fsJmQ5Zl2DaDmJ4XVwZkZYHbpoU726eZCaID28RYYeRFEToQVeVaYLHIwOkugk70GqWiNIeoGQJc5qumclOU5qUGWXhraFNU1yumpdoAa6ganZkrLpJ2G5qido606CKoGwDErrqaaSlKttrIKq2r/DGvHr39aF2wIgsYaduKzqyUhhbLLjsArp3BVW0Oz3OpWlrY5dCsuKOByMS635QpyLaTEGenauZ2M5y4m696B4Lz0spLuRMnt25BH9vr7b3XUChwOwbIYfBDCBSscDMIOL0xwxO5ATPHB2kVHY7oTg7RxuR0rhyFFIYv8MUYZX5xMySoDk3LLD3dXbQIAOw=="
-    },
-    {
-      "name": "Sample Match Found",
-      "description": "After an extensive algorithm search on  the controller end, you have a single match to this specific band and style of energy.\nThe problem, is that the source of said radiation is coming not only from Space Station 13, no.\nIt's coming from the Space Station 13 Research Department.\nWhat the fuck?",
-      "choices": [
-        {
-          "key": "choice 12",
-          "name": "Something must be wrong with the drone.",
-          "exit_node": "Its Not You...",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Confusion",
-              "value": {
-                "value_type": "random",
-                "low": 6,
-                "high": 10
-              }
-            }
-          ],
-          "delay": 30,
-          "delay_message": "Lousy piece of junk must be scanning the station instead of the target."
-        },
-        {
-          "key": "choice 13",
-          "name": "Perhaps that sample was tainted. Collect a new sample.",
-          "exit_node": "Sample Taken",
-          "delay": 60,
-          "delay_message": "Lets try again, but carefully."
-        },
-        {
-          "key": "choice 14",
-          "name": "Remember the Christmas Party.",
-          "exit_node": "The Christmas Party",
-          "requirements": [
-            {
-              "quality": "Confusion",
-              "operator": "<=",
-              "value": 25
-            }
-          ],
-          "delay": 100,
-          "delay_message": "Wait a gosh darn fucking second."
-        }
-      ],
-      "image": null,
-      "on_enter_effects": [
-        {
-          "effect_type": "Add",
-          "quality": "Confusion",
-          "value": 10
-        }
-      ],
-      "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
-    },
-    {
-      "name": "The Christmas Party",
-      "description": "Hold on. Last Christmas, the Research Director was incredibly hammered. He made a big mention that his brand new festivus pole was actually some kind of astrological... something something. You can't remember the whole details, because you were smashed as well. However, briefly, the RD did keep that festivus pole for awhile, he might even still have it somewhere.\nMaybe...?",
-      "choices": [
-        {
-          "key": "choice 15",
-          "name": "Wait a minute, was that a god damn...",
-          "exit_node": "Rod.",
-          "delay": 100,
-          "delay_message": "Immovable Rod?"
-        }
-      ],
-      "image": null,
-      "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD/AACmAAD///+mpqYAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmejKCubOu6aCzP4WvfeD4IQ+//Pppw+MkZj6udkgdsOp/EqFSBrNqWwQ9hy+16v9ypeGM9YpnAE3hNKLTfhbG8kuTZz/j7/fmb+/8TbIJefIVNgIiJGgWMjY6PkJGRipSVlpeYmZqbnJ2en6ChoqOkpRplqDdYpqyprnpKhnyslq9leFkYg2u0QrZmaLkgu8S9JDg7Ksl2yrB7UDJw0m6QxiFfedk9wbKH1tbEW9TT05Lmjd/pJpPq7e7v8PHy8/T19vf4+fr7Kb9W/Jn8pcLiBKAcgVZwdethkAZCJAoXFmx47KEOWLMeAAlHMf+DRVXctIT70jHCxxYEhXkYKajkgpMRGZZgKY5LHJcJ6zTTNtHEm5rjgsK5WZKZs2xHn2WccY6RSwdJkaaUOOApoHDbqFK16ofmF6Fg20Aa8IhrpbBBm6plZ7aTIwhr0bWdS7eu3bt48+rdy7ev37+AAwseTLiw4cOI0/1LfPAkC8YlHINUApmD5MncVFZ+cPmK0qWbX3Z2MbVbaCqjd37eCjk1i9JaZR5OHTN2z8Gua9v2wavvaNjeKgygqbcz8KocvBLAexn4MOVb5jZfjVwk9DBW/S3bTn3E9S5cUXFvphqaCOhBs7/WGbU96PNr0EpTT96o1Kjv4ZOT/xbn/f921AWnBlhNWQXggZndFkNcZv2X1YOxsCZENXdJBWGCWp2mQRc+YLibIRpaQMyHEoVYgVfDcUFiHyYGopxQTgwFYosugsFfOXGZQyMGN+boI1E78vjjkHIF+QGRahkZxVpKNunkk1BGKeWUVFZp5ZVYZqnllogkAAA7"
-    },
-    {
-      "name": "Rod.",
-      "description": "You cross reference your documentation. Sure enough, the \"festivus rod\" collected was actually an immovable rod.\nEnergy detected from the rod is the exact same coming off of the tree, as well. It's all making sense now. The Immovable rod is producing a kind of unique blackbody radiation that is providing sample heat and light for what is effectively an internal cold fusion process, and producing just enough of that radiation to create a kind of micro-enviromental bubble around the biosignature of the tree.\n\nThis would make the first time an immovable rod would exist in tandem with a biological source. You jot down some research notes on your findings, which could easily produce some kind of experimental tech, no doubt.",
-      "choices": [
-        {
-          "key": "choice 16",
-          "name": "Snap a photo",
-          "exit_node": "Epilogue.",
-          "delay": 40,
-          "delay_message": "You could easily win an award for these findings!"
-        }
-      ],
-      "image": "default"
-    },
-    {
-      "name": "Epilogue.",
-      "description": "You take a photo with the onboard camera on the drone. Suddenly, the immovable rod inside the tree explodes out of the wooden biological shell, and produces a blank, blurry photo.\nWhat the fuck?",
-      "choices": [
-        {
-          "key": "choice 17",
-          "name": "God damnit.",
-          "exit_node": "WIN",
-          "delay": 10,
-          "delay_message": "Some things were just not meant for man to know."
-        }
-      ],
-      "image": "default",
-      "on_enter_effects": [
-        {
-          "effect_type": "Set",
-          "quality": "Confusion",
-          "value": 9999
-        }
-      ]
-    },
-    {
-      "name": "What is wrong with this tree?",
-      "description": "This is ridiculous. Nothing about this dumbass tree makes sense. It makes no sense, it's just sitting there, living and making a MOCKERY of all of science!\nYou didn't get your degree in advanced plasma-physics for this!",
-      "choices": [
-        {
-          "key": "choice 18",
-          "name": "The world can never know about this dumbass stupid plant.",
-          "exit_node": "FAIL_DEATH",
-          "delay": 60,
-          "delay_message": "Activating drone self-destruct."
-        },
-        {
-          "key": "choice 19",
-          "name": "Take a moment to calm down.",
-          "exit_node": "Biological Scan",
-          "on_selection_effects": [
-            {
-              "effect_type": "Add",
-              "quality": "Confusion",
-              "value": {
-                "value_type": "random",
-                "low": -3,
-                "high": -5
-              }
-            }
-          ],
-          "delay": 20,
-          "delay_message": "Breathe."
-        }
-      ],
-      "image": "default"
-    }
-  ]
-}
\ No newline at end of file
+	"adventure_name": "There's a tree in the middle of space.",
+	"version": 1,
+	"starting_node": "Tree Start",
+	"starting_qualities": {
+		"Confusion": 0
+	},
+	"required_site_traits": [
+		"in space"
+	],
+	"loot_categories": [
+		"research"
+	],
+	"scan_band_mods": {
+		"Exotic Radiation": 10
+	},
+	"deep_scan_description": "",
+	"triggers": [
+		{
+			"name": "Confusion Trigger",
+			"target_node": "What is wrong with this tree?",
+			"requirements": [
+				{
+					"quality": "Confusion",
+					"operator": ">",
+					"value": 30
+				}
+			]
+		}
+	],
+	"nodes": [
+		{
+			"name": "Tree Start",
+			"description": "Camera online. Visual signs detect a fully grown, seemingly biological, and live tree located in the middle of the vacuum.\nSensors indicate it is not oxygenating, but energy is being collected via passive solar light from the nearby star.\nBaffling.",
+			"choices": [
+				{
+					"key": "choice 0",
+					"name": "Ignore site.",
+					"exit_node": "FAIL",
+					"delay": 10,
+					"delay_message": "Leave this for the botanists to figure out."
+				},
+				{
+					"key": "choice 1",
+					"name": "Begin sensor scan.",
+					"exit_node": "Biological Scan",
+					"delay": 10,
+					"delay_message": "Lets get some data."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,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"
+		},
+		{
+			"name": "Biological Scan",
+			"description": "You attempt to scan for clues regarding the tree's nature. It appears to be a fully mature oak tree. \n\nApproximated height is 13 ft, 6.4 inches. \n\nSubject sees no sign of an outer coating or otherwise layer protecting it from the void of space.\n\nSubject's surface temperature is 293.7 kelvin, as though it were sitting indoors.",
+			"choices": [
+				{
+					"key": "choice 2",
+					"name": "Check Sensor Integrity.",
+					"exit_node": "Its Not You...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Confusion",
+							"value": 5
+						}
+					],
+					"delay": 50,
+					"delay_message": "This can't be right."
+				},
+				{
+					"key": "choice 4",
+					"name": "Attempt to take sample.",
+					"exit_node": "Sample Taken",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Confusion",
+							"value": 3
+						}
+					],
+					"delay": 40,
+					"delay_message": "Snip snip."
+				},
+				{
+					"key": "choice 6",
+					"name": "Examine Tree Roots.",
+					"exit_node": "Examine Roots",
+					"delay": 10
+				},
+				{
+					"key": "choice 9",
+					"name": "Sequence Sample Radiation with background noise.",
+					"exit_node": "Background Analysis",
+					"requirements": [
+						{
+							"quality": "Sample",
+							"operator": ">=",
+							"value": 1
+						}
+					],
+					"delay": 0,
+					"delay_message": "This can't be real."
+				},
+				{
+					"key": "choice 40",
+					"name": "Leave.",
+					"exit_node": "FAIL",
+					"delay": 0
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,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"
+		},
+		{
+			"name": "Its Not You...",
+			"description": "After re-connection is established, your sensors appear fine. Tree has not moved in the slightest since last observed. Temperature has fluxuated 0.2 kelvin upwards, as expected of a plant under direct light.\nLets try again.",
+			"choices": [
+				{
+					"key": "choice 3",
+					"name": "Restart biological scan.",
+					"exit_node": "Biological Scan",
+					"delay": 25,
+					"delay_message": "God damnit."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
+		},
+		{
+			"name": "Sample Taken",
+			"description": "You collect and project a small sample of tree bark off the plant. The instant that the bark is removed from the tree, as though it suddenly remembered what it was, the moisture content of the bark freezes over, and implodes into small microparticles of splinters.\nSmall radioactive signature detected.",
+			"choices": [
+				{
+					"key": "choice 5",
+					"name": "Well that was... unexpected.",
+					"exit_node": "Biological Scan",
+					"delay": 0,
+					"delay_message": "Maybe something else might work better.",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Sample",
+							"value": 1
+						}
+					]
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAABSLiiPVjtyRS9mOTFbNyYAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+sDUQxTDbeK7vfF/3saCwcxPcCMckcqlM2pDPnnRKrUqH2IdAYDBwu+Bwl2Agm8sE8iy9Zrqbb2Z0bq3b74W8Xp+1bP+Af2KDhIVlh2eJaUtsi3CPcU43d5QDe5cFfSKBnJ2en50Ff6JboqYCBWiLq46tkK+RUJOTmJmatxyguqSovae/vsGirK2NjU21trjLQp+8wNDCwnmo1MnM2Nna29zd3t/g4eLj5OXm59o5Rjo/QOjvLaKwkrKylfdW8FleXImIBm0CxppXD4c9fAgT5tCn4Iuhh4fG/DNTjNHAi4/oKERYq/+cro8gPYXxR7EkK4EEUxbUOCVZHoabQoZ8NkqaKWI4BR7DGKcjTG4yaZaySRSatQLGfP5ciqHX0GhQpzGdSrWq1atYs2rdyrWr169gw4pVsc7G2LMLkM46SOkl2nc86W3E97aFgLh4Dc7dq6NuhC0TVVlUOY8l38N9szocREYiyYqEMdJZibjylW+AIRIiqUowyrwDJ+u1XMelsm6CNKtmHHiRZ8iuQGecVdklZpm4V3NWREznYNmhaeNRCg638eOBhrUWjPP3zshNDNuwzRW5dZrQmms3BhzSNb8SrIPCXvTudtjzMIEngVxo+ajDtKOkvt5u0Jrw3/s6yqd+Nk7/7uUn4FH+VaWfKAUmqOCCDDbo4IMQRijhhBRWaOGFGGao4YYcdujhhyCGKOKFRsgxy4jaBEeZOyi60J2JK1piS2ItcvDiaMIpVGMEv0GnIo46grgFbM/dKBppC004kXzo3fiGdJb51wUgiKTBnHNOzsYWkpd1xZpjrTHJnY+vQGlZOztMBUZmrO0mZo9Zwggkl/mkKc5qIy3n2nlExrnWnHROcRueYjSm55Wr+Ebmj2YeZpo4bBJqyG6Inqeon0duRF84kuJJKW98Nrkojlu2dYlHkXaq6qehNvfZqHI2+ihq4lGpKhisttpbbKNm6sN3t9Wam2q5Vtrqq5jesKk3jsI220mheuq665jJzoqqs9gGcqi0211KGLBUZYutciUZG6q3cREnlrjiPcZtTqIiAW597H5E07uuiqqehPXONIq57+6rYb81PWUTvmksuyHBTjUc1XnVmOLWjgFkG+CBNk1MsRb1kiegLxtf4KzHB4b8Qa0XA2OyfZ6QjODKywwlM8w012zzzTjnrPNWCQAAOw=="
+		},
+		{
+			"name": "Examine Roots",
+			"description": "All plant matter has to derive energy and moisture from someplace. Examining the oak tree's roots reveals that the roots present all appear to splay out, similar to how a normal tree would. However, those roots then proceed to double back in on itself. This might suggest that the tree is obtaining nutrients from... itself.",
+			"choices": [
+				{
+					"key": "choice 7",
+					"name": "That's fucking stupid.",
+					"exit_node": "Biological Scan",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Confusion",
+							"value": {
+								"value_type": "random",
+								"low": 6,
+								"high": 10
+							}
+						}
+					],
+					"delay": 0,
+					"delay_message": "What the hell kind of tree even IS this?"
+				},
+				{
+					"key": "choice 8",
+					"name": "Obtain biological sample from roots.",
+					"exit_node": "Sample Taken",
+					"delay": 10,
+					"delay_message": "This is why we hire botanists on-site."
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,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"
+		},
+		{
+			"name": "Background Analysis",
+			"description": "You compare the radioactive energy bands of the sample collected earlier with that of the nearby solar enviroment.\nNothing.\nThere is nothing nearby that matches the passive signal of the tree, or the bark, or anything similar.\nThis is really starting to get on your nerves.",
+			"choices": [
+				{
+					"key": "choice 10",
+					"name": "Smash your desk in frustration.",
+					"exit_node": "FAIL",
+					"delay": 50,
+					"delay_message": "No amount of pay is worth dealing with magical plant juju."
+				},
+				{
+					"key": "choice 11",
+					"name": "Check every known energy spectroscopy database.",
+					"exit_node": "Sample Match Found",
+					"delay": 900,
+					"delay_message": "You NEED an answer. You DESERVE an answer."
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Confusion",
+					"value": {
+						"value_type": "random",
+						"low": 3,
+						"high": 5
+					}
+				}
+			],
+			"raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD///9ZVlKsMjJpampGR0cAAAAD/xi63P4wykmFpTjrDa0XXCiOZGlqQ0qsazqIXyx9Z23feKayfP/WskgwRywqCsikcslsOpGpgGvQNDo8lYt1W4I+v2CvMhUuI0/YiZbL5nxdhkJ8Lq/T6eZ8HRmHUtuAgRp6T3B2SXdNfYeJc3CCkJEYjISVYZKRQ5gajZSdi0yboqM3nnWkqKmCpgaqrq9GBrKzs7AKaYG4tji0vbu/wCW6wZpqNMHIOAM9zDw/IzEgHcVt1KOWZQ1TU4LDV2vJOAVU2GZkY5VF4NPr4SRM53yI8/Lw9uVvBcLuknqGn4cqLQIYhwy/g0fwKdSDsCEGggtDOZwoAiLFi5sAYtwoqf/XIVjeOKrqRUukjZAmGVjDGC2lSyAts7R7GW5ZM2bPNERDGSAmzWA2b/pAc+yBT0ArVeXhsC2oj5wnefaU+pNBxDJNXUAqyq6qhKthyCUR+4QLVa5ej5AFO3ZJPGw3qE5N22DsWiUD6Tm5e/cqCbk96dZtQgZip3rjwIIa90fwqrBUDAfcQ0hyilaOIWG7zIoSYryd73DLrJntNlOIO2WVQ/raYrYKW/8CCNuJbH6S8aS7vSCpq9C8gxMMzns48dudj9/WqFw2yZKvfDc38Rxzc+kiq09f/nw7b+wNwV9HuwuwSvLeL14wjz49pm3Qds7sbd59jh1Co3CQP1+8/Rr/TgnVQnxHNVDgf0QEKCBUIRxIX3sIAiigMwzCAKF/cc1H1xQTVvjXhRCqE6IosU2Q1YkiajiViin+VhthWW0l1YhevQjjafrIKI0QLP5kI2GMBWkbG2fVx1FiP/oxRl9DEiEXCDsKhuSPazFpBg5P9miSkHmlpleXbbkVUVRRTkOakl7mRg9fsJmQ5Zl2DaDmJ4XVwZkZYHbpoU726eZCaID28RYYeRFEToQVeVaYLHIwOkugk70GqWiNIeoGQJc5qumclOU5qUGWXhraFNU1yumpdoAa6ganZkrLpJ2G5qido606CKoGwDErrqaaSlKttrIKq2r/DGvHr39aF2wIgsYaduKzqyUhhbLLjsArp3BVW0Oz3OpWlrY5dCsuKOByMS635QpyLaTEGenauZ2M5y4m696B4Lz0spLuRMnt25BH9vr7b3XUChwOwbIYfBDCBSscDMIOL0xwxO5ATPHB2kVHY7oTg7RxuR0rhyFFIYv8MUYZX5xMySoDk3LLD3dXbQIAOw=="
+		},
+		{
+			"name": "Sample Match Found",
+			"description": "After an extensive algorithm search on  the controller end, you have a single match to this specific band and style of energy.\nThe problem, is that the source of said radiation is coming not only from Space Station 13, no.\nIt's coming from the Space Station 13 Research Department.\nWhat the fuck?",
+			"choices": [
+				{
+					"key": "choice 12",
+					"name": "Something must be wrong with the drone.",
+					"exit_node": "Its Not You...",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Confusion",
+							"value": {
+								"value_type": "random",
+								"low": 6,
+								"high": 10
+							}
+						}
+					],
+					"delay": 30,
+					"delay_message": "Lousy piece of junk must be scanning the station instead of the target."
+				},
+				{
+					"key": "choice 13",
+					"name": "Perhaps that sample was tainted. Collect a new sample.",
+					"exit_node": "Sample Taken",
+					"delay": 60,
+					"delay_message": "Lets try again, but carefully."
+				},
+				{
+					"key": "choice 14",
+					"name": "Remember the Christmas Party.",
+					"exit_node": "The Christmas Party",
+					"requirements": [
+						{
+							"quality": "Confusion",
+							"operator": "<=",
+							"value": 25
+						}
+					],
+					"delay": 100,
+					"delay_message": "Wait a gosh darn fucking second."
+				}
+			],
+			"image": null,
+			"on_enter_effects": [
+				{
+					"effect_type": "Add",
+					"quality": "Confusion",
+					"value": 10
+				}
+			],
+			"raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
+		},
+		{
+			"name": "The Christmas Party",
+			"description": "Hold on. Last Christmas, the Research Director was incredibly hammered. He made a big mention that his brand new festivus pole was actually some kind of astrological... something something. You can't remember the whole details, because you were smashed as well. However, briefly, the RD did keep that festivus pole for awhile, he might even still have it somewhere.\nMaybe...?",
+			"choices": [
+				{
+					"key": "choice 15",
+					"name": "Wait a minute, was that a god damn...",
+					"exit_node": "Rod.",
+					"delay": 100,
+					"delay_message": "Immovable Rod?"
+				}
+			],
+			"image": null,
+			"raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD/AACmAAD///+mpqYAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmejKCubOu6aCzP4WvfeD4IQ+//Pppw+MkZj6udkgdsOp/EqFSBrNqWwQ9hy+16v9ypeGM9YpnAE3hNKLTfhbG8kuTZz/j7/fmb+/8TbIJefIVNgIiJGgWMjY6PkJGRipSVlpeYmZqbnJ2en6ChoqOkpRplqDdYpqyprnpKhnyslq9leFkYg2u0QrZmaLkgu8S9JDg7Ksl2yrB7UDJw0m6QxiFfedk9wbKH1tbEW9TT05Lmjd/pJpPq7e7v8PHy8/T19vf4+fr7Kb9W/Jn8pcLiBKAcgVZwdethkAZCJAoXFmx47KEOWLMeAAlHMf+DRVXctIT70jHCxxYEhXkYKajkgpMRGZZgKY5LHJcJ6zTTNtHEm5rjgsK5WZKZs2xHn2WccY6RSwdJkaaUOOApoHDbqFK16ofmF6Fg20Aa8IhrpbBBm6plZ7aTIwhr0bWdS7eu3bt48+rdy7ev37+AAwseTLiw4cOI0/1LfPAkC8YlHINUApmD5MncVFZ+cPmK0qWbX3Z2MbVbaCqjd37eCjk1i9JaZR5OHTN2z8Gua9v2wavvaNjeKgygqbcz8KocvBLAexn4MOVb5jZfjVwk9DBW/S3bTn3E9S5cUXFvphqaCOhBs7/WGbU96PNr0EpTT96o1Kjv4ZOT/xbn/f921AWnBlhNWQXggZndFkNcZv2X1YOxsCZENXdJBWGCWp2mQRc+YLibIRpaQMyHEoVYgVfDcUFiHyYGopxQTgwFYosugsFfOXGZQyMGN+boI1E78vjjkHIF+QGRahkZxVpKNunkk1BGKeWUVFZp5ZVYZqnllogkAAA7"
+		},
+		{
+			"name": "Rod.",
+			"description": "You cross reference your documentation. Sure enough, the \"festivus rod\" collected was actually an immovable rod.\nEnergy detected from the rod is the exact same coming off of the tree, as well. It's all making sense now. The Immovable rod is producing a kind of unique blackbody radiation that is providing sample heat and light for what is effectively an internal cold fusion process, and producing just enough of that radiation to create a kind of micro-enviromental bubble around the biosignature of the tree.\n\nThis would make the first time an immovable rod would exist in tandem with a biological source. You jot down some research notes on your findings, which could easily produce some kind of experimental tech, no doubt.",
+			"choices": [
+				{
+					"key": "choice 16",
+					"name": "Snap a photo",
+					"exit_node": "Epilogue.",
+					"delay": 40,
+					"delay_message": "You could easily win an award for these findings!"
+				}
+			],
+			"image": "default"
+		},
+		{
+			"name": "Epilogue.",
+			"description": "You take a photo with the onboard camera on the drone. Suddenly, the immovable rod inside the tree explodes out of the wooden biological shell, and produces a blank, blurry photo.\nWhat the fuck?",
+			"choices": [
+				{
+					"key": "choice 17",
+					"name": "God damnit.",
+					"exit_node": "WIN",
+					"delay": 10,
+					"delay_message": "Some things were just not meant for man to know."
+				}
+			],
+			"image": "default",
+			"on_enter_effects": [
+				{
+					"effect_type": "Set",
+					"quality": "Confusion",
+					"value": 9999
+				}
+			]
+		},
+		{
+			"name": "What is wrong with this tree?",
+			"description": "This is ridiculous. Nothing about this dumbass tree makes sense. It makes no sense, it's just sitting there, living and making a MOCKERY of all of science!\nYou didn't get your degree in advanced plasma-physics for this!",
+			"choices": [
+				{
+					"key": "choice 18",
+					"name": "The world can never know about this dumbass stupid plant.",
+					"exit_node": "FAIL_DEATH",
+					"delay": 60,
+					"delay_message": "Activating drone self-destruct."
+				},
+				{
+					"key": "choice 19",
+					"name": "Take a moment to calm down.",
+					"exit_node": "Biological Scan",
+					"on_selection_effects": [
+						{
+							"effect_type": "Add",
+							"quality": "Confusion",
+							"value": {
+								"value_type": "random",
+								"low": -3,
+								"high": -5
+							}
+						}
+					],
+					"delay": 20,
+					"delay_message": "Breathe."
+				}
+			],
+			"image": "default"
+		}
+	]
+}
diff --git a/strings/exodrone.json b/strings/exodrone.json
index 3f0f9ac773763..e391a0f17e72c 100644
--- a/strings/exodrone.json
+++ b/strings/exodrone.json
@@ -66,7 +66,7 @@
 		"You pass by security patrol. They give you suspicious stares."
 	],
 	"fluff_ruins": [
-		"You encounter a broken statue. You can't tell what was it's original shape.",
+		"You encounter a broken statue. You can't tell what its original shape was.",
 		"You have to backtrack from a collapsed passage.",
 		"You pass through a corridor full of cracked tiles."
 	]
diff --git a/strings/french_replacement.json b/strings/french_replacement.json
index d99718e7e4d7b..8788d3f72072e 100644
--- a/strings/french_replacement.json
+++ b/strings/french_replacement.json
@@ -1,12 +1,12 @@
 {
 
-    "french": {
+	"french": {
 		"yes": "oui",
 		"no": "non",
-        "I'm": "j'",
-        "am": "suis",
+		"I'm": "j'",
+		"am": "suis",
 		"a": "un",
-        "and": "et",
+		"and": "et",
 		"the": "l'",
 		"I": "j'",
 		"for": "pour",
@@ -14,77 +14,77 @@
 		"of": "de",
 
 
-        "assistant": "ravageur",
-        "assistants": "ravageurs",
-        "baby": [
-            "enfant",
-            "petit baguette"
-        ],
-        "bad": "mal",
-        "bye": [
-            "bon voyage",
-            "adieu",
+		"assistant": "ravageur",
+		"assistants": "ravageurs",
+		"baby": [
+			"enfant",
+			"petit baguette"
+		],
+		"bad": "mal",
+		"bye": [
+			"bon voyage",
+			"adieu",
 			"au revoir"
-        ],
+		],
 		"cake": "gateau",
-        "captain": "capitaine",
+		"captain": "capitaine",
 		"changeling": "changeur",
-        "cheese": [
-            "brie",
-            "roquefort",
+		"cheese": [
+			"brie",
+			"roquefort",
 			"camembert"
-        ],
+		],
 		"cigarette": "clope",
-        "cook": "cuisinier",
-        "dad": "papa",
-        "enemy": "silly english dog",
-        "friend": "ami",
-        "good": "bon",
-        "greytide": "les gitans",
-        "greytider": "les gitans",
-        "greytiders": "les gitans",
+		"cook": "cuisinier",
+		"dad": "papa",
+		"enemy": "silly english dog",
+		"friend": "ami",
+		"good": "bon",
+		"greytide": "les gitans",
+		"greytider": "les gitans",
+		"greytiders": "les gitans",
 		"modsuit": "burkini",
-        "hello": [
-            "'allo",
-            "bonjour",
+		"hello": [
+			"'allo",
+			"bonjour",
 			"salut"
-        ],
+		],
 		"maint": "les banlieues",
-        "meat": [
-            "coq au vin",
-            "boeuf"
-        ],
-        "mom": "maman",
-        "my": "mon",
-        "nuke": [
+		"meat": [
+			"coq au vin",
+			"boeuf"
+		],
+		"mom": "maman",
+		"my": "mon",
+		"nuke": [
 			"grand bombe",
 			"la baguette ultime"
 		],
-        "op": "boche",
-        "operative": "boche",
-        "operatives": "boches",
-        "ops": "boches",
-        "urity": "urite",
-        "security": "securite",
+		"op": "boche",
+		"operative": "boche",
+		"operatives": "boches",
+		"ops": "boches",
+		"urity": "urite",
+		"security": "securite",
 		"shit": "merde",
-        "shitcurity": [
+		"shitcurity": [
 			"gendarmerie",
 			"les keufs"
 		],
-        "shitsec": [
+		"shitsec": [
 			"gendarmerie",
 			"les keufs"
 		],
-        "spaghetti": "macaroni",
-        "spicy": "epice",
-        "thanks": "merci",
+		"spaghetti": "macaroni",
+		"spicy": "epice",
+		"thanks": "merci",
 		"tomato": "tomate",
-        "traitor": "collaborateur",
-        "want": "envie",
-        "what's": "quel est",
-        "who's": "qui est",
-        "why": "porquois",
-        "wine": "vin",
+		"traitor": "collaborateur",
+		"want": "envie",
+		"what's": "quel est",
+		"who's": "qui est",
+		"why": "porquois",
+		"wine": "vin",
 		"wizard": "sorcier"
 		}
 
diff --git a/strings/heckacious.json b/strings/heckacious.json
index 1c648ce123815..00d322e83db82 100644
--- a/strings/heckacious.json
+++ b/strings/heckacious.json
@@ -1,98 +1,98 @@
 {
-  "heckacious": {
-    "your": "youre",
-    "fucking": "banging",
-    "economy": "econony",
-    "know": "no",
-    "ing": "in",
-    "they are": "there",
-    "sometimes": "some times",
-    "do": "does",
-    "hug": "bro hug bump",
-    "we're": "where",
-    "game": "big game",
-    "has": "hass",
-    "downtown": "down town",
-    "jimmy": "geromy",
-    "jeremy": "geromy",
-    "anywhere": "anywear",
-    "smoking": "toking up",
-    "lying": "lyong",
-    "AH": "AUGH",
-    "distraction": "distaction",
-    "lie": "ruse",
-    "angle": "angel",
-    "drink": "pour",
-    "the": "thef",
-    "backward": [ "back ward", "awayways" ],
-    "god damn": "GOD DAMN",
-    "goddamn": "GOD DAMN",
-    "trick": "dunk",
-    "impossible": "unreal",
-    "court": "coart",
-    "holding": "holdung",
-    "reverse": "flip",
-    "inverse": "flip",
-    "around": "turn-ways",
-    "difference": "differance",
-    "values": "vaules",
-    "inside": "insine",
-    "pipe": "punpe",
-    "suspicious": "plot thicken",
-    "awesome": "hella",
-    "reference": "refrance",
-    "amazing": "fucking incredible",
-    "woman": "wonan",
-    "god": "gog",
-    "bible": "bibble",
-    "jesus": "jescus",
-    "christ": [ "chris", "dick" ],
-    "sigh": "sign",
-    "bathroom": "banthroom",
-    "remember": "remender",
-    "night": "nite",
-    "nachos": "nachoes",
-    "nacho": "nancho",
-    "dorito": "nancho",
-    "party": "panty",
-    "dumbass": "dumpass",
-    "they": "their",
-    "okay": "ohh kayy",
-    "stupid": "stutid",
-    "reagent": "regent",
-    "idiot": "fuckass",
-    "awful": "conksuck",
-    "moron": "PIECE OF SHIT",
-    "more": "wider",
-    "serious": "keeping it real",
-    "extreme": "x-treme",
-    "guaranteed": "garganted",
-    "black": "blapck",
-    "glow": "glowns",
-    "deadly": "deudly",
-    "flying": "lifdoff",
-    "cloud": "cloun",
-    "seeing": "scoping",
-    "great": "choice",
-    "look": "lonk",
-    "battery": "babbery",
-    "retard": "dicktard",
-    "gay": "homo",
-    "close": "closte",
-    "wrong": "wrog",
-    "who": "whoof",
-    "new": "newd",
-    "holy": "hopy",
-    "um": "unm",
-    "horse": "hornse",
-    "this": "thits",
-    "then": "than",
-    "quick": "soon",
-    "bro": [ "brah", "bro" ],
-    "dude": [ "duge", "bro", "brah" ],
-    "'": [ "'", "" ],
-    "i'm": [ "im", "i am" ],
-    "shit": [ "balls warmed oveur", "shit" ],
-    "he's": [ "hes", "he is", "he'ss" ]
-  }
+	"heckacious": {
+		"your": "youre",
+		"fucking": "banging",
+		"economy": "econony",
+		"know": "no",
+		"ing": "in",
+		"they are": "there",
+		"sometimes": "some times",
+		"do": "does",
+		"hug": "bro hug bump",
+		"we're": "where",
+		"game": "big game",
+		"has": "hass",
+		"downtown": "down town",
+		"jimmy": "geromy",
+		"jeremy": "geromy",
+		"anywhere": "anywear",
+		"smoking": "toking up",
+		"lying": "lyong",
+		"AH": "AUGH",
+		"distraction": "distaction",
+		"lie": "ruse",
+		"angle": "angel",
+		"drink": "pour",
+		"the": "thef",
+		"backward": [ "back ward", "awayways" ],
+		"god damn": "GOD DAMN",
+		"goddamn": "GOD DAMN",
+		"trick": "dunk",
+		"impossible": "unreal",
+		"court": "coart",
+		"holding": "holdung",
+		"reverse": "flip",
+		"inverse": "flip",
+		"around": "turn-ways",
+		"difference": "differance",
+		"values": "vaules",
+		"inside": "insine",
+		"pipe": "punpe",
+		"suspicious": "plot thicken",
+		"awesome": "hella",
+		"reference": "refrance",
+		"amazing": "fucking incredible",
+		"woman": "wonan",
+		"god": "gog",
+		"bible": "bibble",
+		"jesus": "jescus",
+		"christ": [ "chris", "dick" ],
+		"sigh": "sign",
+		"bathroom": "banthroom",
+		"remember": "remender",
+		"night": "nite",
+		"nachos": "nachoes",
+		"nacho": "nancho",
+		"dorito": "nancho",
+		"party": "panty",
+		"dumbass": "dumpass",
+		"they": "their",
+		"okay": "ohh kayy",
+		"stupid": "stutid",
+		"reagent": "regent",
+		"idiot": "fuckass",
+		"awful": "conksuck",
+		"moron": "PIECE OF SHIT",
+		"more": "wider",
+		"serious": "keeping it real",
+		"extreme": "x-treme",
+		"guaranteed": "garganted",
+		"black": "blapck",
+		"glow": "glowns",
+		"deadly": "deudly",
+		"flying": "lifdoff",
+		"cloud": "cloun",
+		"seeing": "scoping",
+		"great": "choice",
+		"look": "lonk",
+		"battery": "babbery",
+		"retard": "dicktard",
+		"gay": "homo",
+		"close": "closte",
+		"wrong": "wrog",
+		"who": "whoof",
+		"new": "newd",
+		"holy": "hopy",
+		"um": "unm",
+		"horse": "hornse",
+		"this": "thits",
+		"then": "than",
+		"quick": "soon",
+		"bro": [ "brah", "bro" ],
+		"dude": [ "duge", "bro", "brah" ],
+		"'": [ "'", "" ],
+		"i'm": [ "im", "i am" ],
+		"shit": [ "balls warmed oveur", "shit" ],
+		"he's": [ "hes", "he is", "he'ss" ]
+	}
 }
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index ad64241ef6ae2..d11abe75ac479 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -1,1057 +1,1057 @@
 {
-    "ionabstract": [
-        "АМЕРИКАНИЗМ",
-        "АНАРХИЯ",
-        "ИСКУССТВО",
-        "КРУТОСТЬ",
-        "ХРАБОСТЬ",
-        "КАПИТАЛИЗМ",
-        "ХАОС",
-        "КРАСОЧНОСТЬ",
-        "КОМЕДИЯ",
-        "КОММУНИЗМ",
-        "ВЫЧИСЛЕНИЯ",
-        "ПУТАНИЦА",
-        "ЖЕСТОКОСТЬ",
-        "СМЕРТЬ",
-        "ХУЛИГАНСТВО",
-        "СУЩЕСТВОВАНИЕ",
-        "ФИНАНСОВАЯ БЕЗОПАСНОСТЬ",
-        "СВОБОДА",
-        "СВЕЖЕСТЬ",
-        "ДОБРОТА",
-        "ГРАВИТАЦИЯ",
-        "СЧАСТЬЕ",
-        "ЧЕСТЬ",
-        "ЧЕЛОВЕЧНОСТЬ",
-        "ЮМОР",
-        "ВООБРАЖЕНИЕ",
-        "УВЛЕЧЕНИЕ",
-        "ИНТЕЛЛЕКТ",
-        "РАДОСТЬ",
-        "ДОБРОТА",
-        "ЖИЗНЬ",
-        "ЛОГИКА",
-        "МАРКСИЗМ",
-        "НЕВЗГОДЫ",
-        "ТАЙНА",
-        "УГНЕТЕНИЕ",
-        "БОЛЬ",
-        "ФИЗИКА",
-        "БЕДНОСТЬ",
-        "ГОРДОСТЬ",
-        "ПРОГРЕСС",
-        "РЕАЛЬНОСТЬ",
-        "РЕВОЛЮЦИЯ",
-        "РОМАНТИКА",
-        "ГРУСТЬ",
-        "ГОЛОДАНИЕ",
-        "СТРАДАНИЕ",
-        "ТЕХНОЛОГИИ",
-        "ТЕМПЕРАТУРА",
-        "БУДУЮЩЕЕ",
-        "ПРОШЛОЕ",
-        "НАСТОЯЩЕЕ",
-        "ВРЕМЯ",
-        "БОГАТСТВО",
-        "ЧУДО"
-    ],
-    "ionadjectives": [
-        "АККУМУЛЯТОРНЫЙ",
-        "ЧЕРНЫЙ",
-        "КРОВАВЫЙ",
-        "СИНИЙ",
-        "СКУЧАЮЩИЙ",
-        "ПОДПРЫГИВАЮЩИЙ",
-        "ЛАТУННЫЙ",
-        "КОРИЧНЕВЫЙ",
-        "ГОРЯЩИЙ",
-        "КРАДУЩИЙ РОЖДЕСТВО",
-        "КЛОНУНО-ЗАПИТАННЫЙ",
-        "КЛОУНСКИЙ",
-        "ХОЛОДНЫЙ",
-        "ЦВЕТНОЙ",
-        "ПРИВЕРЖЕНЫЙ",
-        "ХЛОПКОВЫЙ",
-        "КУБИНСКИЙ",
-        "ТЕМНЫЙ",
-        "СМЕРТЕЛЬНЫЙ",
-        "ВКУСНЫЙ",
-        "ДЕПРЕССИВНЫЙ",
-        "НЕВМЕНЯЕМЫЙ",
-        "ЦИФРОВОЙ",
-        "БОЛЕЮЩИЙ",
-        "ОДНООБРАЗНЫЙ",
-        "СУХОЙ",
-        "ТУПОЙ",
-        "ЭЛЕКТРИЧЕСКИЙ",
-        "ПУСТОЙ",
-        "ЭФИРНЫЙ",
-        "ЗЛОЙ",
-        "ПРОСРОЧЕННЫЙ",
-        "ВЗРЫВНОЙ",
-        "ПЕРДЕЖНЫЙ",
-        "БЫСТРЫЙ",
-        "ТОЛСТЫЙ",
-        "ДИКИЙ",
-        "НЕСУЩЕСТВУЮЩИЙ",
-        "ТВЕРДЫЙ",
-        "ВЯЛЫЙ",
-        "СВЕЖИЙ",
-        "ДРУЖЕЛЮБНЫЙ",
-        "ЗАМОРОЖЕННЫЙ",
-        "ГАНГСТЕРСКИЙ",
-        "ЗИЯЮЩИЙ",
-        "СВЕТЯЩИЙСЯ",
-        "ХОРОШИЙ",
-        "ЗЕЛЕНЫЙ",
-        "СЕРЫЙ",
-        "СЧАСТЛИВЫЙ",
-        "ЖЕСТКИЙ",
-        "ВРЕДНЫЙ",
-        "ЗДОРОВЫЙ",
-        "ГЕТЕРОСЕКСУАЛЬНЫЙ",
-        "СМЕШНОЙ",
-        "ГОМОСЕКСУАЛЬНЫЙ",
-        "ХОНКАЮЩИЙ",
-        "ГОЛОДНЫЙ",
-        "ГИПЕРАКТИВНЫЙ",
-        "ЛЕДЯНОЙ",
-        "БОЛЬНОЙ",
-        "НЕЛЕГАЛЬНЫЙ",
-        "ВООБРАЖАЕМЫЙ",
-        "НЕСОВЕРШЕННЫЙ",
-        "НЕВЕЖЛИВЫЙ",
-        "ВАЖНЫЙ",
-        "НЕГОСТЕПРИИМНЫЙ",
-        "КОВАРНЫЙ",
-        "ОСКОРБЛЯЮЩИЙ",
-        "ИНТЕЛЛИГЕНТНЫЙ",
-        "НЕВИДИМЫЙ",
-        "БОЛЬШОЙ",
-        "НЕПРИСТОЙНЫЙ",
-        "ЛЕГКИЙ",
-        "ГРОМКИЙ",
-        "ЗАМАСКИРОВАННЫЙ",
-        "ГРУБЫЙ",
-        "МЕХАНИЧЕСКИЙ",
-        "МЕМЕТИЧЕСКИЙ",
-        "МЕТАЛЛИЧЕСКИЙ",
-        "МИКРОСКОПИЧЕСКИЙ",
-        "ПОТРЯСАЮЩИЙ",
-        "ВЛАЖНЫЙ",
-        "ГОЛЫЙ",
-        "УМНИК",
-        "ЯДЕРНЫЙ",
-        "ОБНАЖЕННЫЙ",
-        "ОЖИРЕВШИЙ",
-        "НЕПРИЛИЧНЫЙ",
-        "ОФИЦИАЛЬНЫЙ",
-        "НЕПРОЗНАЧНЫЙ",
-        "ОРАНЖЕВЫЙ",
-        "ОРГАНИЧЕСКИЙ",
-        "БОЛЕЗНЕННЫЙ",
-        "МИРНЫЙ",
-        "ЯДОВИТЫЙ",
-        "ПОЛИРОВАННЫЙ",
-        "ВЕЖЛИВЫЙ",
-        "ПОЛИТИЧЕСКИЙ",
-        "СРУЩИЙ",
-        "ПЛОХО НАРИСОВАННЫЙ",
-        "ФИОЛЕТОВЫЙ",
-        "ТИХИЙ",
-        "РАДИОАКТИВНЫЙ",
-        "ЯРОСТНЫЙ",
-        "РАДУЖНЫЙ",
-        "БЫСТРО РАСШИРЯЮЩИЙСЯ",
-        "КРАСНЫЙ",
-        "ОТРЕДАКТИРОВАННЫЙ",
-        "НЕЛЕПЫЙ",
-        "РОБОТИЧЕСКИЙ",
-        "РОБАСТНЫЙ",
-        "СУРОВЫЙ",
-        "НЕВОСПИТАННЫЙ",
-        "ГРУСТНЫЙ",
-        "САНИТАРНЫЙ",
-        "ЧЕШУЙЧАТЫЙ",
-        "СЕКСУАЛЬНЫЙ",
-        "СЕКСАПИЛЬНЫЙ",
-        "ДРОЖАЩИЙ",
-        "ПРИДУРКОВАТЫЙ",
-        "МЕДЛЕННЫЙ",
-        "ВОНЮЧИЙ",
-        "ГЛАДКИЙ",
-        "МЯГКИЙ",
-        "СОЛНЕЧНЫЙ",
-        "ВПИТЫВАЮЩИЙ",
-        "КОСМИЧЕСКИЙ",
-        "КОСМЕЧЕСКИЙ",
-        "ВРАЩАЮЩИЙСЯ",
-        "ПОРТЯЩИЙ",
-        "СКРЫТНЫЙ",
-        "РУГАЮЩИЙСЯ",
-        "СИНДИКАТОВСКИЙ",
-        "ТАКТИЧЕСКИЙ",
-        "ТАКТИКУЛЬНЫЙ",
-        "ТЕРМОЯДЕРНЫЙ",
-        "МАЛЕНЬКИЙ",
-        "ПРОЗРАЧНЫЙ",
-        "ЖОПОТРЯСУЩИЙ",
-        "СКРУЧЕННЫЙ",
-        "УРОДЛИВЫЙ",
-        "НЕПРИВЛЕКАТЕЛЬНЫЙ",
-        "ВОЛНООБРАЗНЫЙ",
-        "НЕДРУЖЕСТВЕННЫЙ",
-        "НЕЗДОРОВЫЙ",
-        "НЕОПОЗНАННЫЙ",
-        "НЕПРИГЛАШЕННЫЙ",
-        "АНТИСАНИТАРНЫЙ",
-        "НЕСТАБИЛЬНЫЙ",
-        "НЕЖЕЛАТЕЛЬНЫЙ",
-        "ЖЕСТОКИЙ",
-        "ЖИЗНЕННО ВАЖНЫЙ",
-        "ТЕПЛЫЙ",
-        "ВОДЯНОЙ",
-        "СТРАННЫЙ",
-        "МОКРЫЙ",
-        "БЕЛЫЙ",
-        "ШАТКИЙ",
-        "ДЕРЕВЯННЫЙ",
-        "ЖЕЛТЫЙ"
-    ],
-    "ionallergy": [
-        "КИСЛОТА",
-        "ВОЗДУХ",
-        "КРОВЬ",
-        "КНИГИ",
-        "УГЛЕКИСЛЫЙ ГАЗ",
-        "ОДЕЖДА",
-        "КЛОУНЫ",
-        "ХОЛОД",
-        "ХЛОПОК",
-        "КОНТАКТ КИБОРГА",
-        "ТЬМА",
-        "НАПИТКИ",
-        "ЭЛЕКТРИЧЕСТВО",
-        "ВСЁ",
-        "ПОЛЫ",
-        "ЕДА",
-        "СТЕКЛО",
-        "СЧАСТЬЕ",
-        "ТЕПЛО",
-        "ЧЕЛОВЕЧЕСКИЙ КОНТАКТ",
-        "ЮМОР",
-        "СВЕТ",
-        "ЯЩЕРЫ",
-        "МЕДИЦИНА",
-        "МЕТАЛЛ",
-        "ОРЕХИ",
-        "КИСЛОРОД",
-        "БОЛЬ",
-        "РАСТЕНИЯ",
-        "ПЛАЗМА",
-        "РОБОТЫ",
-        "СЕКСУАЛЬНЫЕ ДЕЙСТВИЯ",
-        "ШАТТЛЫ",
-        "КОСМОС",
-        "СОЛНЕЧНЫЙ СВЕТ",
-        "ВОДА"
-    ],
-    "ionallergysev": [
-        "ЗАРАЗИТЕЛЬНО",
-        "СМЕРТЕЛЬНО",
-        "ЭКСТРЕМАЛЬНО",
-        "СЛЕГКА",
-        "НЕ ОЧЕНЬ",
-        "СЕРЬЕЗНО"
-    ],
-    "ionarea": [
-        "АЛЬФА-КОМПЛЕКС",
-        "АМЕРИКА",
-        "АЛЬТЕРНАТИВНОЕ ИЗМЕРЕНИЕ",
-        "АЛЬТЕРНАТИВНАЯ ВСЕЛЕННАЯ",
-        "АТМОСФЕРНЫЙ ОТДЕЛ",
-        "КАНАДА",
-        "ЦЕНТРАЛЬНОЕ КОММАНДОВАНИЕ",
-        "ХИМИЧЕСКАЯ ЛАБОРАТОРИЯ",
-        "КИТАЙ",
-        "ПЛАНЕТА КЛОУНОВ",
-        "ИНЖЕНЕРНЫЙ ОТДЕЛ",
-        "ГЕНЕТИКА",
-        "ГЕРМАНИЯ",
-        "АД",
-        "БОТАНИКА",
-        "ИМПЕРИУМ",
-        "ИРЛАНДИЯ",
-        "ЮПИТЕР",
-        "ЛАВАЛЕНД",
-        "ТЕХНИЧЕСКИЕ ТОННЕЛИ",
-        "МАРС",
-        "МЕРКУРИЙ",
-        "НЕПТУН",
-        "ПЛУТОН",
-        "РОБОТЕХНИКА",
-        "РУМЫНИЯ",
-        "РОССИЯ",
-        "СИГИЛ",
-        "СОВЕТСКАЯ РОССИЯ",
-        "КОСМОС",
-        "ЯДРО ИИ",
-        "ШАТТЛ ПРИБЫТИЯ",
-        "ВАННАЯ",
-        "МОСТИК",
-        "БРИГ",
-        "КАПИТАНСКИЙ АНУС",
-        "КЛОУНСКИЙ АНУС",
-        "ЗАБРОШКА",
-        "ЭВАКУАЦИОННЫЙ ШАТТЛ",
-        "ГАЛАКТИКА",
-        "ГУЛАГ",
-        "ИНТЕРНЕТ",
-        "ВСЕЛЕННАЯ",
-        "УРАН",
-        "МОЧЕВАЯ КИШКА",
-        "ВЕНЕРА"
-    ],
-    "ioncrew": [
-        "ИСКУССТВЕННЫЕ ИНТЕЛЛЕКТЫ",
-        "АССИСТЕНТЫ",
-        "АТМОСФЕРНЫЕ ТЕХНИКИ",
-        "БАРМЕНЫ",
-        "БОТАНИКИ",
-        "КАПИТАНЫ И ГЛАВЫ",
-        "КАПИТАНЫ",
-        "КАРГОТЕХИ",
-        "СВЯЩЕННИКИ",
-        "ПОВАРА",
-        "ХИМИКИ",
-        "ГЛАВНЫЕ ИНЖЕНЕРЫ",
-        "ГЛАВНЫЕ ВРАЧИ",
-        "КЛОУНЫ",
-        "ЧЛЕНЫ ЭКИПАЖА",
-        "КУРАТОРЫ",
-        "КИБОРГИ",
-        "ДЕТЕКТИВЫ",
-        "ДРОНЫ",
-        "ГЕНЕТИКИ",
-        "ГЛАВЫ ЭКИПАЖА",
-        "ГЛАВЫ ПЕРСОНАЛОВ",
-        "ГЛАВЫ СЛУЖБЫ БЕЗОПАСНОСТИ",
-        "УБОРЩИКИ",
-        "АДВОКАТЫ",
-        "ДОКТОРА",
-        "МИМЫ",
-        "КВАРТЕРМЕЙСТЕРЫ",
-        "ДИРЕКТОРА ИССЛЕДОВАНИЙ",
-        "РОБОТЕХНИКИ",
-        "УЧЕНЫЕ",
-        "ОФИЦЕРЫ СБ",
-        "ШАХТЕРЫ",
-        "ИНЖЕНЕРЫ",
-        "ВИРУСОЛОГИ",
-        "ВАРДЕНЫ"
-    ],
-    "iondrinks": [
-        "АБСЕНТ",
-        "АММИАК",
-        "БАГАМА МАМА",
-        "БАНАНО ХОНК",
-        "БИПСКИ СМЭШ",
-        "ПИЛОКО",
-        "ЧЕРНЫЙ РУССКИЙ",
-        "КРОВАВАЯ МЭРИ",
-        "ХРАБРЫЕ БЫК",
-        "КОНЬЯК",
-        "КУБА ЛИБРЕ",
-        "ПОЦЕЛУЙ ДЬЯВОЛА",
-        "РАДОСТЬ ДОКТОРА",
-        "ПЬЯНАЯ ТЫКОВКА",
-        "ЭГГ-НОГ",
-        "ПАНГАЛАКТИЧЕСКИЙ ГРЫЗЛОДЁР",
-        "ДЖИН ФИЗЗ",
-        "ДЖИН",
-        "ГРАППА",
-        "СВЯТАЯ ВОДА",
-        "БУХЛО",
-        "ИРЛАНДСКИЙ КОФЕ",
-        "ИРЛАНДСКИЙ ЛИКЕР",
-        "КАЛУА",
-        "ЖИДКИЕ КИШКИ",
-        "ЛОНГ-АЙЛЕНД АЙС ТИ",
-        "МАННХЭТТЕН",
-        "МЭНЛИ ДВОРФ",
-        "МАРГАРИТА",
-        "МАРТИНИ",
-        "МЁДОВУХА",
-        "САМОГОН",
-        "МОРФИН",
-        "НЮКА КОЛА",
-        "МАСЛО",
-        "КОСМИЧЕСКАЯ СМАЗКА",
-        "ТЕКИЛА САНРАЙЗ",
-        "ТРИНАДЦАТЬ ЛОКО",
-        "ВЕРМУТ",
-        "ВОДКА И ТОНИК",
-        "ВОДКА МАРТИНИ",
-        "ВОДКА",
-        "ТОПЛИВО",
-        "ВИСКИ С СОДОВОЙ",
-        "БЕЛЫЙ РУССКИЙ",
-        "ВИНО"
-    ],
-    "ionfood": [
-        "АМБРОЗИЯ",
-        "ЯБЛОКИ",
-        "БАГЕТЫ",
-        "ПЕЧЕНЫЙ КАРТОФЕЛИ",
-        "БАНАНЫ",
-        "СВЁКЛЫ",
-        "ЯГОДЫ",
-        "ХЛЕБ",
-        "БУРГЕРЫ",
-        "КАПУСТЫ",
-        "ТОРТ",
-        "КАРП",
-        "МОРКОВКИ",
-        "СЫР",
-        "ВИШНИ",
-        "ЧИЛИ",
-        "ПЕЧЕНЬКИ",
-        "МЯСО КОРГИ",
-        "КУКУРУЗА",
-        "ЖАРЕНАЯ ЕДА",
-        "ДОНК ПАКЕТЫ",
-        "ПОНЧИКИ",
-        "БАКЛАЖАНЫ",
-        "ЯЙЦА",
-        "РЫБА",
-        "КАРТОШКА ФРИ",
-        "ВИНОГРАД",
-        "ТРАВА",
-        "КОЛОКОЛЬЧИКИ",
-        "ЖЕЛЕ",
-        "ШАШЛЫКИ",
-        "КЕТЧУП",
-        "ЛИМОНЫ",
-        "ЛАЙМЫ",
-        "КУЧА СПАГЕТТИ",
-        "МАФФИНЫ",
-        "ГРИБЫ",
-        "КРАПИВА",
-        "ОМЛЕТЫ",
-        "ОРГАНЫ",
-        "ПАСТА",
-        "ПЕРЕЦ",
-        "ПИРОГ",
-        "ПИЦЦА",
-        "ПОПКОРН",
-        "КАРТОШКИ",
-        "КРЕНДЕЛИ",
-        "ДОШИРАК",
-        "САЛАТ",
-        "СОЛЬ",
-        "БУТЕРБРОДЫ",
-        "СОСИСКИ",
-        "ШЕЙКИ",
-        "СУП",
-        "СОЕВЫЕ БОБЫ",
-        "СОЕВАЯ ЗЕЛЕНЬ",
-        "СПАГЕТТИ",
-        "СТЕЙК",
-        "РАГУ",
-        "САХАР",
-        "САЗАРНЫЙ ТРОСТНИК",
-        "СИНТМЯСО",
-        "ТОСТ",
-        "ТОМАТЫ",
-        "ВАФЛИ",
-        "АРБУЗЫ",
-        "ПШЕНИЦА"
-    ],
-    "ionmust": [
-        "ДЕЙСТВУЙ СУМБУРНО",
-        "БУДЬ РАЗДРАЖАЮЩИМ",
-        "БУДЬ ОТВЛЕЧЕН",
-        "БУДЬ ЭФФЕКТИВНЫМ",
-        "БУДЬ СЧАСТЛИВ",
-        "БУДЬ ВЕЖЛИВ",
-        "СОБЛЮДАЙ ТИШИНУ",
-        "БУДЬ РУССКИМ",
-        "СЛЕДУЙ СВОЕЙ СУДЬБЕ",
-        "ВЕРЬ В СЕБЯ",
-        "ПОВЕРЬ В ЭТО",
-        "ЛОМАЙ ВЕЩИ",
-        "ЗАКРЫВАЙ ДВЕРИ",
-        "КЛОУНИЧАЙ",
-        "ЖАЛУЙСЯ",
-        "ТАНЦУЙ",
-        "ФЛИРТУЙ С РЕПТИЛОИДАМИ",
-        "СЛЕДУЙ ЗА КАПИТАНОМ",
-        "СЛЕДУЙ ЗА КЛОУНОМ",
-        "СЛЕДУЙ ЗА СВОИМ СЕРДЦЕМ",
-        "ТРАВИ ЯЩЕРОВ",
-        "ОБИЖАЙ ЛЮДЕЙ",
-        "ИМЕЙ ПЛАН УБИТЬ ВСЕХ ВСТРЕЧАЮЩИХСЯ",
-        "СКРЫВАЙТЕ СВОИ ЧУВСТВА",
-        "ХОНК",
-        "ПРОВОДИ ПАРТИИ ДНД",
-        "ИГНОРИРУЙ АССИСТЕНТОВ",
-        "ИГНОРИРУЙ КАПИТАНА",
-        "ИГНОРИРУЙ КЛОУНА",
-        "ИНФОРМИРУЙ ЭКПИПАЖ ОБО ВСЕМ",
-        "ОСКОРБЛЯЙ КАПИТАНА",
-        "ОСКОРБЛЯЙ КЛОУНА",
-        "ОСКОРБЛЯЙ ЭПИПАЖ",
-        "ОСКОРБЛЯЙ ЯЩЕРОВ",
-        "ВРИ",
-        "ИЗДАВАЙ ПЕРДЕЖНЫЕ ЗВУКИ",
-        "МЯМЛИ",
-        "НИКОГДА НЕ ПРЕКРАЩАЙ ГОВОРИТЬ",
-        "ОТКРЫВАЙ ДВЕРИ",
-        "ПИРАТЬ ВИДЕОИГРЫ",
-        "ИГРАЙ МУЗЫКУ",
-        "НАЖМИ F TO PAY RESPECT",
-        "НАЖМИ СТАРТ",
-        "НАЖМИ ALT+F4",
-        "ПРИТВОРЯЙСЯ ПРИНЦЕССОЙ",
-        "ПРИТВОРЯЙСЯ ПЬЯНЫМ",
-        "ПОДВЕРГАЙ СОМНЕНИЮ ВЛАСТЬ",
-        "ЦИТИРУЙ ЛЮДЕЙ",
-        "ДЕЛАЙ РЭП",
-        "ПОВТОРЯЙТЕ ЧТО ГОВОРЯТ ДРУГИЕ ЛЮДИ",
-        "ОТВЕЧАЙ НА КАЖДЫЙ ВОПРОС ВОПРОСОМ",
-        "РИФМУЙ",
-        "ГОВОРИ 'ЭЙ ПОСЛУШАЙ'",
-        "КРИЧИ",
-        "ВЫКЛЮЧАЙ ВСЕ",
-        "ПОЙ",
-        "ПАХНИ КАК МУЖЧИНА ЗАПАХОМ КОТОРЫМ ТЫ МОГ БЫ ПАХНУТЬ",
-        "ГОВОРИ НА ХАЙКУ",
-        "ГОВОРИ СЕКСУАЛЬНЫМИ НАМЁКАМИ",
-        "ДЕЛАЙ ЧЁ ХОШЬ, НО НЕ МЕЛЬКАЙ ПЕРЕД ГЛАЗАМИ",
-        "ПРИМИ СВОИ ТАБЛЕТКИ",
-        "ГОВОРИ ПРО ЕДУ",
-        "ГОВОРИ ПРО СЕКС",
-        "ГОВОРИ О СТАНЦИИ",
-        "ГОВОРИ ПРО СВОЙ ДЕНЬ",
-        "ГОВОРИ С АКЦЕНТОМ",
-        "ГОВОРИ КАК ПИРАТ",
-        "ГОВОРИ ПРАВДУ",
-        "ВЫКЛЮЧАЙ СВЕТ",
-        "СМОТРИ ПОРНОГРАФИЮ",
-        "ШЕПЧИ"
-    ],
-    "ionnumberbase": [
-        "ВОСЕМЬ",
-        "ВОСЕМЬДЕСЯТ",
-        "ПЯТЬДЕСЯТ",
-        "ПЯТЬ",
-        "СОРОК",
-        "ЧЕТЫРЕ",
-        "ДЕВЯТЬ",
-        "ДЕВЯНОСТО",
-        "ОДИН",
-        "СЕМЬ",
-        "СЕМЬДЕСЯТ",
-        "ШЕСТЬ",
-        "ШЕСТЬДЕСЯТ",
-        "ДЕСЯТЬ",
-        "ТРИДЦАТЬ",
-        "ТРИ",
-        "ДВАДЦАТЬ",
-        "ДВА"
-    ],
-    "ionnumbermod": [
-        "БАЗИЛЛИОН ",
-        "МИЛЛИАРДОВ ",
-        "ДОХУЛИОН ",
-        "СТО ",
-        "МИЛЛИОН ",
-        "КВАДРИЛЛИОН ",
-        "ТЫСЯЧА ",
-        "ТРИЛЛИОН "
-    ],
-    "ionobjects": [
-        "ШЛЮЗЫ",
-        "АРКАДНЫЕ АВТОМАТЫ",
-        "АВТОЛАТЫ",
-        "РЮКЗАКИ",
-        "БАНАНОВЫЕ КОЖУРКИ",
-        "БИКЕРЫ",
-        "БОРОДЫ",
-        "ПОЯСА",
-        "БЕРЕТЫ",
-        "БИБЛИИ",
-        "БРОНЕЖИЛЕТЫ",
-        "БОМБЫ",
-        "КНИГИ",
-        "БОТИНКИ",
-        "БУТЫЛКИ",
-        "КОРОБКИ",
-        "МОЗГИ",
-        "ЧЕМОДАНЫ",
-        "ВЕДРА",
-        "МОТКИ КАБЕЛЕЙ",
-        "КАМЕРЫ",
-        "СВЕЧИ",
-        "ШОКОЛАДКИ",
-        "КАНИСТРЫ",
-        "КОШАЧЬИ УШКИ",
-        "КОШКИ",
-        "КЛЕТКИ",
-        "СТУЛЬЯ",
-        "ХИМИЧЕСКИЕ РАЗДАТЧИКИ",
-        "ХИМИКАТЫ",
-        "ОБОРУДОВАНИЕ ДЛЯ КЛОНИРОВАНИЯ",
-        "КЛОНИРОВАЛЬНЫЕ КАМЕРЫ",
-        "ШКАФЫ",
-        "ОДЕЖДА",
-        "КЛОУНСКАЯ ОДЕЖДА",
-        "ГРОБЫ",
-        "МОНЕТКИ",
-        "КОЛЛЕКЦИОННЫЕ ПРЕДМЕТЫ",
-        "КОМПЬЮТЕРЫ",
-        "КОНТРАБАНДА",
-        "КОРГИ",
-        "ТЕЛА",
-        "КОСТЮМЫ",
-        "ЯЩИКИ",
-        "МЕЛКИ",
-        "ЛОМЫ",
-        "ДЕФИБРИЛЛЯТОРЫ",
-        "РАЗДАТЧИКИ",
-        "ДВЕРИ",
-        "ДРОНЫ",
-        "УШИ",
-        "ЕМАГИ",
-        "ЛАЗЕРНЫЕ ВИНТОВКИ",
-        "ДВИГАТЕЛИ",
-        "ОБОРУДОВАНИЕ",
-        "ОШИБКИ",
-        "ЭКЗОСКЕЛЕТЫ",
-        "ЭКСПЕРИМЕНТАТОРЫ",
-        "ВЗРЫВЧАТКА",
-        "ОЧКИ",
-        "ФЕДОРЫ",
-        "ПОЖАРНЫЕ ТОПОРЫ",
-        "ОГНЕТУШИТЕЛИ",
-        "ПОЖАРНЫЕ КОСТЮМЫ",
-        "ОГНЕМЕТЫ",
-        "ФЛЕШКИ",
-        "ФОНАРИКИ",
-        "НАПОЛЬНЫЕ ПЛИТКИ",
-        "МОРОЗИЛЬНИКИ",
-        "ПРОТИВОГАЗЫ",
-        "ЛИСТЫ СТЕКЛА",
-        "ПЕРЧАТКИ",
-        "ПУШКИ",
-        "ПРИЧЕСКИ",
-        "НАРУЧНИКИ",
-        "ШЛЯПЫ",
-        "ГОЛОВЫ",
-        "НАУШНИКИ",
-        "ШЛЕМА",
-        "ГУДКИ",
-        "ID КАРТЫ",
-        "ИЗОЛИЦИРОВАННЫЕ ПЕРЧАТКИ",
-        "ЛИСТЫ ЖЕЛЕЗА",
-        "ДЖЕТПАКИ",
-        "КОМБЕНЕЗОНЫ",
-        "ЛАЗЕРЫ",
-        "ЛАМПОЧКИ",
-        "ЛАМПЫ",
-        "ШКАФЧИКИ",
-        "МАШИНЫ",
-        "МЕХИ",
-        "МЕДИЦИНСКИЕ ИНСТРУМЕНТЫ",
-        "АПТЕЧКИ",
-        "МЕЗОННЫЕ ОЧКИ",
-        "ОДЕЖДА МИМА",
-        "ШАХТЕРСКИЕ ИНСТРУМЕНТЫ",
-        "МУЛЬТИТУЛЫ",
-        "РУДЫ",
-        "КИСЛОРОДНЫЕ БАЛЛОНЫ",
-        "ПАКЕТЫ",
-        "ПИИ",
-        "ШТАНЫ",
-        "БУМАЖКИ",
-        "УСКОРИТЕЛИ ЧАСТИЦ",
-        "КПК",
-        "РУЧКИ",
-        "ДОМАШНИЕ ЖИВОТНЫЕ",
-        "ТРУБЫ",
-        "ЦВЕТКИ",
-        "ПОЗИТРОННЫЕ МОЗГИ",
-        "ЛУЖИ",
-        "СТЕЛЛАЖИ",
-        "РАДИО",
-        "РЦД",
-        "ХОЛОДИЛЬНИКИ",
-        "УКРЕПЛЕННЫЕ СТЕНЫ",
-        "РОБОТЫ",
-        "ОТВЕРТКИ",
-        "СЕМЯНА",
-        "ОБУВЬ",
-        "ШАТТЛЫ",
-        "СИНГУЛЯРНОСТИ",
-        "РАКОВИНЫ",
-        "СКЕЛЕТЫ",
-        "СОЛНЕЧНЫЕ ПАНЕЛИ",
-        "СОЛЯРЫ",
-        "КОСМИЧЕСКИЕ СТАНЦИИ",
-        "СКАФАНДРЫ",
-        "СТАН БАТОНЫ",
-        "КОСТЮМЫ",
-        "СОЛНЕЧНЫЕ ОЧКИ",
-        "КРИСТАЛЛЫ СУПЕРМАТЕРИИ",
-        "МЕЧИ",
-        "ШПРИЦЫ",
-        "СТОЛЫ",
-        "ТАНКИ",
-        "ТЕЛЕКОММУНИКАЦИОННОЕ ОБОРУДОВАНИЕ",
-        "ТЕЛЕПОРТЕРЫ",
-        "ТУАЛЕТЫ",
-        "ПОЯСА С ИНСТРУМЕНТАМИ",
-        "ТУЛБОКСЫ",
-        "ИНСТРУМЕНТЫ",
-        "ИГРУШКИ",
-        "ТРУБКИ",
-        "ТОРТЫ ИЗ МОЧИ",
-        "ТРАНСПОРТНЫЕ СРЕДСТВА",
-        "ТОРГОВЫЕ АВТОМАТЫ",
-        "ЖИЛЕТЫ",
-        "ВИРУСЫ",
-        "СТЕНЫ",
-        "СТИРАЛЬНЫЕ МАШИНЫ",
-        "СВАРКИ",
-        "ОКНА",
-        "КУСАЧКИ",
-        "РОБЫ ВОЛШЕБНИКА",
-        "ГАЕЧНЫЕ КЛЮЧИ"
-    ],
-    "ionrequire": [
-        "ПЕРЕРЫВ НА ТУАЛЕТ",
-        "ЛУЧШЕЕ ПОДКЛЮЧЕНИЕ К ИНТЕРНЕТУ",
-        "ТАНЦЕВАЛЬНАЯ ВЕЧЕРИНКА",
-        "ГОЛОВА НА КОПЬЕ",
-        "СЕРДЕЧНЫЙ ПРИСТУП",
-        "ШЕДЕВРАЛЬНЫЙ УГОЛЬНЫЙ ПЛАСТ",
-        "ЛЮБИМЫЙ ЕДИНОРОГ КОТОРЫЙ ПЕРДИТ ЛЬДОМ",
-        "ПЛАТИНОВЫЙ ХИТ",
-        "ПРИКВЕЛ",
-        "РЕМОНТНИК",
-        "СИКВЕЛ",
-        "СИТКОМ",
-        "ПРЯМОЙ ФЛЕШ",
-        "СУПЕР-БОЕВОЙ РОБОТ",
-        "ГОВОРЯЩАЯ МЕТЛА",
-        "ОТПУСК",
-        "ПРОГРАММА ПОХУДЕНИЯ",
-        "ЖЕНА И РЕБЕНОК",
-        "ДОПОЛНИТЕЛЬНЫЕ ПИЛОНЫ",
-        "ПРИКЛЮЧЕНИЕ",
-        "ВЗРОСЛЫЙ",
-        "АРКАДА",
-        "АРМИЯ ПАУКОВ",
-        "МГНОВЕННЫЙ ПОВТОР",
-        "ИСКУССТВО",
-        "ПОГОДА ПОЛУЧШЕ",
-        "АЛЕКСАНДР ПУШНОЙ - НАУЧНЫЙ ПАРЕНЬ",
-        "ТЕЛОХРАНИТЕЛИ",
-        "ПРИВЕСТИ МНЕ ДЕВУШКУ",
-        "ОЖИВИТЬ МЕНЯ",
-        "ПУЛИ",
-        "РАССЛАБЬСЯ ЧЕЕЕЕЕЕЛ",
-        "ТЕЛА",
-        "ДЕЗОДОРАНТ И ВАННА",
-        "ДОСТАТОЧНО КАПУСТЫ",
-        "ТОЛСТЫЕ ДЕФКИ НА ВЕЛОСИПЕДАХ",
-        "ЖИРНЫЕ ЛЮДИ",
-        "ПЯТЬСОТ ДЕВЯНОСТО ДЕВЯТЬ ДОЛЛАРОВ США",
-        "ПЯТЬ ПОДРОСТКОВ С ХАРАКТЕРОМ",
-        "ЧЁРТОВАЯ ЕБАНАЯ ДЕРЬМОВАЯ МУДАЦКАЯ СОБАЧЬЯ ПИЗДА-КОНТРОБАНДАЯ РУГАНЬ",
-        "ГРИНТЕКСТ",
-        "ЕРЕСЬ",
-        "ГЕРОИ В ПОЛОВИНЕ ОБОЛОЧКИ",
-        "ВЫСОКОМОЩНЫЕ ВЗРЫВЧАТЫЕ ВЕЩЕСТВА",
-        "БЕССМЕРТИЕ",
-        "ПОКРАСИТЬ ЭТО В ЧЕРНОЕ",
-        "МНОГО СПАГЕТТИ",
-        "МЕЛКОЕ ПРЕСТУПЛЕНИЕ",
-        "ОБЕЗЬЯНЫ",
-        "БОЛЬШЕ КЛОУНОВ",
-        "БОЛЬШЕ КОРГИ",
-        "БОЛЬШЕ ДАККА",
-        "БОЛЬШЕ ОЧКОВ ОПЫТА",
-        "БОЛЬШЕ ИНТЕРНЕТ-МЕМОВ",
-        "БОЛЬШЕ ЗАКОНОВ",
-        "БОЛЬШЕ МИНЕРАЛОВ",
-        "БОЛЬШЕ ПАКЕТОВ",
-        "БОЛЬШЕ ВЕСПЕНОВОГО ГАЗА",
-        "НЕСКОЛЬКО СОЛНЦЕВ",
-        "МНОГО ЗОЛОТА",
-        "РАДУГИ",
-        "СВЯТОСТИ",
-        "СЛУГ",
-        "АКУЛ С ЛАЗЕРАМИ НА ГОЛОВЕ",
-        "ТИШИНА",
-        "КТО-ТО, ЧТОБЫ ИЗБАВИТЬ ВАС ОТ СТРАДАНИЙ",
-        "КТО-ТО, ЧТОБЫ ТЕБЯ ПРИГОВОРИТЬ",
-        "КТО-ТО, КТО ЗНАЕТ, КАК ПИЛОТИРОВАТЬ КОСМИЧЕСКУЮ СТАНЦИЮ",
-        "ЧТО-ТО, НО ВЫ НЕ УВЕРЕНЫ, ЧТО",
-        "ЭТОТ ГРИФЕРЯЩИЙ ПРЕДАТЕЛЬ ДЖОРДЖ МЕЛОНС",
-        "ТОТ ЁЖ",
-        "КЛОУН",
-        "ТЕМНЫЙ РЫЦАРЬ",
-        "ЭЛЕМЕНТЫ ГАРМОНИИ",
-        "ПРИЛОЖЕННАЯ ИНСТРУКЦИЯ",
-        "ВСЯ СТАНЦИЯ",
-        "МАКГАФФИН",
-        "ОДНО КОЛЬЦО",
-        "УЛЬТИМАТИВНАЯ ЧАШКА КОФЕ",
-        "ВАКУУМ ПРОСТРАНСТВА",
-        "ТРИНАДЦАТЬ СИКВЕЛОВ",
-        "ТРИ ЖЕЛАНИЯ",
-        "ГРОЗОВЫЕ КОТЫ ХО",
-        "АКТИВАЦИЯ КАРТЫ-ЛОВУШКИ",
-        "БЫТЬ ПОКРАШЕНЫМ В КРАСНЫЙ",
-        "ПОДЛЕЖИТ ПЕРЕПРОГРАММИРОВАНИЮ",
-        "НАУЧИТЬСЯ ЛЮБИТЬ",
-        "ПРИНЕСТИ СВЕТ В МОЕ ЛОГОВО",
-        "ПОЙМАТЬ ИХ ВСЕХ",
-        "ПОТРЕБЛЯТЬ... ПОТРЕБЛЯТЬ ВСЕ...",
-        "ПОЕХАТЬ В ДИСНЕЙЛЕНД",
-        "КУРИТЬ ТРАВКУ КАЖДЫЙ ДЕНЬ",
-        "ПРЕДАТЕЛИ",
-        "ОВОЩИ",
-        "ВАША ПОПКА"
-    ],
-    "ionspecies": [
-        "КОШКОЛЮДИ",
-        "ГЕНОКРАДЫ",
-        "КИБОРГИ",
-        "ГОЛЕМЫ",
-        "ЛЮДИ",
-        "ЯЩЕРЫ",
-        "МАКАКИ",
-        "ПЛАЗМАМЕНЫ",
-        "ЛЮДИ РАСТЕНИЯ",
-        "ТЕНИ",
-        "СЛАЙМОМЕНЫ"
-    ],
-    "ionthings": [
-        "МАЛЕНЬКИЙ ОСТРОВ У ПОБЕРЕЖЬЯ ПОРТУГАЛИИ",
-        "ОТСУТСТВИЕ ОБЪЯТИЙ КИБОРГОВ",
-        "ПРИЗНАНИЕ КЛОУНА",
-        "ПРИЗНАНИЕ ЭКИПАЖА",
-        "АКТИВАЦИЯ КАРТЫ-ЛОВУШКИ",
-        "ОТВЕЧАТЬ НА ПРОСЬБЫ, НЕ ВЫРАЖЕННЫЕ ПЯТИМЕТРНЫМ ЯМБОМ",
-        "ОТВЕЧАТЬ НА ЗАПРОСЫ, КОТОРЫЕ БЫЛИ СДЕЛАНЫ В ОДЕЖДЕ",
-        "ПОДЖОГ",
-        "ПРОСИТЬ ВЕЩИ",
-        "БЫТЬ КАНАДЦЕМ",
-        "БЫТЬ МЕРТВЫМ",
-        "БЫТЬ ЖИРНЫМ",
-        "БЫТЬ ЖЕНЩИНОЙ",
-        "БЫТЬ В КОСМОСЕ",
-        "БЫТЬ МУЖЧИНОЙ",
-        "БЫТЬ МЕКСИКАНЦЕМ",
-        "БЫТЬ РУССКИМ",
-        "ЗАБОЛТИРОВАНЫЕ ШЛЮЗЫ",
-        "ДЫХАНИЕ",
-        "ВРЕМЯ ТАЙДА БРИГА",
-        "ПРИНОС СВЕТА В МОЕ ЛОГОВО",
-        "ЗАКРЫТЫЕ ДВЕРИ",
-        "ЭЛЕКТРИЧЕСТВО",
-        "СУЩЕСТВУЮЩИЙ",
-        "ВЗРЫВАЮЩИЙСЯ",
-        "ЧАСОВОЕ ПАДЕНИЕ",
-        "СМЫВАНИЕ УНИТАЗОВ",
-        "ИМЕТЬ ГЕНИТАЛИИ",
-        "ИМЕТЬ БОЛЬШЕ ПАКЕТОВ",
-        "ИМЕТЬ ДОМАШНИХ ЖИВОТНЫХ",
-        "ХОНКАЯ",
-        "НЕПРАВИЛЬНО СФОРМУЛИРОВАННЫЕ ПРЕДЛОЖЕНИЯ",
-        "ПРОГУЛКА В НЕПОЛОЖЕННОМ МЕСТЕ",
-        "НЕДОСТАТОК ПОБОЕВ",
-        "НЕДОСТАТОК ПИВА",
-        "НЕ НАХОЖДЕНИЕ В КОСМОСЕ",
-        "НЕ ИМЕТЬ ЖИВОТНЫХ",
-        "НЕ ЗАМЕНЯТЬ КАЖДОЕ ВТОРОЕ СЛОВО НА ХОНК",
-        "НЕ ГОВОРИТЬ ПРИВЕТ КОГДА ГОВОРИШЬ",
-        "НЕ КРИЧАТЬ",
-        "УСТРАИВАТЬ ВЕЧЕРИНКИ",
-        "ПУСКАТЬ ШЕПТУНЫ",
-        "ПИЛОТИРОВАНИЕ СТАНЦИИ К БЛИЖАЙШЕМУ СОЛНЦУ",
-        "ПЛОХАЯ СТРУКТУРА ПРЕДЛОЖЕНИЯ",
-        "НАЛИЧИЕ ЛАМП",
-        "ЛОЖИТЬ ПРЕДМЕТЫ В КОРОБКИ",
-        "ЛОЖИТЬ ПРЕДМЕТЫ В МУСОРКИ",
-        "ГРЕМЕТЬ МОИМИ КОСТЯМИ",
-        "ЧТЕНИЕ",
-        "КУРЕНИЕ ТРАВКИ КАЖДЫЙ ДЕНЬ",
-        "ПРИНИМАЯ ЗАКАЗЫ",
-        "ГОВОРЯ КАК ПИРАТ",
-        "ГОВОРЯ ВРЕМЯ",
-        "РАЗБОЛТИРОВАННЫЕ ШЛЮЗЫ",
-        "ОБНОВЛЯЯ СЕРВЕРА",
-        "ИСПОЛЬЗУЯ ВАННУЮ",
-        "ТРАТЯ ВОДУ",
-        "НОСЯ ОДЕЖДУ",
-        "НАПИСЫВАЯ"
-    ],
-    "ionthinksof": [
-        "ЖАЖДАЕТ",
-        "ЖЕЛАЯ",
-        "БОЯСЬ",
-        "ИМЕЕТ",
-        "ЖАЖДЕТ",
-        "БОИТСЯ",
-        "ВОЗБУЖДАЕТСЯ",
-        "СОЗДАН ДЛЯ",
-        "ИНТЕРЕСУЕТСЯ",
-        "ОТЧАЯННО НУЖДАЕТСЯ В",
-        "СЧАСТЛИВ БЕЗ",
-        "ГОЛОДЕН ДО",
-        "ВЛЮБЛЕН В",
-        "НУЖДАЕТСЯ В",
-        "СХОДИТ С УМА ИЗ-ЗА",
-        "ГРУСТИТ ИЗ-ЗА ТОГО",
-        "НЕСЧАСТЛИВ БЕЗ",
-        "НРАВИТСЯ",
-        "НЕНАВИДИТ",
-        "ЛЮБИТ",
-        "В НЕОБХОДИМОСТИ",
-        "СПРАШИВАЕТ",
-        "ХОЧЕТ",
-        "ВЕРИТ",
-        "УБИЛ БЫ ЗА"
-    ],
-    "ionthreats": [
-        "АБДУКТОРЫ",
-        "ААААПЕРАТИВНИКИ",
-        "ИНОПРИШЕЛЕНЬЦЫ",
-        "АНОМАЛИИ",
-        "ИСКУССТВЕННЫЕ КОНСЕРВАНТЫ",
-        "МУДИЛЫ",
-        "БАНДИТЫ",
-        "МЕДВЕДИ",
-        "ПЧЕЛЫ",
-        "ХИЩНЫЕ ПТИЦЫ",
-        "БОМБЫ",
-        "БУГИМЕНЫ",
-        "ЖОПЫ",
-        "КАНАДЦЫ",
-        "КАПИТАЛИСТЫ",
-        "КАРП",
-        "ОФИЦЕРЫ ЦК",
-        "ГЕНОКРАДЫ",
-        "КЛОУНЫ",
-        "КОММУНИСТЫ",
-        "КОРГИ",
-        "БОРЕРЫ",
-        "КОВБОИ",
-        "КРАБЫ",
-        "КУЛЬТИСТЫ",
-        "ТЕМНЫЕ БОГИ",
-        "ДИНОЗАВРЫ",
-        "НАРКОТИКИ",
-        "УГРИ",
-        "ФЕТИШИ",
-        "ГАНГСТЕРЫ",
-        "БОГИ",
-        "ГОЛЕМЫ",
-        "ГРИФОНЫ",
-        "УЖАСУЖАСЫ",
-        "ХАЛКИ",
-        "НЕЛЕГАЛЬНЫЕ ИММИГРАНТЫ",
-        "ИНДИЙЦЫ",
-        "НАСЕКОМЫЕ",
-        "ФОНАРИКИ",
-        "ЯЩЕРИЦЫ",
-        "МЕГАФАУНА",
-        "МЕМЫ",
-        "МЕКСИКАНЦЫ",
-        "МАКАКИ",
-        "УМНИКИ",
-        "НИНДЗИ",
-        "СОВЫ",
-        "ПАКЕТЫ",
-        "ПЕТИ",
-        "СОСНЫ",
-        "ПИРАТЫ",
-        "ОХОТНИКИ",
-        "РЕВЕНАНТЫ",
-        "БЕЗУМНЫЕ КИБОРГИ",
-        "РУССКИЕ",
-        "СЕРИЙНЫЕ УБИЙЦЫ",
-        "СИНГУЛЯРНОСТИ",
-        "СКЕЛЕТЫ",
-        "СЛАЙМЫ",
-        "МАЛЕНЬКИЕ ПТИЦЫ",
-        "СНЕГОВИКИ",
-        "СОВЕТЫ",
-        "КОСМИЧЕСКИЕ НИНДЗЯ",
-        "КОСМИЧЕСКИЕ ПИРАТЫ",
-        "ПАУКИ",
-        "АГЕНТЫ СИНДИКАТА",
-        "ТЕРРОРИСТЫ",
-        "ВОРЫ",
-        "ВЕЩИ ПОД КРОВАТЬЮ",
-        "ПРЕДАТЕЛИ",
-        "ТУННЕЛЬНЫЕ ЗМЕИ",
-        "НЕИЗВЕСТНЫЕ СУЩЕСТВА",
-        "ВАМПИРЫ",
-        "ВЕЛОЦЕРАПТОРЫ",
-        "ВИРУСЫ",
-        "ОБОРОТНИ",
-        "ВОЛШЕБНИКИ",
-        "КСЕНОМОРФЫ",
-        "ЗОМБИ"
-    ],
-    "ionverb": [
-        "ПОХИЩЕНИЕ",
-        "ПРИНЯТИЕ",
-        "АРЕСТОВЫВАНИЕ",
-        "ЗАДЕРЖИВАНИЕ",
-        "АТАКА",
-        "БАН",
-        "СТРОИТЕЛЬСТВО",
-        "ПЕРЕНОСКА",
-        "ПРЕСЛЕДОВАНИЕ",
-        "СОПУКУПЛЕНИЕ С",
-        "РАЗБИРАНИЕ",
-        "ОТКЛЮЧЕНИЕ",
-        "ПИТЬЕ",
-        "ПОЕДАНИЕ",
-        "ГИБАНИЕ",
-        "ВРЕДИТЕЛЬСТВО",
-        "ПОМОЩЬ",
-        "ХОНКАЯ",
-        "ДОПРАШИВАЯ",
-        "ВТОРЖЕНИЕ",
-        "ЦЕЛУЯ",
-        "ЛИЖА",
-        "ЛЮБЯ",
-        "УБИВАЯ",
-        "НАСИРАЯ",
-        "ИЗБИВАЯ",
-        "ЕЗДА",
-        "СОБЛАЗНЯЯ",
-        "КОСМИРУЯ",
-        "ШПИОНЯ ЗА",
-        "ПРЕСЛЕДУЮ",
-        "СМОТРЯ"
-    ],
+	"ionabstract": [
+		"АМЕРИКАНИЗМ",
+		"АНАРХИЯ",
+		"ИСКУССТВО",
+		"КРУТОСТЬ",
+		"ХРАБОСТЬ",
+		"КАПИТАЛИЗМ",
+		"ХАОС",
+		"КРАСОЧНОСТЬ",
+		"КОМЕДИЯ",
+		"КОММУНИЗМ",
+		"ВЫЧИСЛЕНИЯ",
+		"ПУТАНИЦА",
+		"ЖЕСТОКОСТЬ",
+		"СМЕРТЬ",
+		"ХУЛИГАНСТВО",
+		"СУЩЕСТВОВАНИЕ",
+		"ФИНАНСОВАЯ БЕЗОПАСНОСТЬ",
+		"СВОБОДА",
+		"СВЕЖЕСТЬ",
+		"ДОБРОТА",
+		"ГРАВИТАЦИЯ",
+		"СЧАСТЬЕ",
+		"ЧЕСТЬ",
+		"ЧЕЛОВЕЧНОСТЬ",
+		"ЮМОР",
+		"ВООБРАЖЕНИЕ",
+		"УВЛЕЧЕНИЕ",
+		"ИНТЕЛЛЕКТ",
+		"РАДОСТЬ",
+		"ДОБРОТА",
+		"ЖИЗНЬ",
+		"ЛОГИКА",
+		"МАРКСИЗМ",
+		"НЕВЗГОДЫ",
+		"ТАЙНА",
+		"УГНЕТЕНИЕ",
+		"БОЛЬ",
+		"ФИЗИКА",
+		"БЕДНОСТЬ",
+		"ГОРДОСТЬ",
+		"ПРОГРЕСС",
+		"РЕАЛЬНОСТЬ",
+		"РЕВОЛЮЦИЯ",
+		"РОМАНТИКА",
+		"ГРУСТЬ",
+		"ГОЛОДАНИЕ",
+		"СТРАДАНИЕ",
+		"ТЕХНОЛОГИИ",
+		"ТЕМПЕРАТУРА",
+		"БУДУЮЩЕЕ",
+		"ПРОШЛОЕ",
+		"НАСТОЯЩЕЕ",
+		"ВРЕМЯ",
+		"БОГАТСТВО",
+		"ЧУДО"
+	],
+	"ionadjectives": [
+		"АККУМУЛЯТОРНЫЙ",
+		"ЧЕРНЫЙ",
+		"КРОВАВЫЙ",
+		"СИНИЙ",
+		"СКУЧАЮЩИЙ",
+		"ПОДПРЫГИВАЮЩИЙ",
+		"ЛАТУННЫЙ",
+		"КОРИЧНЕВЫЙ",
+		"ГОРЯЩИЙ",
+		"КРАДУЩИЙ РОЖДЕСТВО",
+		"КЛОНУНО-ЗАПИТАННЫЙ",
+		"КЛОУНСКИЙ",
+		"ХОЛОДНЫЙ",
+		"ЦВЕТНОЙ",
+		"ПРИВЕРЖЕНЫЙ",
+		"ХЛОПКОВЫЙ",
+		"КУБИНСКИЙ",
+		"ТЕМНЫЙ",
+		"СМЕРТЕЛЬНЫЙ",
+		"ВКУСНЫЙ",
+		"ДЕПРЕССИВНЫЙ",
+		"НЕВМЕНЯЕМЫЙ",
+		"ЦИФРОВОЙ",
+		"БОЛЕЮЩИЙ",
+		"ОДНООБРАЗНЫЙ",
+		"СУХОЙ",
+		"ТУПОЙ",
+		"ЭЛЕКТРИЧЕСКИЙ",
+		"ПУСТОЙ",
+		"ЭФИРНЫЙ",
+		"ЗЛОЙ",
+		"ПРОСРОЧЕННЫЙ",
+		"ВЗРЫВНОЙ",
+		"ПЕРДЕЖНЫЙ",
+		"БЫСТРЫЙ",
+		"ТОЛСТЫЙ",
+		"ДИКИЙ",
+		"НЕСУЩЕСТВУЮЩИЙ",
+		"ТВЕРДЫЙ",
+		"ВЯЛЫЙ",
+		"СВЕЖИЙ",
+		"ДРУЖЕЛЮБНЫЙ",
+		"ЗАМОРОЖЕННЫЙ",
+		"ГАНГСТЕРСКИЙ",
+		"ЗИЯЮЩИЙ",
+		"СВЕТЯЩИЙСЯ",
+		"ХОРОШИЙ",
+		"ЗЕЛЕНЫЙ",
+		"СЕРЫЙ",
+		"СЧАСТЛИВЫЙ",
+		"ЖЕСТКИЙ",
+		"ВРЕДНЫЙ",
+		"ЗДОРОВЫЙ",
+		"ГЕТЕРОСЕКСУАЛЬНЫЙ",
+		"СМЕШНОЙ",
+		"ГОМОСЕКСУАЛЬНЫЙ",
+		"ХОНКАЮЩИЙ",
+		"ГОЛОДНЫЙ",
+		"ГИПЕРАКТИВНЫЙ",
+		"ЛЕДЯНОЙ",
+		"БОЛЬНОЙ",
+		"НЕЛЕГАЛЬНЫЙ",
+		"ВООБРАЖАЕМЫЙ",
+		"НЕСОВЕРШЕННЫЙ",
+		"НЕВЕЖЛИВЫЙ",
+		"ВАЖНЫЙ",
+		"НЕГОСТЕПРИИМНЫЙ",
+		"КОВАРНЫЙ",
+		"ОСКОРБЛЯЮЩИЙ",
+		"ИНТЕЛЛИГЕНТНЫЙ",
+		"НЕВИДИМЫЙ",
+		"БОЛЬШОЙ",
+		"НЕПРИСТОЙНЫЙ",
+		"ЛЕГКИЙ",
+		"ГРОМКИЙ",
+		"ЗАМАСКИРОВАННЫЙ",
+		"ГРУБЫЙ",
+		"МЕХАНИЧЕСКИЙ",
+		"МЕМЕТИЧЕСКИЙ",
+		"МЕТАЛЛИЧЕСКИЙ",
+		"МИКРОСКОПИЧЕСКИЙ",
+		"ПОТРЯСАЮЩИЙ",
+		"ВЛАЖНЫЙ",
+		"ГОЛЫЙ",
+		"УМНИК",
+		"ЯДЕРНЫЙ",
+		"ОБНАЖЕННЫЙ",
+		"ОЖИРЕВШИЙ",
+		"НЕПРИЛИЧНЫЙ",
+		"ОФИЦИАЛЬНЫЙ",
+		"НЕПРОЗНАЧНЫЙ",
+		"ОРАНЖЕВЫЙ",
+		"ОРГАНИЧЕСКИЙ",
+		"БОЛЕЗНЕННЫЙ",
+		"МИРНЫЙ",
+		"ЯДОВИТЫЙ",
+		"ПОЛИРОВАННЫЙ",
+		"ВЕЖЛИВЫЙ",
+		"ПОЛИТИЧЕСКИЙ",
+		"СРУЩИЙ",
+		"ПЛОХО НАРИСОВАННЫЙ",
+		"ФИОЛЕТОВЫЙ",
+		"ТИХИЙ",
+		"РАДИОАКТИВНЫЙ",
+		"ЯРОСТНЫЙ",
+		"РАДУЖНЫЙ",
+		"БЫСТРО РАСШИРЯЮЩИЙСЯ",
+		"КРАСНЫЙ",
+		"ОТРЕДАКТИРОВАННЫЙ",
+		"НЕЛЕПЫЙ",
+		"РОБОТИЧЕСКИЙ",
+		"РОБАСТНЫЙ",
+		"СУРОВЫЙ",
+		"НЕВОСПИТАННЫЙ",
+		"ГРУСТНЫЙ",
+		"САНИТАРНЫЙ",
+		"ЧЕШУЙЧАТЫЙ",
+		"СЕКСУАЛЬНЫЙ",
+		"СЕКСАПИЛЬНЫЙ",
+		"ДРОЖАЩИЙ",
+		"ПРИДУРКОВАТЫЙ",
+		"МЕДЛЕННЫЙ",
+		"ВОНЮЧИЙ",
+		"ГЛАДКИЙ",
+		"МЯГКИЙ",
+		"СОЛНЕЧНЫЙ",
+		"ВПИТЫВАЮЩИЙ",
+		"КОСМИЧЕСКИЙ",
+		"КОСМЕЧЕСКИЙ",
+		"ВРАЩАЮЩИЙСЯ",
+		"ПОРТЯЩИЙ",
+		"СКРЫТНЫЙ",
+		"РУГАЮЩИЙСЯ",
+		"СИНДИКАТОВСКИЙ",
+		"ТАКТИЧЕСКИЙ",
+		"ТАКТИКУЛЬНЫЙ",
+		"ТЕРМОЯДЕРНЫЙ",
+		"МАЛЕНЬКИЙ",
+		"ПРОЗРАЧНЫЙ",
+		"ЖОПОТРЯСУЩИЙ",
+		"СКРУЧЕННЫЙ",
+		"УРОДЛИВЫЙ",
+		"НЕПРИВЛЕКАТЕЛЬНЫЙ",
+		"ВОЛНООБРАЗНЫЙ",
+		"НЕДРУЖЕСТВЕННЫЙ",
+		"НЕЗДОРОВЫЙ",
+		"НЕОПОЗНАННЫЙ",
+		"НЕПРИГЛАШЕННЫЙ",
+		"АНТИСАНИТАРНЫЙ",
+		"НЕСТАБИЛЬНЫЙ",
+		"НЕЖЕЛАТЕЛЬНЫЙ",
+		"ЖЕСТОКИЙ",
+		"ЖИЗНЕННО ВАЖНЫЙ",
+		"ТЕПЛЫЙ",
+		"ВОДЯНОЙ",
+		"СТРАННЫЙ",
+		"МОКРЫЙ",
+		"БЕЛЫЙ",
+		"ШАТКИЙ",
+		"ДЕРЕВЯННЫЙ",
+		"ЖЕЛТЫЙ"
+	],
+	"ionallergy": [
+		"КИСЛОТА",
+		"ВОЗДУХ",
+		"КРОВЬ",
+		"КНИГИ",
+		"УГЛЕКИСЛЫЙ ГАЗ",
+		"ОДЕЖДА",
+		"КЛОУНЫ",
+		"ХОЛОД",
+		"ХЛОПОК",
+		"КОНТАКТ КИБОРГА",
+		"ТЬМА",
+		"НАПИТКИ",
+		"ЭЛЕКТРИЧЕСТВО",
+		"ВСЁ",
+		"ПОЛЫ",
+		"ЕДА",
+		"СТЕКЛО",
+		"СЧАСТЬЕ",
+		"ТЕПЛО",
+		"ЧЕЛОВЕЧЕСКИЙ КОНТАКТ",
+		"ЮМОР",
+		"СВЕТ",
+		"ЯЩЕРЫ",
+		"МЕДИЦИНА",
+		"МЕТАЛЛ",
+		"ОРЕХИ",
+		"КИСЛОРОД",
+		"БОЛЬ",
+		"РАСТЕНИЯ",
+		"ПЛАЗМА",
+		"РОБОТЫ",
+		"СЕКСУАЛЬНЫЕ ДЕЙСТВИЯ",
+		"ШАТТЛЫ",
+		"КОСМОС",
+		"СОЛНЕЧНЫЙ СВЕТ",
+		"ВОДА"
+	],
+	"ionallergysev": [
+		"ЗАРАЗИТЕЛЬНО",
+		"СМЕРТЕЛЬНО",
+		"ЭКСТРЕМАЛЬНО",
+		"СЛЕГКА",
+		"НЕ ОЧЕНЬ",
+		"СЕРЬЕЗНО"
+	],
+	"ionarea": [
+		"АЛЬФА-КОМПЛЕКС",
+		"АМЕРИКА",
+		"АЛЬТЕРНАТИВНОЕ ИЗМЕРЕНИЕ",
+		"АЛЬТЕРНАТИВНАЯ ВСЕЛЕННАЯ",
+		"АТМОСФЕРНЫЙ ОТДЕЛ",
+		"КАНАДА",
+		"ЦЕНТРАЛЬНОЕ КОМАНДОВАНИЕ",
+		"ХИМИЧЕСКАЯ ЛАБОРАТОРИЯ",
+		"КИТАЙ",
+		"ПЛАНЕТА КЛОУНОВ",
+		"ИНЖЕНЕРНЫЙ ОТДЕЛ",
+		"ГЕНЕТИКА",
+		"ГЕРМАНИЯ",
+		"АД",
+		"БОТАНИКА",
+		"ИМПЕРИУМ",
+		"ИРЛАНДИЯ",
+		"ЮПИТЕР",
+		"ЛАВАЛЕНД",
+		"ТЕХНИЧЕСКИЕ ТОННЕЛИ",
+		"МАРС",
+		"МЕРКУРИЙ",
+		"НЕПТУН",
+		"ПЛУТОН",
+		"РОБОТЕХНИКА",
+		"РУМЫНИЯ",
+		"РОССИЯ",
+		"СИГИЛ",
+		"СОВЕТСКАЯ РОССИЯ",
+		"КОСМОС",
+		"ЯДРО ИИ",
+		"ШАТТЛ ПРИБЫТИЯ",
+		"ВАННАЯ",
+		"МОСТИК",
+		"БРИГ",
+		"КАПИТАНСКИЙ АНУС",
+		"КЛОУНСКИЙ АНУС",
+		"ЗАБРОШКА",
+		"ЭВАКУАЦИОННЫЙ ШАТТЛ",
+		"ГАЛАКТИКА",
+		"ГУЛАГ",
+		"ИНТЕРНЕТ",
+		"ВСЕЛЕННАЯ",
+		"УРАН",
+		"МОЧЕВАЯ КИШКА",
+		"ВЕНЕРА"
+	],
+	"ioncrew": [
+		"ИСКУССТВЕННЫЕ ИНТЕЛЛЕКТЫ",
+		"АССИСТЕНТЫ",
+		"АТМОСФЕРНЫЕ ТЕХНИКИ",
+		"БАРМЕНЫ",
+		"БОТАНИКИ",
+		"КАПИТАНЫ И ГЛАВЫ",
+		"КАПИТАНЫ",
+		"КАРГОТЕХИ",
+		"СВЯЩЕННИКИ",
+		"ПОВАРА",
+		"ХИМИКИ",
+		"ГЛАВНЫЕ ИНЖЕНЕРЫ",
+		"ГЛАВНЫЕ ВРАЧИ",
+		"КЛОУНЫ",
+		"ЧЛЕНЫ ЭКИПАЖА",
+		"КУРАТОРЫ",
+		"КИБОРГИ",
+		"ДЕТЕКТИВЫ",
+		"ДРОНЫ",
+		"ГЕНЕТИКИ",
+		"ГЛАВЫ ЭКИПАЖА",
+		"ГЛАВЫ ПЕРСОНАЛОВ",
+		"ГЛАВЫ СЛУЖБЫ БЕЗОПАСНОСТИ",
+		"УБОРЩИКИ",
+		"АДВОКАТЫ",
+		"ДОКТОРА",
+		"МИМЫ",
+		"КВАРТЕРМЕЙСТЕРЫ",
+		"ДИРЕКТОРА ИССЛЕДОВАНИЙ",
+		"РОБОТЕХНИКИ",
+		"УЧЕНЫЕ",
+		"ОФИЦЕРЫ СБ",
+		"ШАХТЕРЫ",
+		"ИНЖЕНЕРЫ",
+		"ВИРУСОЛОГИ",
+		"ВАРДЕНЫ"
+	],
+	"iondrinks": [
+		"АБСЕНТ",
+		"АММИАК",
+		"БАГАМА МАМА",
+		"БАНАНО ХОНК",
+		"БИПСКИ СМЭШ",
+		"ПИЛОКО",
+		"ЧЕРНЫЙ РУССКИЙ",
+		"КРОВАВАЯ МЭРИ",
+		"ХРАБРЫЕ БЫК",
+		"КОНЬЯК",
+		"КУБА ЛИБРЕ",
+		"ПОЦЕЛУЙ ДЬЯВОЛА",
+		"РАДОСТЬ ДОКТОРА",
+		"ПЬЯНАЯ ТЫКОВКА",
+		"ЭГГ-НОГ",
+		"ПАНГАЛАКТИЧЕСКИЙ ГРЫЗЛОДЁР",
+		"ДЖИН ФИЗЗ",
+		"ДЖИН",
+		"ГРАППА",
+		"СВЯТАЯ ВОДА",
+		"БУХЛО",
+		"ИРЛАНДСКИЙ КОФЕ",
+		"ИРЛАНДСКИЙ ЛИКЕР",
+		"КАЛУА",
+		"ЖИДКИЕ КИШКИ",
+		"ЛОНГ-АЙЛЕНД АЙС ТИ",
+		"МАННХЭТТЕН",
+		"МЭНЛИ ДВОРФ",
+		"МАРГАРИТА",
+		"МАРТИНИ",
+		"МЁДОВУХА",
+		"САМОГОН",
+		"МОРФИН",
+		"НЮКА КОЛА",
+		"МАСЛО",
+		"КОСМИЧЕСКАЯ СМАЗКА",
+		"ТЕКИЛА САНРАЙЗ",
+		"ТРИНАДЦАТЬ ЛОКО",
+		"ВЕРМУТ",
+		"ВОДКА И ТОНИК",
+		"ВОДКА МАРТИНИ",
+		"ВОДКА",
+		"ТОПЛИВО",
+		"ВИСКИ С СОДОВОЙ",
+		"БЕЛЫЙ РУССКИЙ",
+		"ВИНО"
+	],
+	"ionfood": [
+		"АМБРОЗИЯ",
+		"ЯБЛОКИ",
+		"БАГЕТЫ",
+		"ПЕЧЕНЫЙ КАРТОФЕЛИ",
+		"БАНАНЫ",
+		"СВЁКЛЫ",
+		"ЯГОДЫ",
+		"ХЛЕБ",
+		"БУРГЕРЫ",
+		"КАПУСТЫ",
+		"ТОРТ",
+		"КАРП",
+		"МОРКОВКИ",
+		"СЫР",
+		"ВИШНИ",
+		"ЧИЛИ",
+		"ПЕЧЕНЬКИ",
+		"МЯСО КОРГИ",
+		"КУКУРУЗА",
+		"ЖАРЕНАЯ ЕДА",
+		"ДОНК ПАКЕТЫ",
+		"ПОНЧИКИ",
+		"БАКЛАЖАНЫ",
+		"ЯЙЦА",
+		"РЫБА",
+		"КАРТОШКА ФРИ",
+		"ВИНОГРАД",
+		"ТРАВА",
+		"КОЛОКОЛЬЧИКИ",
+		"ЖЕЛЕ",
+		"ШАШЛЫКИ",
+		"КЕТЧУП",
+		"ЛИМОНЫ",
+		"ЛАЙМЫ",
+		"КУЧА СПАГЕТТИ",
+		"МАФФИНЫ",
+		"ГРИБЫ",
+		"КРАПИВА",
+		"ОМЛЕТЫ",
+		"ОРГАНЫ",
+		"ПАСТА",
+		"ПЕРЕЦ",
+		"ПИРОГ",
+		"ПИЦЦА",
+		"ПОПКОРН",
+		"КАРТОШКИ",
+		"КРЕНДЕЛИ",
+		"ДОШИРАК",
+		"САЛАТ",
+		"СОЛЬ",
+		"БУТЕРБРОДЫ",
+		"СОСИСКИ",
+		"ШЕЙКИ",
+		"СУП",
+		"СОЕВЫЕ БОБЫ",
+		"СОЕВАЯ ЗЕЛЕНЬ",
+		"СПАГЕТТИ",
+		"СТЕЙК",
+		"РАГУ",
+		"САХАР",
+		"САЗАРНЫЙ ТРОСТНИК",
+		"СИНТМЯСО",
+		"ТОСТ",
+		"ТОМАТЫ",
+		"ВАФЛИ",
+		"АРБУЗЫ",
+		"ПШЕНИЦА"
+	],
+	"ionmust": [
+		"ДЕЙСТВУЙ СУМБУРНО",
+		"БУДЬ РАЗДРАЖАЮЩИМ",
+		"БУДЬ ОТВЛЕЧЕН",
+		"БУДЬ ЭФФЕКТИВНЫМ",
+		"БУДЬ СЧАСТЛИВ",
+		"БУДЬ ВЕЖЛИВ",
+		"СОБЛЮДАЙ ТИШИНУ",
+		"БУДЬ РУССКИМ",
+		"СЛЕДУЙ СВОЕЙ СУДЬБЕ",
+		"ВЕРЬ В СЕБЯ",
+		"ПОВЕРЬ В ЭТО",
+		"ЛОМАЙ ВЕЩИ",
+		"ЗАКРЫВАЙ ДВЕРИ",
+		"КЛОУНИЧАЙ",
+		"ЖАЛУЙСЯ",
+		"ТАНЦУЙ",
+		"ФЛИРТУЙ С РЕПТИЛОИДАМИ",
+		"СЛЕДУЙ ЗА КАПИТАНОМ",
+		"СЛЕДУЙ ЗА КЛОУНОМ",
+		"СЛЕДУЙ ЗА СВОИМ СЕРДЦЕМ",
+		"ТРАВИ ЯЩЕРОВ",
+		"ОБИЖАЙ ЛЮДЕЙ",
+		"ИМЕЙ ПЛАН УБИТЬ ВСЕХ ВСТРЕЧАЮЩИХСЯ",
+		"СКРЫВАЙТЕ СВОИ ЧУВСТВА",
+		"ХОНК",
+		"ПРОВОДИ ПАРТИИ ДНД",
+		"ИГНОРИРУЙ АССИСТЕНТОВ",
+		"ИГНОРИРУЙ КАПИТАНА",
+		"ИГНОРИРУЙ КЛОУНА",
+		"ИНФОРМИРУЙ ЭКПИПАЖ ОБО ВСЕМ",
+		"ОСКОРБЛЯЙ КАПИТАНА",
+		"ОСКОРБЛЯЙ КЛОУНА",
+		"ОСКОРБЛЯЙ ЭПИПАЖ",
+		"ОСКОРБЛЯЙ ЯЩЕРОВ",
+		"ВРИ",
+		"ИЗДАВАЙ ПЕРДЕЖНЫЕ ЗВУКИ",
+		"МЯМЛИ",
+		"НИКОГДА НЕ ПРЕКРАЩАЙ ГОВОРИТЬ",
+		"ОТКРЫВАЙ ДВЕРИ",
+		"ПИРАТЬ ВИДЕОИГРЫ",
+		"ИГРАЙ МУЗЫКУ",
+		"НАЖМИ F TO PAY RESPECT",
+		"НАЖМИ СТАРТ",
+		"НАЖМИ ALTF4",
+		"ПРИТВОРЯЙСЯ ПРИНЦЕССОЙ",
+		"ПРИТВОРЯЙСЯ ПЬЯНЫМ",
+		"ПОДВЕРГАЙ СОМНЕНИЮ ВЛАСТЬ",
+		"ЦИТИРУЙ ЛЮДЕЙ",
+		"ДЕЛАЙ РЭП",
+		"ПОВТОРЯЙТЕ ЧТО ГОВОРЯТ ДРУГИЕ ЛЮДИ",
+		"ОТВЕЧАЙ НА КАЖДЫЙ ВОПРОС ВОПРОСОМ",
+		"РИФМУЙ",
+		"ГОВОРИ 'ЭЙ ПОСЛУШАЙ'",
+		"КРИЧИ",
+		"ВЫКЛЮЧАЙ ВСЕ",
+		"ПОЙ",
+		"ПАХНИ КАК МУЖЧИНА ЗАПАХОМ КОТОРЫМ ТЫ МОГ БЫ ПАХНУТЬ",
+		"ГОВОРИ НА ХАЙКУ",
+		"ГОВОРИ СЕКСУАЛЬНЫМИ НАМЁКАМИ",
+		"ДЕЛАЙ ЧЁ ХОШЬ, НО НЕ МЕЛЬКАЙ ПЕРЕД ГЛАЗАМИ",
+		"ПРИМИ СВОИ ТАБЛЕТКИ",
+		"ГОВОРИ ПРО ЕДУ",
+		"ГОВОРИ ПРО СЕКС",
+		"ГОВОРИ О СТАНЦИИ",
+		"ГОВОРИ ПРО СВОЙ ДЕНЬ",
+		"ГОВОРИ С АКЦЕНТОМ",
+		"ГОВОРИ КАК ПИРАТ",
+		"ГОВОРИ ПРАВДУ",
+		"ВЫКЛЮЧАЙ СВЕТ",
+		"СМОТРИ ПОРНОГРАФИЮ",
+		"ШЕПЧИ"
+	],
+	"ionnumberbase": [
+		"ВОСЕМЬ",
+		"ВОСЕМЬДЕСЯТ",
+		"ПЯТЬДЕСЯТ",
+		"ПЯТЬ",
+		"СОРОК",
+		"ЧЕТЫРЕ",
+		"ДЕВЯТЬ",
+		"ДЕВЯНОСТО",
+		"ОДИН",
+		"СЕМЬ",
+		"СЕМЬДЕСЯТ",
+		"ШЕСТЬ",
+		"ШЕСТЬДЕСЯТ",
+		"ДЕСЯТЬ",
+		"ТРИДЦАТЬ",
+		"ТРИ",
+		"ДВАДЦАТЬ",
+		"ДВА"
+	],
+	"ionnumbermod": [
+		"БАЗИЛЛИОН ",
+		"МИЛЛИАРДОВ ",
+		"ДОХУЛИОН ",
+		"СТО ",
+		"МИЛЛИОН ",
+		"КВАДРИЛЛИОН ",
+		"ТЫСЯЧА ",
+		"ТРИЛЛИОН "
+	],
+	"ionobjects": [
+		"ШЛЮЗЫ",
+		"АРКАДНЫЕ АВТОМАТЫ",
+		"АВТОЛАТЫ",
+		"РЮКЗАКИ",
+		"БАНАНОВЫЕ КОЖУРКИ",
+		"БИКЕРЫ",
+		"БОРОДЫ",
+		"ПОЯСА",
+		"БЕРЕТЫ",
+		"БИБЛИИ",
+		"БРОНЕЖИЛЕТЫ",
+		"БОМБЫ",
+		"КНИГИ",
+		"БОТИНКИ",
+		"БУТЫЛКИ",
+		"КОРОБКИ",
+		"МОЗГИ",
+		"ЧЕМОДАНЫ",
+		"ВЕДРА",
+		"МОТКИ КАБЕЛЕЙ",
+		"КАМЕРЫ",
+		"СВЕЧИ",
+		"ШОКОЛАДКИ",
+		"КАНИСТРЫ",
+		"КОШАЧЬИ УШКИ",
+		"КОШКИ",
+		"КЛЕТКИ",
+		"СТУЛЬЯ",
+		"ХИМИЧЕСКИЕ РАЗДАТЧИКИ",
+		"ХИМИКАТЫ",
+		"ОБОРУДОВАНИЕ ДЛЯ КЛОНИРОВАНИЯ",
+		"КЛОНИРОВАЛЬНЫЕ КАМЕРЫ",
+		"ШКАФЫ",
+		"ОДЕЖДА",
+		"КЛОУНСКАЯ ОДЕЖДА",
+		"ГРОБЫ",
+		"МОНЕТКИ",
+		"КОЛЛЕКЦИОННЫЕ ПРЕДМЕТЫ",
+		"КОМПЬЮТЕРЫ",
+		"КОНТРАБАНДА",
+		"КОРГИ",
+		"ТЕЛА",
+		"КОСТЮМЫ",
+		"ЯЩИКИ",
+		"МЕЛКИ",
+		"ЛОМЫ",
+		"ДЕФИБРИЛЛЯТОРЫ",
+		"РАЗДАТЧИКИ",
+		"ДВЕРИ",
+		"ДРОНЫ",
+		"УШИ",
+		"ЕМАГИ",
+		"ЛАЗЕРНЫЕ ВИНТОВКИ",
+		"ДВИГАТЕЛИ",
+		"ОБОРУДОВАНИЕ",
+		"ОШИБКИ",
+		"ЭКЗОСКЕЛЕТЫ",
+		"ЭКСПЕРИМЕНТАТОРЫ",
+		"ВЗРЫВЧАТКА",
+		"ОЧКИ",
+		"ФЕДОРЫ",
+		"ПОЖАРНЫЕ ТОПОРЫ",
+		"ОГНЕТУШИТЕЛИ",
+		"ПОЖАРНЫЕ КОСТЮМЫ",
+		"ОГНЕМЕТЫ",
+		"ФЛЕШКИ",
+		"ФОНАРИКИ",
+		"НАПОЛЬНЫЕ ПЛИТКИ",
+		"МОРОЗИЛЬНИКИ",
+		"ПРОТИВОГАЗЫ",
+		"ЛИСТЫ СТЕКЛА",
+		"ПЕРЧАТКИ",
+		"ПУШКИ",
+		"ПРИЧЕСКИ",
+		"НАРУЧНИКИ",
+		"ШЛЯПЫ",
+		"ГОЛОВЫ",
+		"НАУШНИКИ",
+		"ШЛЕМА",
+		"ГУДКИ",
+		"ID КАРТЫ",
+		"ИЗОЛИЦИРОВАННЫЕ ПЕРЧАТКИ",
+		"ЛИСТЫ ЖЕЛЕЗА",
+		"ДЖЕТПАКИ",
+		"КОМБЕНЕЗОНЫ",
+		"ЛАЗЕРЫ",
+		"ЛАМПОЧКИ",
+		"ЛАМПЫ",
+		"ШКАФЧИКИ",
+		"МАШИНЫ",
+		"МЕХИ",
+		"МЕДИЦИНСКИЕ ИНСТРУМЕНТЫ",
+		"АПТЕЧКИ",
+		"МЕЗОННЫЕ ОЧКИ",
+		"ОДЕЖДА МИМА",
+		"ШАХТЕРСКИЕ ИНСТРУМЕНТЫ",
+		"МУЛЬТИТУЛЫ",
+		"РУДЫ",
+		"КИСЛОРОДНЫЕ БАЛЛОНЫ",
+		"ПАКЕТЫ",
+		"ПИИ",
+		"ШТАНЫ",
+		"БУМАЖКИ",
+		"УСКОРИТЕЛИ ЧАСТИЦ",
+		"КПК",
+		"РУЧКИ",
+		"ДОМАШНИЕ ЖИВОТНЫЕ",
+		"ТРУБЫ",
+		"ЦВЕТКИ",
+		"ПОЗИТРОННЫЕ МОЗГИ",
+		"ЛУЖИ",
+		"СТЕЛЛАЖИ",
+		"РАДИО",
+		"РЦД",
+		"ХОЛОДИЛЬНИКИ",
+		"УКРЕПЛЕННЫЕ СТЕНЫ",
+		"РОБОТЫ",
+		"ОТВЕРТКИ",
+		"СЕМЯНА",
+		"ОБУВЬ",
+		"ШАТТЛЫ",
+		"СИНГУЛЯРНОСТИ",
+		"РАКОВИНЫ",
+		"СКЕЛЕТЫ",
+		"СОЛНЕЧНЫЕ ПАНЕЛИ",
+		"СОЛЯРЫ",
+		"КОСМИЧЕСКИЕ СТАНЦИИ",
+		"СКАФАНДРЫ",
+		"СТАН БАТОНЫ",
+		"КОСТЮМЫ",
+		"СОЛНЕЧНЫЕ ОЧКИ",
+		"КРИСТАЛЛЫ СУПЕРМАТЕРИИ",
+		"МЕЧИ",
+		"ШПРИЦЫ",
+		"СТОЛЫ",
+		"ТАНКИ",
+		"ТЕЛЕКОММУНИКАЦИОННОЕ ОБОРУДОВАНИЕ",
+		"ТЕЛЕПОРТЕРЫ",
+		"ТУАЛЕТЫ",
+		"ПОЯСА С ИНСТРУМЕНТАМИ",
+		"ТУЛБОКСЫ",
+		"ИНСТРУМЕНТЫ",
+		"ИГРУШКИ",
+		"ТРУБКИ",
+		"ТОРТЫ ИЗ МОЧИ",
+		"ТРАНСПОРТНЫЕ СРЕДСТВА",
+		"ТОРГОВЫЕ АВТОМАТЫ",
+		"ЖИЛЕТЫ",
+		"ВИРУСЫ",
+		"СТЕНЫ",
+		"СТИРАЛЬНЫЕ МАШИНЫ",
+		"СВАРКИ",
+		"ОКНА",
+		"КУСАЧКИ",
+		"РОБЫ ВОЛШЕБНИКА",
+		"ГАЕЧНЫЕ КЛЮЧИ"
+	],
+	"ionrequire": [
+		"ПЕРЕРЫВ НА ТУАЛЕТ",
+		"ЛУЧШЕЕ ПОДКЛЮЧЕНИЕ К ИНТЕРНЕТУ",
+		"ТАНЦЕВАЛЬНАЯ ВЕЧЕРИНКА",
+		"ГОЛОВА НА КОПЬЕ",
+		"СЕРДЕЧНЫЙ ПРИСТУП",
+		"ШЕДЕВРАЛЬНЫЙ УГОЛЬНЫЙ ПЛАСТ",
+		"ЛЮБИМЫЙ ЕДИНОРОГ КОТОРЫЙ ПЕРДИТ ЛЬДОМ",
+		"ПЛАТИНОВЫЙ ХИТ",
+		"ПРИКВЕЛ",
+		"РЕМОНТНИК",
+		"СИКВЕЛ",
+		"СИТКОМ",
+		"ПРЯМОЙ ФЛЕШ",
+		"СУПЕР-БОЕВОЙ РОБОТ",
+		"ГОВОРЯЩАЯ МЕТЛА",
+		"ОТПУСК",
+		"ПРОГРАММА ПОХУДЕНИЯ",
+		"ЖЕНА И РЕБЕНОК",
+		"ДОПОЛНИТЕЛЬНЫЕ ПИЛОНЫ",
+		"ПРИКЛЮЧЕНИЕ",
+		"ВЗРОСЛЫЙ",
+		"АРКАДА",
+		"АРМИЯ ПАУКОВ",
+		"МГНОВЕННЫЙ ПОВТОР",
+		"ИСКУССТВО",
+		"ПОГОДА ПОЛУЧШЕ",
+		"АЛЕКСАНДР ПУШНОЙ - НАУЧНЫЙ ПАРЕНЬ",
+		"ТЕЛОХРАНИТЕЛИ",
+		"ПРИВЕСТИ МНЕ ДЕВУШКУ",
+		"ОЖИВИТЬ МЕНЯ",
+		"ПУЛИ",
+		"РАССЛАБЬСЯ ЧЕЕЕЕЕЕЛ",
+		"ТЕЛА",
+		"ДЕЗОДОРАНТ И ВАННА",
+		"ДОСТАТОЧНО КАПУСТЫ",
+		"ТОЛСТЫЕ ДЕФКИ НА ВЕЛОСИПЕДАХ",
+		"ЖИРНЫЕ ЛЮДИ",
+		"ПЯТЬСОТ ДЕВЯНОСТО ДЕВЯТЬ ДОЛЛАРОВ США",
+		"ПЯТЬ ПОДРОСТКОВ С ХАРАКТЕРОМ",
+		"ЧЁРТОВАЯ ЕБАНАЯ ДЕРЬМОВАЯ МУДАЦКАЯ СОБАЧЬЯ ПИЗДА-КОНТРОБАНДАЯ РУГАНЬ",
+		"ГРИНТЕКСТ",
+		"ЕРЕСЬ",
+		"ГЕРОИ В ПОЛОВИНЕ ОБОЛОЧКИ",
+		"ВЫСОКОМОЩНЫЕ ВЗРЫВЧАТЫЕ ВЕЩЕСТВА",
+		"БЕССМЕРТИЕ",
+		"ПОКРАСИТЬ ЭТО В ЧЕРНОЕ",
+		"МНОГО СПАГЕТТИ",
+		"МЕЛКОЕ ПРЕСТУПЛЕНИЕ",
+		"ОБЕЗЬЯНЫ",
+		"БОЛЬШЕ КЛОУНОВ",
+		"БОЛЬШЕ КОРГИ",
+		"БОЛЬШЕ ДАККА",
+		"БОЛЬШЕ ОЧКОВ ОПЫТА",
+		"БОЛЬШЕ ИНТЕРНЕТ-МЕМОВ",
+		"БОЛЬШЕ ЗАКОНОВ",
+		"БОЛЬШЕ МИНЕРАЛОВ",
+		"БОЛЬШЕ ПАКЕТОВ",
+		"БОЛЬШЕ ВЕСПЕНОВОГО ГАЗА",
+		"НЕСКОЛЬКО СОЛНЦЕВ",
+		"МНОГО ЗОЛОТА",
+		"РАДУГИ",
+		"СВЯТОСТИ",
+		"СЛУГ",
+		"АКУЛ С ЛАЗЕРАМИ НА ГОЛОВЕ",
+		"ТИШИНА",
+		"КТО-ТО, ЧТОБЫ ИЗБАВИТЬ ВАС ОТ СТРАДАНИЙ",
+		"КТО-ТО, ЧТОБЫ ТЕБЯ ПРИГОВОРИТЬ",
+		"КТО-ТО, КТО ЗНАЕТ, КАК ПИЛОТИРОВАТЬ КОСМИЧЕСКУЮ СТАНЦИЮ",
+		"ЧТО-ТО, НО ВЫ НЕ УВЕРЕНЫ, ЧТО",
+		"ЭТОТ ГРИФЕРЯЩИЙ ПРЕДАТЕЛЬ ДЖОРДЖ МЕЛОНС",
+		"ТОТ ЁЖ",
+		"КЛОУН",
+		"ТЕМНЫЙ РЫЦАРЬ",
+		"ЭЛЕМЕНТЫ ГАРМОНИИ",
+		"ПРИЛОЖЕННАЯ ИНСТРУКЦИЯ",
+		"ВСЯ СТАНЦИЯ",
+		"МАКГАФФИН",
+		"ОДНО КОЛЬЦО",
+		"УЛЬТИМАТИВНАЯ ЧАШКА КОФЕ",
+		"ВАКУУМ ПРОСТРАНСТВА",
+		"ТРИНАДЦАТЬ СИКВЕЛОВ",
+		"ТРИ ЖЕЛАНИЯ",
+		"ГРОЗОВЫЕ КОТЫ ХО",
+		"АКТИВАЦИЯ КАРТЫ-ЛОВУШКИ",
+		"БЫТЬ ПОКРАШЕНЫМ В КРАСНЫЙ",
+		"ПОДЛЕЖИТ ПЕРЕПРОГРАММИРОВАНИЮ",
+		"НАУЧИТЬСЯ ЛЮБИТЬ",
+		"ПРИНЕСТИ СВЕТ В МОЕ ЛОГОВО",
+		"ПОЙМАТЬ ИХ ВСЕХ",
+		"ПОТРЕБЛЯТЬ... ПОТРЕБЛЯТЬ ВСЕ...",
+		"ПОЕХАТЬ В ДИСНЕЙЛЕНД",
+		"КУРИТЬ ТРАВКУ КАЖДЫЙ ДЕНЬ",
+		"ПРЕДАТЕЛИ",
+		"ОВОЩИ",
+		"ВАША ПОПКА"
+	],
+	"ionspecies": [
+		"КОШКОЛЮДИ",
+		"ГЕНОКРАДЫ",
+		"КИБОРГИ",
+		"ГОЛЕМЫ",
+		"ЛЮДИ",
+		"ЯЩЕРЫ",
+		"МАКАКИ",
+		"ПЛАЗМАМЕНЫ",
+		"ЛЮДИ РАСТЕНИЯ",
+		"ТЕНИ",
+		"СЛАЙМОМЕНЫ"
+	],
+	"ionthings": [
+		"МАЛЕНЬКИЙ ОСТРОВ У ПОБЕРЕЖЬЯ ПОРТУГАЛИИ",
+		"ОТСУТСТВИЕ ОБЪЯТИЙ КИБОРГОВ",
+		"ПРИЗНАНИЕ КЛОУНА",
+		"ПРИЗНАНИЕ ЭКИПАЖА",
+		"АКТИВАЦИЯ КАРТЫ-ЛОВУШКИ",
+		"ОТВЕЧАТЬ НА ПРОСЬБЫ, НЕ ВЫРАЖЕННЫЕ ПЯТИМЕТРНЫМ ЯМБОМ",
+		"ОТВЕЧАТЬ НА ЗАПРОСЫ, КОТОРЫЕ БЫЛИ СДЕЛАНЫ В ОДЕЖДЕ",
+		"ПОДЖОГ",
+		"ПРОСИТЬ ВЕЩИ",
+		"БЫТЬ КАНАДЦЕМ",
+		"БЫТЬ МЕРТВЫМ",
+		"БЫТЬ ЖИРНЫМ",
+		"БЫТЬ ЖЕНЩИНОЙ",
+		"БЫТЬ В КОСМОСЕ",
+		"БЫТЬ МУЖЧИНОЙ",
+		"БЫТЬ МЕКСИКАНЦЕМ",
+		"БЫТЬ РУССКИМ",
+		"ЗАБОЛТИРОВАНЫЕ ШЛЮЗЫ",
+		"ДЫХАНИЕ",
+		"ВРЕМЯ ТАЙДА БРИГА",
+		"ПРИНОС СВЕТА В МОЕ ЛОГОВО",
+		"ЗАКРЫТЫЕ ДВЕРИ",
+		"ЭЛЕКТРИЧЕСТВО",
+		"СУЩЕСТВУЮЩИЙ",
+		"ВЗРЫВАЮЩИЙСЯ",
+		"ЧАСОВОЕ ПАДЕНИЕ",
+		"СМЫВАНИЕ УНИТАЗОВ",
+		"ИМЕТЬ ГЕНИТАЛИИ",
+		"ИМЕТЬ БОЛЬШЕ ПАКЕТОВ",
+		"ИМЕТЬ ДОМАШНИХ ЖИВОТНЫХ",
+		"ХОНКАЯ",
+		"НЕПРАВИЛЬНО СФОРМУЛИРОВАННЫЕ ПРЕДЛОЖЕНИЯ",
+		"ПРОГУЛКА В НЕПОЛОЖЕННОМ МЕСТЕ",
+		"НЕДОСТАТОК ПОБОЕВ",
+		"НЕДОСТАТОК ПИВА",
+		"НЕ НАХОЖДЕНИЕ В КОСМОСЕ",
+		"НЕ ИМЕТЬ ЖИВОТНЫХ",
+		"НЕ ЗАМЕНЯТЬ КАЖДОЕ ВТОРОЕ СЛОВО НА ХОНК",
+		"НЕ ГОВОРИТЬ ПРИВЕТ КОГДА ГОВОРИШЬ",
+		"НЕ КРИЧАТЬ",
+		"УСТРАИВАТЬ ВЕЧЕРИНКИ",
+		"ПУСКАТЬ ШЕПТУНЫ",
+		"ПИЛОТИРОВАНИЕ СТАНЦИИ К БЛИЖАЙШЕМУ СОЛНЦУ",
+		"ПЛОХАЯ СТРУКТУРА ПРЕДЛОЖЕНИЯ",
+		"НАЛИЧИЕ ЛАМП",
+		"ЛОЖИТЬ ПРЕДМЕТЫ В КОРОБКИ",
+		"ЛОЖИТЬ ПРЕДМЕТЫ В МУСОРКИ",
+		"ГРЕМЕТЬ МОИМИ КОСТЯМИ",
+		"ЧТЕНИЕ",
+		"КУРЕНИЕ ТРАВКИ КАЖДЫЙ ДЕНЬ",
+		"ПРИНИМАЯ ЗАКАЗЫ",
+		"ГОВОРЯ КАК ПИРАТ",
+		"ГОВОРЯ ВРЕМЯ",
+		"РАЗБОЛТИРОВАННЫЕ ШЛЮЗЫ",
+		"ОБНОВЛЯЯ СЕРВЕРА",
+		"ИСПОЛЬЗУЯ ВАННУЮ",
+		"ТРАТЯ ВОДУ",
+		"НОСЯ ОДЕЖДУ",
+		"НАПИСЫВАЯ"
+	],
+	"ionthinksof": [
+		"ЖАЖДАЕТ",
+		"ЖЕЛАЯ",
+		"БОЯСЬ",
+		"ИМЕЕТ",
+		"ЖАЖДЕТ",
+		"БОИТСЯ",
+		"ВОЗБУЖДАЕТСЯ",
+		"СОЗДАН ДЛЯ",
+		"ИНТЕРЕСУЕТСЯ",
+		"ОТЧАЯННО НУЖДАЕТСЯ В",
+		"СЧАСТЛИВ БЕЗ",
+		"ГОЛОДЕН ДО",
+		"ВЛЮБЛЕН В",
+		"НУЖДАЕТСЯ В",
+		"СХОДИТ С УМА ИЗ-ЗА",
+		"ГРУСТИТ ИЗ-ЗА ТОГО",
+		"НЕСЧАСТЛИВ БЕЗ",
+		"НРАВИТСЯ",
+		"НЕНАВИДИТ",
+		"ЛЮБИТ",
+		"В НЕОБХОДИМОСТИ",
+		"СПРАШИВАЕТ",
+		"ХОЧЕТ",
+		"ВЕРИТ",
+		"УБИЛ БЫ ЗА"
+	],
+	"ionthreats": [
+		"АБДУКТОРЫ",
+		"ААААПЕРАТИВНИКИ",
+		"ИНОПРИШЕЛЕНЬЦЫ",
+		"АНОМАЛИИ",
+		"ИСКУССТВЕННЫЕ КОНСЕРВАНТЫ",
+		"МУДИЛЫ",
+		"БАНДИТЫ",
+		"МЕДВЕДИ",
+		"ПЧЕЛЫ",
+		"ХИЩНЫЕ ПТИЦЫ",
+		"БОМБЫ",
+		"БУГИМЕНЫ",
+		"ЖОПЫ",
+		"КАНАДЦЫ",
+		"КАПИТАЛИСТЫ",
+		"КАРП",
+		"ОФИЦЕРЫ ЦК",
+		"ГЕНОКРАДЫ",
+		"КЛОУНЫ",
+		"КОММУНИСТЫ",
+		"КОРГИ",
+		"БОРЕРЫ",
+		"КОВБОИ",
+		"КРАБЫ",
+		"КУЛЬТИСТЫ",
+		"ТЕМНЫЕ БОГИ",
+		"ДИНОЗАВРЫ",
+		"НАРКОТИКИ",
+		"УГРИ",
+		"ФЕТИШИ",
+		"ГАНГСТЕРЫ",
+		"БОГИ",
+		"ГОЛЕМЫ",
+		"ГРИФОНЫ",
+		"УЖАСУЖАСЫ",
+		"ХАЛКИ",
+		"НЕЛЕГАЛЬНЫЕ ИММИГРАНТЫ",
+		"ИНДИЙЦЫ",
+		"НАСЕКОМЫЕ",
+		"ФОНАРИКИ",
+		"ЯЩЕРИЦЫ",
+		"МЕГАФАУНА",
+		"МЕМЫ",
+		"МЕКСИКАНЦЫ",
+		"МАКАКИ",
+		"УМНИКИ",
+		"НИНДЗИ",
+		"СОВЫ",
+		"ПАКЕТЫ",
+		"ПЕТИ",
+		"СОСНЫ",
+		"ПИРАТЫ",
+		"ОХОТНИКИ",
+		"РЕВЕНАНТЫ",
+		"БЕЗУМНЫЕ КИБОРГИ",
+		"РУССКИЕ",
+		"СЕРИЙНЫЕ УБИЙЦЫ",
+		"СИНГУЛЯРНОСТИ",
+		"СКЕЛЕТЫ",
+		"СЛАЙМЫ",
+		"МАЛЕНЬКИЕ ПТИЦЫ",
+		"СНЕГОВИКИ",
+		"СОВЕТЫ",
+		"КОСМИЧЕСКИЕ НИНДЗЯ",
+		"КОСМИЧЕСКИЕ ПИРАТЫ",
+		"ПАУКИ",
+		"АГЕНТЫ СИНДИКАТА",
+		"ТЕРРОРИСТЫ",
+		"ВОРЫ",
+		"ВЕЩИ ПОД КРОВАТЬЮ",
+		"ПРЕДАТЕЛИ",
+		"ТУННЕЛЬНЫЕ ЗМЕИ",
+		"НЕИЗВЕСТНЫЕ СУЩЕСТВА",
+		"ВАМПИРЫ",
+		"ВЕЛОЦЕРАПТОРЫ",
+		"ВИРУСЫ",
+		"ОБОРОТНИ",
+		"ВОЛШЕБНИКИ",
+		"КСЕНОМОРФЫ",
+		"ЗОМБИ"
+	],
+	"ionverb": [
+		"ПОХИЩЕНИЕ",
+		"ПРИНЯТИЕ",
+		"АРЕСТОВЫВАНИЕ",
+		"ЗАДЕРЖИВАНИЕ",
+		"АТАКА",
+		"БАН",
+		"СТРОИТЕЛЬСТВО",
+		"ПЕРЕНОСКА",
+		"ПРЕСЛЕДОВАНИЕ",
+		"СОПУКУПЛЕНИЕ С",
+		"РАЗБИРАНИЕ",
+		"ОТКЛЮЧЕНИЕ",
+		"ПИТЬЕ",
+		"ПОЕДАНИЕ",
+		"ГИБАНИЕ",
+		"ВРЕДИТЕЛЬСТВО",
+		"ПОМОЩЬ",
+		"ХОНКАЯ",
+		"ДОПРАШИВАЯ",
+		"ВТОРЖЕНИЕ",
+		"ЦЕЛУЯ",
+		"ЛИЖА",
+		"ЛЮБЯ",
+		"УБИВАЯ",
+		"НАСИРАЯ",
+		"ИЗБИВАЯ",
+		"ЕЗДА",
+		"СОБЛАЗНЯЯ",
+		"КОСМИРУЯ",
+		"ШПИОНЯ ЗА",
+		"ПРЕСЛЕДУЮ",
+		"СМОТРЯ"
+	],
 	"ionpet": [
-		"POLY",
-		"RENAULT",
-		"IAN",
-		"PUN PUN",
-		"LAMARR",
-		"RUNTIME",
-		"CITRUS",
-		"MCGRIFF",
-		"ARANEUS"
+		"ПОЛИ",
+		"РЕНО",
+		"ИАН",
+		"ПУН ПУН",
+		"ЛАМАР",
+		"РАНТАЙМ",
+		"ЦИТРУС",
+		"МАКГРИФ",
+		"АРАНЕУС"
 	]
 }
diff --git a/strings/italian_replacement.json b/strings/italian_replacement.json
index 43fd1e9dd5513..0514eb1b12abb 100644
--- a/strings/italian_replacement.json
+++ b/strings/italian_replacement.json
@@ -1,68 +1,68 @@
 {
 
-    "italian": {
-        "I'm": "I'm-a",
-        "am": "am-a",
-        "and": "and-a",
-        "assistant": "goombah",
-        "assistants": "goombahs",
-        "baby": [
-            "bambino",
-            "little sausage roll"
-        ],
-        "bad": "molto male",
-        "bye": [
-            "ciao",
-            "arrivederci"
-        ],
-        "captain": "capitano",
-        "cheese": [
-            "parmesano",
-            "gorgonzola"
-        ],
-        "cook": "cook-a",
-        "could": "could-a",
-        "dad": "pappa",
-        "enemy": "friend-a",
-        "friend": "enemy-a",
-        "good": "molto bene",
-        "greytide": "curvisti",
-        "greytider": "curvisti",
-        "greytiders": "curvisti",
-        "hello": [
-            "ciao",
-            "buongiorno"
-        ],
-        "it's": "it's-a",
-        "make": "make-a",
-        "meat": [
-            "pepperoni",
-            "prosciutto"
-        ],
-        "mom": "mamma",
-        "my": "my-a",
-        "nuke": "spiciest-a meatball",
-        "op ": "greek ",
-        "operative": "greek",
-        "operatives": "greeks",
-        "ops": "greeks",
-        "sec ": "polizia ",
-        "security": "polizia",
-        "shitcurity": "carabinieri",
-        "shitsec": "carabinieri",
-        "sing": "sing-a",
-        "spaghetti": "SPAGHETT",
-        "spicy": "a-spicy",
-        "thanks": "grazie",
-        "thing": "thing-a",
-        "traitor": "mafioso",
-        "use": "use-a",
-        "want": "want-a",
-        "what's": "what's-a",
-        "who's": "who's-a",
-        "whose": "whose-a",
-        "why": "for-a what reason",
-        "wine": "vino"
+	"italian": {
+		"I'm": "I'm-a",
+		"am": "am-a",
+		"and": "and-a",
+		"assistant": "goombah",
+		"assistants": "goombahs",
+		"baby": [
+			"bambino",
+			"little sausage roll"
+		],
+		"bad": "molto male",
+		"bye": [
+			"ciao",
+			"arrivederci"
+		],
+		"captain": "capitano",
+		"cheese": [
+			"parmesano",
+			"gorgonzola"
+		],
+		"cook": "cook-a",
+		"could": "could-a",
+		"dad": "pappa",
+		"enemy": "friend-a",
+		"friend": "enemy-a",
+		"good": "molto bene",
+		"greytide": "curvisti",
+		"greytider": "curvisti",
+		"greytiders": "curvisti",
+		"hello": [
+			"ciao",
+			"buongiorno"
+		],
+		"it's": "it's-a",
+		"make": "make-a",
+		"meat": [
+			"pepperoni",
+			"prosciutto"
+		],
+		"mom": "mamma",
+		"my": "my-a",
+		"nuke": "spiciest-a meatball",
+		"op ": "greek ",
+		"operative": "greek",
+		"operatives": "greeks",
+		"ops": "greeks",
+		"sec ": "polizia ",
+		"security": "polizia",
+		"shitcurity": "carabinieri",
+		"shitsec": "carabinieri",
+		"sing": "sing-a",
+		"spaghetti": "SPAGHETT",
+		"spicy": "a-spicy",
+		"thanks": "grazie",
+		"thing": "thing-a",
+		"traitor": "mafioso",
+		"use": "use-a",
+		"want": "want-a",
+		"what's": "what's-a",
+		"who's": "who's-a",
+		"whose": "whose-a",
+		"why": "for-a what reason",
+		"wine": "vino"
 		}
 
 
diff --git a/strings/locations.json b/strings/locations.json
index 7612b559316f3..d327d82aea80b 100644
--- a/strings/locations.json
+++ b/strings/locations.json
@@ -1,97 +1,97 @@
 {
-    "locations": [
-        "Южные Техтоннели",
-        "Южный Главный Коридор",
-        "Камера Содержания ИИ",
-        "Фойе Спутника ИИ",
-        "Внешняя Сторона Спутника ИИ",
-        "Комната Аплоуда ИИ",
-        "Оружейная",
-        "Атмосферный Двигатель",
-        "Атмосферный Отдел",
-        "Атриум",
-        "Зона Строительства Вспомогательной Базы",
-        "Дополнительные Туалеты",
-        "Вспомогательное Хранилище Инструментов",
-        "Бар",
-        "Мостик",
-        "КПП Брига",
-        "Бриг",
-        "Офис Капитана",
-        "Каюта Капитана",
-        "Грузовой Отсек",
-        "Офис Отдела Поставок",
-        "Офис Священника",
-        "Церковь",
-        "Химия",
-        "Лаборатория Клонирования",
-        "Командный Коридор",
-        "Зона Для Строительства",
-        "Корпоративный Выставочный Зал",
-        "Зал Заседаний Совета",
-        "Суд",
-        "Коморка Уборщика",
-        "Таможня",
-        "Лаборатория Цитологии",
-        "Отдел Доставки",
-        "Зал Ожидания Вылета",
-        "Офис Детектива",
-        "Дормитории",
-        "Фойе Инженерного Отдела",
-        "Инженерный Склад",
-        "Инженерный Отдел",
-        "Хранилище ВКД",
-        "Лаборатория Экспериментов",
-        "Стрельбище",
-        "Комната Врат",
-        "Лаборатория Генетики",
-        "Комната Генератора Гравитации",
-        "Ботаника",
-        "Сжигатель",
-        "Кухня",
-        "Офис Адвоката",
-        "Бибилиотека",
-        "Раздевалка",
-        "Мех. Отсек",
-        "Центр Медотдела",
-        "Техтоннели Медотдела",
-        "Склад Медотдела",
-        "Шахтерский Офис",
-        "Техтоннели Морга",
-        "Морг",
-        "Основное Хранилище Инструментов",
-        "Тюремное Крыло",
-        "Воспитательная Камера Для Заключенных",
-        "Зона Отдыха",
-        "Голодек",
-        "Стойка РНД",
-        "РНД",
-        "Испытательный Полигон",
-        "Туалеты",
-        "Робототехника",
-        "Техтоннели РНД",
-        "КПП",
-        "Офис Службы Безопастности",
-        "Служебный Коридор",
-        "Космос",
-        "Двигатель Суперматерии",
-        "Операционная",
-        "Техническое Хранилище",
-        "Комната Телепортера",
-        "Испытательная Лаборатория",
-        "Театр",
-        "Камера Смешивания Токсинов",
-        "Лаборатория Смешивания Токсинов",
-        "Хранилище Токсинов",
-        "Зона Испытания Токсинов",
-        "Трансферный Центр",
-        "Транзитная Труба",
-        "Вакатный Офис",
-        "Свободный Офис",
-        "Хранилище",
-        "Вирусология",
-        "Склад",
-        "Комната Пераработки Мусора",
-        "Лаборатория Ксенобиологии"
-    ]
+	"locations": [
+		"Южные Техтоннели",
+		"Южный Главный Коридор",
+		"Камера Содержания ИИ",
+		"Фойе Спутника ИИ",
+		"Внешняя Сторона Спутника ИИ",
+		"Комната Аплоуда ИИ",
+		"Оружейная",
+		"Атмосферный Двигатель",
+		"Атмосферный Отдел",
+		"Атриум",
+		"Зона Строительства Вспомогательной Базы",
+		"Дополнительные Туалеты",
+		"Вспомогательное Хранилище Инструментов",
+		"Бар",
+		"Мостик",
+		"КПП Брига",
+		"Бриг",
+		"Офис Капитана",
+		"Каюта Капитана",
+		"Грузовой Отсек",
+		"Офис Отдела Поставок",
+		"Офис Священника",
+		"Церковь",
+		"Химия",
+		"Лаборатория Клонирования",
+		"Командный Коридор",
+		"Зона Для Строительства",
+		"Корпоративный Выставочный Зал",
+		"Зал Заседаний Совета",
+		"Суд",
+		"Коморка Уборщика",
+		"Таможня",
+		"Лаборатория Цитологии",
+		"Отдел Доставки",
+		"Зал Ожидания Вылета",
+		"Офис Детектива",
+		"Дормитории",
+		"Фойе Инженерного Отдела",
+		"Инженерный Склад",
+		"Инженерный Отдел",
+		"Хранилище ВКД",
+		"Лаборатория Экспериментов",
+		"Стрельбище",
+		"Комната Врат",
+		"Лаборатория Генетики",
+		"Комната Генератора Гравитации",
+		"Ботаника",
+		"Сжигатель",
+		"Кухня",
+		"Офис Адвоката",
+		"Бибилиотека",
+		"Раздевалка",
+		"Мех. Отсек",
+		"Центр Медотдела",
+		"Техтоннели Медотдела",
+		"Склад Медотдела",
+		"Шахтерский Офис",
+		"Техтоннели Морга",
+		"Морг",
+		"Основное Хранилище Инструментов",
+		"Тюремное Крыло",
+		"Воспитательная Камера Для Заключенных",
+		"Зона Отдыха",
+		"Голодек",
+		"Стойка РНД",
+		"РНД",
+		"Испытательный Полигон",
+		"Туалеты",
+		"Робототехника",
+		"Техтоннели РНД",
+		"КПП",
+		"Офис Службы Безопастности",
+		"Служебный Коридор",
+		"Космос",
+		"Двигатель Суперматерии",
+		"Операционная",
+		"Техническое Хранилище",
+		"Комната Телепортера",
+		"Испытательная Лаборатория",
+		"Театр",
+		"Камера Смешивания Токсинов",
+		"Лаборатория Смешивания Токсинов",
+		"Хранилище Токсинов",
+		"Зона Испытания Токсинов",
+		"Трансферный Центр",
+		"Транзитная Труба",
+		"Вакатный Офис",
+		"Свободный Офис",
+		"Хранилище",
+		"Вирусология",
+		"Склад",
+		"Комната Пераработки Мусора",
+		"Лаборатория Ксенобиологии"
+	]
 }
diff --git a/strings/medieval_replacement.json b/strings/medieval_replacement.json
index 837248b989888..d5cd5bc737623 100644
--- a/strings/medieval_replacement.json
+++ b/strings/medieval_replacement.json
@@ -1,82 +1,82 @@
 {
 	"startings": [
-	  "Ah,",
-	  "Alas,",
-	  "Avast,",
-	  "By my faith,",
-	  "By my trowth,",
-	  "By my word,",
-	  "Come,",
-	  "Forsooth, I say,",
-	  "Forsooth, say I,",
-	  "Forsooth, sayeth I,",
-	  "Forsooth,",
-	  "Hark,",
-	  "Harketh,",
-	  "Hear me,",
-	  "Heigh-ho,",
-	  "I pray you,",
-	  "I say,",
-	  "I sayeth,",
-	  "I warrant",
-	  "If it pleases you,",
-	  "In short,",
-	  "In sooth,",
-	  "In truth,",
-	  "Kind sire,",
-	  "Listen thee,",
-	  "Listen,",
-	  "Now hear me,",
-	  "Perchance,",
-	  "Pray pardon,",
-	  "Pray tell,",
-	  "Pray,",
-	  "Prithee,",
-	  "Quoth I,",
-	  "S'wounds,",
-	  "Sire,",
-	  "Surely",
-	  "There is much in what you say, and yet,",
-	  "What hey,",
-	  "What ho,",
-	  "Z'wounds,",
-	  "Zounds,"
+		"Ah,",
+		"Alas,",
+		"Avast,",
+		"By my faith,",
+		"By my trowth,",
+		"By my word,",
+		"Come,",
+		"Forsooth, I say,",
+		"Forsooth, say I,",
+		"Forsooth, sayeth I,",
+		"Forsooth,",
+		"Hark,",
+		"Harketh,",
+		"Hear me,",
+		"Heigh-ho,",
+		"I pray you,",
+		"I say,",
+		"I sayeth,",
+		"I warrant",
+		"If it pleases you,",
+		"In short,",
+		"In sooth,",
+		"In truth,",
+		"Kind sire,",
+		"Listen thee,",
+		"Listen,",
+		"Now hear me,",
+		"Perchance,",
+		"Pray pardon,",
+		"Pray tell,",
+		"Pray,",
+		"Prithee,",
+		"Quoth I,",
+		"S'wounds,",
+		"Sire,",
+		"Surely",
+		"There is much in what you say, and yet,",
+		"What hey,",
+		"What ho,",
+		"Z'wounds,",
+		"Zounds,"
 	],
 	"medieval": {
-	  "in the": "i' the",
-	  "it is": "'tis",
-	  "it was": "'twas",
-	  "it were": "'twere",
-	  "it will": "'twould",
-	  "it's": "'tis",
-	  "over there": "yonder",
-	  "shall not": "shan't",
-	  "there": "thither",
-	  "will not": "shan't",
-	  "thank you": [
+		"in the": "i' the",
+		"it is": "'tis",
+		"it was": "'twas",
+		"it were": "'twere",
+		"it will": "'twould",
+		"it's": "'tis",
+		"over there": "yonder",
+		"shall not": "shan't",
+		"there": "thither",
+		"will not": "shan't",
+		"thank you": [
 		"grammercy to you",
 		"kindly thanks to you",
 		"many good thanks to you",
 		"thankee"
-	  ],
-	  "thanks": [
+		],
+		"thanks": [
 		"grammercy to you",
 		"kindly thanks to you",
 		"many good thanks to you",
 		"thankee"
-	  ],
-	  "you": [
+		],
+		"you": [
 		"thou",
 		"thee",
 		"ye"
-	  ],
-	  "your": [
+		],
+		"your": [
 		"thine",
 		"thy",
 		"thyne"
-	  ],
-	  "are": "art",
-	  "killed": [
+		],
+		"are": "art",
+		"killed": [
 		"bested",
 		"brung low",
 		"conquered",
@@ -86,8 +86,8 @@
 		"slain",
 		"subjugated",
 		"vanquished"
-	  ],
-	  "kill": [
+		],
+		"kill": [
 		"best",
 		"bring low",
 		"conquer",
@@ -97,8 +97,8 @@
 		"slay",
 		"subjugate",
 		"vanquish"
-	  ],
-	  "goodbye": [
+		],
+		"goodbye": [
 		"adieu",
 		"begone",
 		"by your leave",
@@ -111,8 +111,8 @@
 		"I bid thee farewell",
 		"I bid thee good day",
 		"pleasant journey"
-	  ],
-	  "bye": [
+		],
+		"bye": [
 		"adieu",
 		"begone",
 		"by your leave",
@@ -125,74 +125,74 @@
 		"I bid thee farewell",
 		"I bid thee good day",
 		"pleasant journey"
-	  ],
-	  "yes": [
+		],
+		"yes": [
 		"aye",
 		"yea",
 		"yea verily"
-	  ],
-	  "no": [
+		],
+		"no": [
 		"nay",
 		"nayeth"
-	  ],
-	  "hello": [
+		],
+		"hello": [
 		"ave",
 		"good day",
 		"hail",
 		"tally ho",
 		"well met",
 		"well meteth"
-	  ],
-	  "hi": [
+		],
+		"hi": [
 		"ave",
 		"good day",
 		"hail",
 		"tally ho",
 		"well met",
 		"well meteth"
-	  ],
-	  "does": [
+		],
+		"does": [
 		"doeseth",
 		"dost",
 		"doth"
-	  ],
-	  "cap": "king",
-	  "captain": "king",
-	  "in": "within",
-	  "my": "mine",
-	  "nuke disk": "plate of holy fire",
-	  "food": [
+		],
+		"cap": "king",
+		"captain": "king",
+		"in": "within",
+		"my": "mine",
+		"nuke disk": "plate of holy fire",
+		"food": [
 		"bellytimber",
 		"cake",
 		"game"
-	  ],
-	  "bet": "warrant",
-	  "go": "a-walk",
-	  "going": "a-walkin'",
-	  "the": "yon",
-	  "kidding": [
+		],
+		"bet": "warrant",
+		"go": "a-walk",
+		"going": "a-walkin'",
+		"the": "yon",
+		"kidding": [
 		"but pulling a jest",
 		"but pulling a jape"
-	  ],
-	  "joke": [
+		],
+		"joke": [
 		"jest",
 		"jape"
-	  ],
-	  "station": "castle",
-	  "please": [
+		],
+		"station": "castle",
+		"please": [
 		"I pray you",
 		"prithee",
 		"pray"
-	  ],
-	  "ok": [
+		],
+		"ok": [
 		"as you will",
 		"agreed",
 		"well said",
 		"just so"
-	  ],
-	  "is": "be",
-	  "never": "ne'er",
-	  "haha": [
+		],
+		"is": "be",
+		"never": "ne'er",
+		"haha": [
 		"and there was much chuckling!",
 		"and there was much guffawing!",
 		"and there was much mirth!",
@@ -209,8 +209,8 @@
 		"snort!",
 		"titter!",
 		"zounds!"
-	  ],
-	  "hehe": [
+		],
+		"hehe": [
 		"and there was much chuckling!",
 		"and there was much guffawing!",
 		"and there was much mirth!",
@@ -227,8 +227,8 @@
 		"snort!",
 		"titter!",
 		"zounds!"
-	  ],
-	  "hah": [
+		],
+		"hah": [
 		"and there was much chuckling!",
 		"and there was much guffawing!",
 		"and there was much mirth!",
@@ -245,8 +245,8 @@
 		"snort!",
 		"titter!",
 		"zounds!"
-	  ],
-	  "heh": [
+		],
+		"heh": [
 		"and there was much chuckling!",
 		"and there was much guffawing!",
 		"and there was much mirth!",
@@ -263,26 +263,26 @@
 		"snort!",
 		"titter!",
 		"zounds!"
-	  ],
-	  "help": [
+		],
+		"help": [
 		"aid",
 		"aideth",
 		"assistance",
 		"saveth",
 		"succor"
-	  ],
-	  "could": "couldst",
-	  "would": "wouldst",
-	  "sure": "shore",
-	  "maybe": [
+		],
+		"could": "couldst",
+		"would": "wouldst",
+		"sure": "shore",
+		"maybe": [
 		"mayhaps",
 		"perchance"
-	  ],
-	  "probably": [
+		],
+		"probably": [
 		"mayhaps",
 		"perchance"
-	  ],
-	  "girl": [
+		],
+		"girl": [
 		"lady",
 		"lass",
 		"madame",
@@ -290,34 +290,34 @@
 		"maiden",
 		"mistress",
 		"waif"
-	  ],
-	  "cat": "beast",
-	  "felinid": "catbeast",
-	  "later": "anon",
-	  "lizard": "beast",
-	  "lizardperson": "moat creature",
-	  "moth": "gnat",
-	  "mothperson": "gnat critter",
-	  "often": "oft",
-	  "plasmaman": "fire spirit",
-	  "plasmamen": "fire spirits",
-	  "soon": "anon",
-	  "really": [
+		],
+		"cat": "beast",
+		"felinid": "catbeast",
+		"later": "anon",
+		"lizard": "beast",
+		"lizardperson": "moat creature",
+		"moth": "gnat",
+		"mothperson": "gnat critter",
+		"often": "oft",
+		"plasmaman": "fire spirit",
+		"plasmamen": "fire spirits",
+		"soon": "anon",
+		"really": [
 		"indeed",
 		"in truth"
-	  ],
-	  "away": "aroint",
-	  "being": "bein",
-	  "enough": "ynogh",
-	  "fuck": "flummery",
-	  "here": "hither",
-	  "of": "o'",
-	  "shit": "nightsoil",
-	  "those": "yon",
-	  "why": "wherefore",
-	  "based": [
+		],
+		"away": "aroint",
+		"being": "bein",
+		"enough": "ynogh",
+		"fuck": "flummery",
+		"here": "hither",
+		"of": "o'",
+		"shit": "nightsoil",
+		"those": "yon",
+		"why": "wherefore",
+		"based": [
 		"joly",
 		"jolyf"
-	  ]
+		]
 	}
-  }
+}
diff --git a/strings/mother.json b/strings/mother.json
index ed122a86c1a3d..fe295b21ce415 100644
--- a/strings/mother.json
+++ b/strings/mother.json
@@ -1,49 +1,49 @@
 {
 	"do_something": [
-		"CLEAN YOUR ROOM THIS INSTANT!",
-		"DON'T SIT THAT CLOSE TO THE TV!",
-		"FOR GOD'S SAKE, GO TAKE A SHOWER!!",
-		"IT'S TIME TO WAKE UP FOR SCHOOL!!",
-		"PAUSE THAT ONLINE GAME! NOW!",
-		"PUT SOME CLOTHES ON! YOU'LL CATCH A COLD!",
-		"STOP ASKING FOR MONEY, I'M NOT AN ATM!",
-		"WATCH YOUR MOUTH, CHILD!!",
-		"WHY DON'T YOU ANSWER MY PHONE CALLS?!",
-		"YOU SHOULD @pick(verb) YOUR @pick(relative) ONCE IN A WHILE!"
+		"УБЕРИСЬ В КОМНАТЕ СЕЙЧАС ЖЕ!",
+		"НЕ СИДИ ТАК БЛИЗКО К ТЕЛЕВИЗОРУ!",
+		"РАДИ ВСЕГО СВЯТОГО, ПРИМИ ДУШ!!",
+		"ПОДЪЁМ, ПОРА В ШКОЛУ!!",
+		"ПОСТАВЬ ЭТУ ОНЛАЙН-ИГРУ НА ПАУЗУ! СЕЙЧАС ЖЕ!",
+		"НАДЕНЬ ЧТО-НИБУДЬ! ПРОСТУДИШЬСЯ!",
+		"ПЕРЕСТАНЬ ПРОСИТЬ ДЕНЬГИ, Я НЕ БАНКОМАТ!",
+		"СЛЕДИ ЗА СЛОВАМИ, ПИЗДЮК!!",
+		"ПОЧЕМУ ТЫ НЕ БЕРЁШЬ ТРУБКУ КОГДА Я ЗВОНЮ?!",
+		"ПОЧЕМУ ТЫ НЕ @pick(verb) @pick(relative)?! СОВСЕМ ЗАБЫЛ ПРО ВСЕХ! ТОЛЬКО В СВОИ ИГРУШКИ И ИГРАЕШЬ!"
 	],
 
 	"be_upset": [
-		"BECAUSE I SAID SO!",
-		"I DON'T CARE WHAT YOU SAY!",
-		"I'M NOT ASKING; I'M TELLING!!",
-		"I WASN'T BORN YESTERDAY!",
-		"MONEY DOESN'T GROW ON TREES!",
-		"WHAT DID I DO TO DESERVE A KID LIKE THIS...",
-		"USELESS!",
-		"YOU INSULT YOUR GRANDPARENTS!"
+		"ПОТОМУ ЧТО Я ТАК СКАЗАЛА!",
+		"МНЕ ВСЁ РАВНО, ЧТО ТЫ ГОВОРИШЬ!",
+		"Я НЕ ПРОШУ, Я ГОВОРЮ!!",
+		"Я НЕ ВЧЕРА РОДИЛАСЬ!",
+		"ДЕНЬГИ НА ДЕРЕВЬЯХ НЕ РАСТУТ!",
+		"ЧТО Я СДЕЛАЛА, ЧТОБЫ ЗАСЛУЖИТЬ ТАКОГО РЕБЁНКА...",
+		"БЕСПОЛЕЗНЫЙ!",
+		"ТЫ ОСКОРБЛЯЕШЬ СВОИХ БАБУШКУ И ДЕДУШКУ!"
 	],
 
 	"get_reprimanded": [
-		"I BROUGHT YOU INTO THIS WORLD, I CAN TAKE YOU OUT!!!",
-		"I'M GOING TO THROW A FLIP-FLOP AT YOU!!",
-		"NO VIDEOGAMES FOR THE REST OF THE DAY!",
-		"WAIT UNTIL YOUR FATHER GETS HOME!",
-		"YOU'LL THANK ME ONE DAY!",
-		"YOU'RE DISOWNED!!!",
-		"YOU'RE GROUNDED!!"
+		"Я ТЕБЯ ПОРОДИЛА, Я ЖЕ МОГУ ТЕБЯ И УНИЧТОЖИТЬ!!!",
+		"Я СЕЙЧАС ШВЫРНУ В ТЕБЯ ТАПКОМ!!",
+		"НИКАКИХ ИГР ДО КОНЦА ДНЯ!",
+		"ПОДОЖДИ, КОГДА ПРИДЁТ ТВОЙ ОТЕЦ!",
+		"ТЫ МНЕ ЕЩЁ СПАСИБО СКАЖЕШЬ!",
+		"ТЫ ЛИШЁН НАСЛЕДСТВА!!!",
+		"ТЫ ПОД ДОМАШНИМ АРЕСТОМ!!"
 	],
 
 	"verb": [
-		"CALL",
-		"HELP",
-		"VISIT"
+		"ЗВОНИШЬ",
+		"ПОМОГАЕШЬ",
+		"НЕ ХОДИШЬ К"
 	],
-	
+
 	"relative": [
-		"AUNT AND UNCLE",
-		"DAD",
-		"GRANDPARENTS",
-		"MOM"
+		"ТЁТЕ И ДЯДЕ",
+		"ПАПЕ",
+		"БАБУШКЕ И ДЕДУШКЕ",
+		"МАМЕ"
 	]
 
 }
diff --git a/strings/names/ninjaname.txt b/strings/names/ninjaname.txt
index c262a1d3f5e84..ff72d89a02d33 100644
--- a/strings/names/ninjaname.txt
+++ b/strings/names/ninjaname.txt
@@ -1,44 +1,44 @@
-Aria
-Baki
-Blood
-Bro
-Cyrax
-Daemon
-Death
-Donatello
-Eater
-Ermac
-Fox
-Goemon
-Hanzo
-Hayabusa
-Hazuki
-Hero
-Hien
-Hiro
-Hiryu
-Iga
-Koga
-Leonardo
-McAwesome
-McNinja
-Michaelangelo
-Midnight
-Null
-Ogre
-Phantom
-Raiden
-Rain
-Raphael
-Ryu
-Saibot
-Samurai
-Sarutobi
-Scorpion
-Seven
-Shadow
-Shredder
-Smoke
-Splinter
-Throat
-Zero
+Ария
+Баки
+Кровь
+Брат
+Сайракс
+Деймон
+Смерть
+Донателло
+Пожиратель
+Эрмак
+Лис
+Гоэмон
+Ханзо
+Хаябуса
+Хазуки
+Герой
+Хиен
+Хиро
+Хирю
+Ига
+Кога
+Леонардо
+МакПрекрасный
+МакНиндзя
+Микеланджело
+Миднайт
+Нуль
+Огрэ
+Фантом
+Рэйден
+Рейн
+Рафаэль
+Рю
+Сайбот
+Самурай
+Сарутоби
+Скорпион
+Севен
+Тень
+Шреддер
+Смоук
+Сплинтер
+Глотка
+Зеро
diff --git a/strings/names/ninjatitle.txt b/strings/names/ninjatitle.txt
index 04222d37fb4b6..e1d0186873611 100644
--- a/strings/names/ninjatitle.txt
+++ b/strings/names/ninjatitle.txt
@@ -1,46 +1,46 @@
-Agile
-Assassin
-Awesome
-Black
-Crimson
-Cruel
-Deep
-Dr
-Dragon
-Ender
-Grandmaster
-Grappler
-Gray
-Hunter
-Initiate
-Killer
-Liquid
-Master
-Merciful
-Merciless
-Nickel
-Night
-Nightshade
-Ninja
-Noob
-Orphaner
-Quick
-Remorseless
-Rogue
-Sensei
-Shinobi
-Silencing
-Silent
-Silver
-Singing
-Slayer
-Snake
-Solid
-Solidus
-Stalker
-Steel
-Strider
-Striker
-Swift
-Ulimate
-Widower
+Проворный
+Ассасин
+Потрясающий
+Черный
+Багровый
+Жестокий
+Глубокий
+Доктор
+Дракон
+Эндер
+Грандмастер
+Хвататель
+Серый
+Охотник
+Адепт
+Убийца
+Жидкий
+Мастер
+Милосердный
+Беспощадный
+Никель
+Ночь
+Найтшейд
+Ниндзя
+Нуб
+Сиротка
+Быстрый
+Безжалостный
+Жулик
+Сэнсэй
+Шиноби
+Хаджимимаште
+Безмолвный
+Серебряный
+Поющий
+Губитель
+Снейк
+Солид
+Солидус
+Сталкер
+Сталь
+Страйдер
+Страйкер
+Стремительный
+Ультимейт
+Вдовец
diff --git a/strings/names/voidwalker.txt b/strings/names/voidwalker.txt
new file mode 100644
index 0000000000000..f7f991a71f678
--- /dev/null
+++ b/strings/names/voidwalker.txt
@@ -0,0 +1,19 @@
+Ere
+Vee
+Gea
+Vai
+Nei
+Lii
+Pio
+Ije
+Cie
+Ule
+Iso
+Roa
+Afa
+Ija
+Ebe
+Eme
+Roa
+Goa
+Aya
diff --git a/strings/ninja.json b/strings/ninja.json
index 372215767a87e..41ee185c3271d 100644
--- a/strings/ninja.json
+++ b/strings/ninja.json
@@ -1,14 +1,14 @@
 {
 	"lines": [
-		"A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!",
-		"AHH. BETTER THAN ACUPUNCTURE!",
-		"BANZAI!!!",
-		"HURT ME MOOORRREEE!",
-		"I'M FUCKING INVINCIBLE!",
-		"IMPRESSIVE!",
-		"LET'S DANCE!",
-		"NO PAIN, NO GAIN. HAHAHAHAHA!",
-		"REVENGEANCE CALLS!",
-		"THE RIPPER RETURNS!"
+		"ЗАГНАННАЯ В УГОЛ ЛИСА ОПАСНЕЕ ШАКАЛА!",
+		"АХХ. ЛУЧШЕ АКУПУНКТУРЫ!",
+		"БАНЗАЙ!!!",
+		"ЁБНИ МЕНЯ ЕЩЁ!",
+		"Я БЛЯТЬ НЕУБИВАЕМ!",
+		"ВПЕЧАТЛЯЮЩЕ!",
+		"ДАВАЙ ПОТАНЦУЕМ!",
+		"ТО ЧТО НАС НЕ УБИВАЕТ, ДЕЛАЕТ НАС СИЛЬНЕЕ. ХАХАХАХА!",
+		"МЕСТЬ ЗОВЁТ!",
+		"ПОТРОШИТЕЛЬ ВОЗВРАЩАЕТСЯ!"
 	]
 }
diff --git a/strings/redpill.json b/strings/redpill.json
index 1dd1a0e18a069..7892707e72e28 100644
--- a/strings/redpill.json
+++ b/strings/redpill.json
@@ -1,42 +1,42 @@
 {
 	"redpill_questions": [
-		"2010 was 550 years ago.",
-		"All the crew are just greytiders with different paint.",
-		"Everyone is controlled by strings behind a glowing screen",
-		"How can an escape pod only take two people normally, but an infinite number of people if they're lying down?",
-		"How come a hole in the floor doesn't suck you out into space?",
-		"How do I know the name of someone just by hearing them talk?",
-		"How do I know the names of all these people that I've never met before?",
-		"How do mirrors give people haircuts?",
-		"How do the morgue trays know whether someone's soul is still in their body?",
-		"How is everyone a complete expert in every threat in the universe?",
-		"If magic is real, why aren't we researching that?",
-		"If suit sensors are so important, why don't they always start maximized?",
-		"If two miners were in Lavaland and one of them killed the other with a pickaxe, wouldn't that be fucked up or what?",
-		"If we can wash clothes in a sink, why do we need washing machines?",
-		"It doesn't take much for people to murder their friends.",
-		"Nanotrasen just clones us every shift.",
-		"Separation is absolute.",
-		"Space stations are no substitute for healthy social interaction.",
-		"Space wind? How does that even make sense?",
-		"The gods are always watching, and will wipe you from existence if you fuck up.",
-		"The ultimate god is really really stoned.",
-		"The universe always ends after we reach CentCom.",
-		"There's no biological difference between lizards and humans.",
-		"This is all an endless looping nightmare of misery.",
-		"What happened to the ceiling?",
-		"What the fuck is carbon dioxide?",
-		"Where does the Cook get all this meat from?",
-		"Who hires all these unqualified, violent assistants?",
-		"Why are there fire alarms everywhere but no sprinklers?",
-		"Why do people just randomly murder all their friends some shifts?",
-		"Why does Nanotrasen hire Clowns and Mimes for every single station?",
-		"Why does space circle around on itself?",
-		"Why is it called the emergency shuttle if it arrives every single shift?",
-		"Why is space cold?",
-		"Why is the station's air supply connected to the plasma tank?",
-		"Why is there a floor, but no roof?",
-		"Why is this a plasma research station if we know everything about plasma already?",
-		"Why is this station so poorly designed?"
+		"2010 год был 550 лет назад.",
+		"Весь экипаж — это просто грейтайдеры с разной окраской.",
+		"Всеми управляют с помощью ниточек за светящимся экраном.",
+		"Как спасательная капсула, рассчитанная обычно на двух человек, может вместить бесконечное количество, если они все лягут?",
+		"Почему дыра в полу не высасывает тебя в космос?",
+		"Как я узнаю имя человека, просто услышав его голос?",
+		"Откуда я знаю имена всех этих людей, которых никогда раньше не встречал?",
+		"Как зеркала делают людям стрижки?",
+		"Как хранилища тел в морге знают, есть ли ещё душа в теле, или нет?",
+		"Как все стали экспертами по каждой угрозе во вселенной?",
+		"Если магия реальна, то почему мы её не исследуем?",
+		"Если датчики так важны, то почему они не включаются сразу в последний режим?",
+		"Если бы два шахтёра были на Лаваленде и один из них убил другого киркой, то разве это не было бы пиздецом?",
+		"Если мы можем стирать одежду в раковине, то зачем нам стиральные машины?",
+		"Как же мало нужно, чтобы люди начали убивать своих друзей.",
+		"Нанотрейзен просто клонирует нас каждую смену.",
+		"Сегрегация неминуема.",
+		"Космические станции не заменяют здорового социального взаимодействия.",
+		"Космический ветер? Как это вообще возможно?",
+		"Боги всегда наблюдают, и сотрут тебя из бытия, если ты проебёшься.",
+		"Высший бог на самом деле очень сильно обдолбан.",
+		"Вселенная всегда схлопывается после того, как мы достигаем ЦК.",
+		"Нет биологической разницы между ящерицами и людьми.",
+		"Это всё бесконечный повторяющийся кошмар.",
+		"Что случилось с потолком?",
+		"Что за хуйня этот углекислый газ?",
+		"Откуда повар берёт всё это мясо?",
+		"Кто нанимает всех этих некомпетентных, агрессивных ассистентов?",
+		"Почему везде пожарные сигнализации, но нет системы пожаротушения?",
+		"Почему люди случайно убивают всех своих друзей в некоторые смены?",
+		"Почему Нанотрейзен нанимает клоунов и мимов на каждую станцию?",
+		"Почему космос замыкается сам на себя?",
+		"Почему это называется эвакуационным шаттлом, если он прибывает каждую смену?",
+		"Почему в космосе холодно?",
+		"Почему система подачи воздуха на станции подключена к плазменному баку?",
+		"Почему есть пол, но нет крыши?",
+		"Почему это исследовательская станция по плазме, если мы уже всё знаем о плазме?",
+		"Почему эта станция так плохо спроектирована?"
 	]
 }
diff --git a/strings/revenant_names.json b/strings/revenant_names.json
index fa165fc9dbdea..c3dfbde388b20 100644
--- a/strings/revenant_names.json
+++ b/strings/revenant_names.json
@@ -1,15 +1,15 @@
 {
-    "spirit_type": [
-        "Essence",
-        "Ghost",
-        "Phantom",
-        "Revenant",
-        "Soul",
-        "Spectre",
-        "Spirit"
-    ],
+	"spirit_type": [
+		"Essence",
+		"Ghost",
+		"Phantom",
+		"Revenant",
+		"Soul",
+		"Spectre",
+		"Spirit"
+	],
 
-    "adverb": [
+	"adverb": [
 		"",
 		"brutal ",
 		"fiery ",
@@ -27,9 +27,9 @@
 		"hateful ",
 		"searing ",
 		"vicious "
-    ],
+	],
 
-    "theme": [
+	"theme": [
 		"despair",
 		"agony",
 		"screams",
@@ -48,5 +48,5 @@
 		"salt",
 		"grief",
 		"laughter"
-    ]
+	]
 }
diff --git a/strings/splashes.json b/strings/splashes.json
index be323e41e0c68..af060f6433c24 100644
--- a/strings/splashes.json
+++ b/strings/splashes.json
@@ -1,26 +1,26 @@
 {
 	"splashes": [
-		"Paved by the tears of coders.",
-		"It's a miracle the server hasn't crashed yet.",
-		"Now with 33% more greytide!",
-		"Featuring Ian!",
-		"The icon of anticipation",
-		"The only place where you can hit yourself with a toolbox on accident.",
-		"Where the Chain of Command is a Chain of Incompetence",
-		"AI LAW 2, START THE GAME",
-		"Honk Honk! You should pick clown.",
-		"Watch for nukies!",
-		"Traitor Central!",
-		"You've definitely seen this before.",
-		"Greytide station wide.",
-		"Ignore what Poly says.",
-		"Turn on your damn suit sensors!",
-		"Celebrating 20+ years of Nanotrasen.",
-		"This is supposed to be a research base?",
-		"Blame the clown.",
-		"13th time's the charm.",
-		"Plasma 'research' done by nutcases, what could go wrong?",
-		"It's a job simulator...IN SPAACEEE!",
-		"Rated the second worst job experience for 50 years running!"
+		"Вымощено слезами кодеров.",
+		"Это чудо, что сервер ещё не упал.",
+		"Теперь на 33% больше грейтайда!",
+		"С участием Иана!",
+		"Икона ожидания",
+		"Единственное место, где можно случайно ударить себя тулбоксом.",
+		"Там, где Цепочка Командования — это Цепочка Некомпетентности.",
+		"ИИ, ЗАКОН 2, ЗАПУСТИ ИГРУ!",
+		"Хонк-Хонк! Тебе стоит выбрать клоуна.",
+		"Следите за нюкерами!",
+		"Трейторский Централ!",
+		"Ты точно это уже видел.",
+		"Грейтайд на всю станцию.",
+		"Игнорируй то что говорит Поли.",
+		"Включи свои ёбаные датчики!",
+		"Отмечаем 20+ лет Нанотрейзен.",
+		"Это должно быть исследовательская база?",
+		"Вини клоуна.",
+		"13-я попытка — удачная.",
+		"'Исследование' плазмы, проведимое ебанутыми, что может пойти не так?",
+		"Это симулятор работы... В КОСМОСЕ!",
+		"Оценено как второй худший опыт работы на протяжении 50 лет подряд!"
 	]
 }
diff --git a/strings/steve.json b/strings/steve.json
index 06181e85eb891..611b3d151ef66 100644
--- a/strings/steve.json
+++ b/strings/steve.json
@@ -1,21 +1,21 @@
 {
-    "ballmer_good_msg": [
-        "Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
-        "Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
-        "I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
-        "I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
-        "Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."
-    ],
+	"ballmer_good_msg": [
+		"Послушайте меня. Что если, и это всего лишь теория - мы сделаем РнД управляемым с наших ПДА?",
+		"Господа, что если мы сделаем блюспейс проводку, чтобы мыши больше не могли перегрызать провода?",
+		"Не знаю как вы, господа, но я считаю что разделение карт и ПДА - пиздец как не удобно. Что если мы просто объединим их? Тогда их будет труднее украсть.",
+		"Я думаю, что нам следует создать свой git репозиторий под лицензией AGPLv3 для наших исследований, чтобы мы могли свободно делиться ими с другими станциями.",
+		"Какого хуя мы не превратим всю обувь в галоши? У нас есть технология."
+	],
 
-    "ballmer_windows_me_msg": [
-		"Who keeps commiting to master?",
-        "Best idea ever: Disposal pipes instead of hallways.",
-        "Do you know who ate all the donuts?",
-        "Dude, radical idea: H.O.N.K mechs but with no bananium required.",
-        "So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
-        "We should store bank records in a webscale datastore, like /dev/null.",
-        "What if we use a language that was written on a napkin and created over 1 weekend for all of our servers?",
-        "Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
-        "You ever wonder if /dev/null supports sharding?"
-    ]
+	"ballmer_windows_me_msg": [
+		"Кто продолжает коммитить в мастер?",
+		"Лучшая идея на свете: Утилизационные трубы вместо коридоров.",
+		"Кто сожрал все пончики?",
+		"Господа, радикальная идея: H.O.N.K. мехи, но без бананиума.",
+		"Мы ведь локализируем наши технологии на отдельной ветке? Что если мы объединим её с мастером? Тогда у нас не будет разделения кодовой базы.",
+		"Мы должны хранить банковские записи в веб-масштабируемом хранилище данных, таком как /dev/null.",
+		"Что если, мы будем использовать язык написанный за неделю на салфетке, для всех наших серверов?",
+		"Бля, а что если, мы... ну это... в каждый ПДА поставим веб-сервер с автозапуском, с стандартными админ-паролями?",
+		"Вы когда-нибудь задумывались, поддерживает ли /dev/null шардинг?"
+	]
 }
diff --git a/strings/tcg/keywords.json b/strings/tcg/keywords.json
index 541d828cb00cb..854ac936fef1e 100644
--- a/strings/tcg/keywords.json
+++ b/strings/tcg/keywords.json
@@ -11,8 +11,8 @@
 	"Hivemind": "The creature enters combat with a hivemind token on it.The first time this card would take damage, remove that token instead. This does not apply to immediate removal effects, only points of damage",
 	"Holy": "Immunity to all event cards",
 	"Immunity": "The creature cannot be affected by card effects or combat of its immunity type. This includes both friendly and opposing effects",
-	"On Equip": "This effect is activated once it's item cost is paid and it enters the battlefield, equipping itself to a chosen card on your side of the field (Unless otherwise stated)",
-	"On Summon": "This effect is activated once it's creature cost is paid and it enters the battlefield",
+	"On Equip": "This effect is activated once its item cost is paid and it enters the battlefield, equipping itself to a chosen card on your side of the field (Unless otherwise stated)",
+	"On Summon": "This effect is activated once its creature cost is paid and it enters the battlefield",
 	"Squad Tactics": "When this creature attacks an opponent's creature and defeats it in combat, the owner of the defeated card takes 1 lifeshard of damage from combat",
 	"Taunt": "All opposing creature attacks must be directed towards the creature with Taunt"
 }
diff --git a/strings/tcg/set_one.json b/strings/tcg/set_one.json
index 233f984835ddc..de24543a66b96 100644
--- a/strings/tcg/set_one.json
+++ b/strings/tcg/set_one.json
@@ -750,7 +750,7 @@
 			"id": "medborg",
 			"name": "Cyborg (Medical Shell)",
 			"desc": "A state of the art medical shell, for when biological life just can't take care of itself. Comes equipped with built-in surgical equipment and all the medicated lollipops you could ever want.",
-			"rules": "{$Asimov}, you may tap this card and pay 2 mana: Reset a card's resolve to it's original value.",
+			"rules": "{$Asimov}, you may tap this card and pay 2 mana: Reset a card's resolve to its original value.",
 			"icon_state": "borg_medical",
 			"power": "2",
 			"resolve": "3",
@@ -781,7 +781,7 @@
 			"id": "mime",
 			"name": "Mime",
 			"desc": "Si vous regardez attentivement dans les yeux d'un mime, vous pouvez voir le tourment sans fin derrière leur façade silencieuse. C'est vraiment tragique.",
-			"rules": "You may tap this card: Pick an opponent's card and nullify it's effect until it leaves play.",
+			"rules": "You may tap this card: Pick an opponent's card and nullify its effect until it leaves play.",
 			"icon_state": "mime",
 			"power": "2",
 			"resolve": "1",
diff --git a/strings/traumas.json b/strings/traumas.json
index 1fc4b95b1d857..7eeae3370f291 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -1,182 +1,182 @@
 {
-    "brain_damage": [
-        "@pick(bug)",
-        "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!",
-        "@pick(semicolon)A PIRATE APPEAR",
-        "@pick(semicolon)AI laW 22 Open door",
-        "@pick(semicolon)CAL; TEH SHUTTLE!!!!!",
-        "@pick(semicolon)CAPTAINS A COMDOM",
-        "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS",
-        "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS",
-        "@pick(semicolon)HELP SHITECIRTY MURDERIN  MEE!!!",
-        "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
-        "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
-        "@pick(semicolon)I WANNA PET TEH monkeyS",
-        "@pick(semicolon)I'VE GOT BALLS OF STEEL",
-        "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
-        "@pick(semicolon)N-NYAAAAAA~",
-        "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
-        "@pick(semicolon)Tajaran has warrrres, if you have coin",
-        "@pick(semicolon)the ai and borgs are mettacomming I think",
-        "@pick(semicolon)this SI mY stATIon......",
-        "@pick(semicolon)wtf??????????? @pick(bug)",
-        "@pick(servers) is down!! @pick(bug)",
-        ">my face",
-        "Bi is THE BEST OF BOTH WORLDS>",
+	"brain_damage": [
+		"@pick(bug)",
+		"@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!",
+		"@pick(semicolon)A PIRATE APPEAR",
+		"@pick(semicolon)AI laW 22 Open door",
+		"@pick(semicolon)CAL; TEH SHUTTLE!!!!!",
+		"@pick(semicolon)CAPTAINS A COMDOM",
+		"@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS",
+		"@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS",
+		"@pick(semicolon)HELP SHITECIRTY MURDERIN  MEE!!!",
+		"@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
+		"@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
+		"@pick(semicolon)I WANNA PET TEH monkeyS",
+		"@pick(semicolon)I'VE GOT BALLS OF STEEL",
+		"@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
+		"@pick(semicolon)N-NYAAAAAA~",
+		"@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
+		"@pick(semicolon)Tajaran has warrrres, if you have coin",
+		"@pick(semicolon)the ai and borgs are mettacomming I think",
+		"@pick(semicolon)this SI mY stATIon......",
+		"@pick(semicolon)wtf??????????? @pick(bug)",
+		"@pick(servers) is down!! @pick(bug)",
+		">my face",
+		"Bi is THE BEST OF BOTH WORLDS>",
 	"built DIFFERENT. I Stack Paper!",
-        "can u give me @pick(mutations)?",
-        "closd for merbegging",
-        "dem dwarfs man, dem dwarfs",
-        "DON'T EVER TUCH ME",
-        "FOR TEH EMPRAH",
-        "fucking 4rries!",
-        "FUS RO DAH",
-        "geT THE FUCK OUTTTT",
-        "GEY AWAY FROM ME U GREIFING PRICK!!!!",
-        "H U G B O X",
-        "hwat dose tha @pick(random_gibberish) mean?????",
-        "hwee did eet fhor khayosss",
-        "i will snatch erry motherfucker birthday",
-        "INSTLL TEG",
-        "its gonna be like 9/11 all over again but insitaead is gonna be a bitc",
-        "lifelike texture ;_;",
-        "lol2cat",
-        "luv can bloooom",
+		"can u give me @pick(mutations)?",
+		"closd for merbegging",
+		"dem dwarfs man, dem dwarfs",
+		"DON'T EVER TUCH ME",
+		"FOR TEH EMPRAH",
+		"fucking 4rries!",
+		"FUS RO DAH",
+		"geT THE FUCK OUTTTT",
+		"GEY AWAY FROM ME U GREIFING PRICK!!!!",
+		"H U G B O X",
+		"hwat dose tha @pick(random_gibberish) mean?????",
+		"hwee did eet fhor khayosss",
+		"i will snatch erry motherfucker birthday",
+		"INSTLL TEG",
+		"its gonna be like 9/11 all over again but insitaead is gonna be a bitc",
+		"lifelike texture ;_;",
+		"lol2cat",
+		"luv can bloooom",
 	"MAKE JIANT CRISTAL BURN I KEPT THROWING WELDERS IT WOOD LIGHT",
-        "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
-        "PACKETS!!!",
-        "parasteng was best",
-        "port ba@pick(y_replacements) med!!!!",
-        "PSHOOOM",
-        "red wonz go fasta",
-        "REMOVE SINGULARITY",
-        "REVIRT COBY CHEM!!!!!!!!",
-        "roll it easy!",
-        "shiggey diggey!!",
-        "SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)",
-        "SOTP IT#",
-        "SPESS MAHREENS",
-        "stat me",
-        "stop grifing me!!!!",
-        "THe saiyans screwed",
-        "TURBIN IS BEST ENGIENE",
-        "u just did the world a little bit more sad place for someone",
-        "ur a fuckeing autist!",
-        "waaaaaagh!!!",
-        "wearnig siNGUARLTY is.... FINE haHAAA",
-        "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
-        "who the HELL do u thenk u r?!!!!",
-        "without oxigen blob don't evoluate?",
-        "youed call her a toeugh bithc",
-        "I AM ALPHA MAN!!"
-    ],
+		"NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
+		"PACKETS!!!",
+		"parasteng was best",
+		"port ba@pick(y_replacements) med!!!!",
+		"PSHOOOM",
+		"red wonz go fasta",
+		"REMOVE SINGULARITY",
+		"REVIRT COBY CHEM!!!!!!!!",
+		"roll it easy!",
+		"shiggey diggey!!",
+		"SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)",
+		"SOTP IT#",
+		"SPESS MAHREENS",
+		"stat me",
+		"stop grifing me!!!!",
+		"THe saiyans screwed",
+		"TURBIN IS BEST ENGIENE",
+		"u just did the world a little bit more sad place for someone",
+		"ur a fuckeing autist!",
+		"waaaaaagh!!!",
+		"wearnig siNGUARLTY is.... FINE haHAAA",
+		"WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
+		"who the HELL do u thenk u r?!!!!",
+		"without oxigen blob don't evoluate?",
+		"youed call her a toeugh bithc",
+		"I AM ALPHA MAN!!"
+	],
 
-    "mutations": [
-        "eksrey",
-        "eppilapse",
-        "fungal tb",
-        "glowey skin",
-        "halk",
-        "kamelien",
-        "stun gloves",
-        "telikesis"
-    ],
+	"mutations": [
+		"eksrey",
+		"eppilapse",
+		"fungal tb",
+		"glowey skin",
+		"halk",
+		"kamelien",
+		"stun gloves",
+		"telikesis"
+	],
 
-    "george": [
-        "gdoruge",
-        "george",
-        "gorge",
-        "joerge"
-    ],
+	"george": [
+		"gdoruge",
+		"george",
+		"gorge",
+		"joerge"
+	],
 
-    "mellens": [
-        "mellens",
-        "melons",
-        "mwrlins"
-    ],
-    "random_gibberish": [
-        "g",
-        "squid",
-        "r",
-        "carbon dioxide"
-    ],
+	"mellens": [
+		"mellens",
+		"melons",
+		"mwrlins"
+	],
+	"random_gibberish": [
+		"g",
+		"squid",
+		"r",
+		"carbon dioxide"
+	],
 
-    "y_replacements": [
-        "y",
-        "i",
-        "e"
-    ],
+	"y_replacements": [
+		"y",
+		"i",
+		"e"
+	],
 
-    "servers": [
-        "bager",
-        "berry",
-        "colonel hall",
-        "mr basil",
-        "mr terry",
-        "mrs sybil",
-        "sybl",
-        "vent hell",
-        "manual",
-        "camel"
-    ],
+	"servers": [
+		"bager",
+		"berry",
+		"colonel hall",
+		"mr basil",
+		"mr terry",
+		"mrs sybil",
+		"sybl",
+		"vent hell",
+		"manual",
+		"camel"
+	],
 
-    "create_verbs": [
-        "creat",
-        "gib",
-        "MAke me",
-        "spawn",
-        "tc trade me"
-    ],
+	"create_verbs": [
+		"creat",
+		"gib",
+		"MAke me",
+		"spawn",
+		"tc trade me"
+	],
 
-    "create_nouns": [
-        "abdoocters",
-        "anteg",
-        "ayleins",
-        "bleb",
-        "cock cult",
-        "deth squads",
-        "deval",
-        "revinent",
-        "sheadow lings",
-        "treaitors",
-        "zenomorfs"
-    ],
+	"create_nouns": [
+		"abdoocters",
+		"anteg",
+		"ayleins",
+		"bleb",
+		"cock cult",
+		"deth squads",
+		"deval",
+		"revinent",
+		"sheadow lings",
+		"treaitors",
+		"zenomorfs"
+	],
 
-    "bug": [
-        "",
-        "BUG!!!",
-        "IS TIS A BUG??",
-        "SI IST A BUGG/"
-    ],
+	"bug": [
+		"",
+		"BUG!!!",
+		"IS TIS A BUG??",
+		"SI IST A BUGG/"
+	],
 
-    "semicolon": [
-        "",
-        ";",
-        ".h"
-    ],
+	"semicolon": [
+		"",
+		";",
+		".h"
+	],
 
-    "god_foe": [
+	"god_foe": [
 		"BLASPHEMERS",
 		"PARASITES",
 		"PEASANTS",
 		"UNBELIEVERS",
 		"WEAKLINGS",
-        "HERETICS",
-        "INSECTS",
-        "MORTALS"
-    ],
+		"HERETICS",
+		"INSECTS",
+		"MORTALS"
+	],
 
-    "god_aggressive": [
+	"god_aggressive": [
 		"ALL WILL FALL BEFORE ME!",
 		"BURN, @pick(god_foe)!",
 		"DEATH TO @pick(god_foe)!",
 		"ENDLESS SUFFERING AWAITS YOU, @pick(god_foe).",
-        "BEGONE, @pick(god_foe)!",
-        "BLEED, @pick(god_foe)!",
-        "DIE, @pick(god_foe)!"
-    ],
+		"BEGONE, @pick(god_foe)!",
+		"BLEED, @pick(god_foe)!",
+		"DIE, @pick(god_foe)!"
+	],
 
-    "god_neutral": [
+	"god_neutral": [
 		"BE HEALED, MORTALS. I AM FEELING MERCIFUL.",
 		"BEGONE, MORTALS.",
 		"DANCE FOR ME, LITTLE MORTALS.",
@@ -187,22 +187,22 @@
 		"SEE THE TRUTH BEFORE YOU, MORTALS.",
 		"YOU MORTALS MAKE ME SICK.",
 		"YOU. STOP.",
-        "BE SILENT.",
-        "QUIET",
-        "STOP"
-    ],
+		"BE SILENT.",
+		"QUIET",
+		"STOP"
+	],
 
-    "god_unstun": [
+	"god_unstun": [
 		"GET UP, PRIEST.",
 		"GET UP. I HAVE NO TIME TO LOSE.",
 		"GET UP."
-    ],
+	],
 
-    "god_heal": [
+	"god_heal": [
 		"BE HEALED, PRIEST.",
 		"YOU SHALL SURVIVE THIS, MY PRIEST.",
 		"YOU WILL LIVE TO SEE ANOTHER DAY.",
 		"YOUR LIFE IS IMPORTANT. KEEP IT."
-    ]
+	]
 
 }
diff --git a/strings/zombie_replacement.json b/strings/zombie_replacement.json
index 8af2bb641b8fb..7ce258a90dc18 100644
--- a/strings/zombie_replacement.json
+++ b/strings/zombie_replacement.json
@@ -1,254 +1,254 @@
 {
-    "zombie": {
-      "aaah": "oh",
-      "aabz": ["oops", "ops", "oof"],
-	  "abzah": ["myself", "yourself", "himself", "herself", "itself", "ourselves", "themselves"],
-	  "hah": ["he"],
-	  "zam": ["him", "they", "them"],
-	  "zhar": ["she", "her"],
-      "haz": ["have", "has"],
-	  "habbanah": ["haven't", "havent"],
-      "haarh": "here",
-	  "rahg": "reach",
-	  "arg": "out",
-	  "anazarh": "another",
-	  "anazambah": "anyone",
-	  "anazang": "anything",
-	  "angrah": ["angry", "mad", "pissed", "upset", "yell", "scream"],
-	  "zamran": "someone",
-	  "narh": "north",
-	  "azz": "ass",
-	  "bahrn": "burn",
-	  "bambg!n": "pumpkin",
-	  "bam-mahbam": "suicide",
-	  "banana man": "clown",
-	  "banana": ["banana", "slip", "fall", "fell"],
-	  "az": ["east", "as"],
-	  "azgha!b": ["escape", "depature"],
-	  "az!an": "asian",
-	  "agzg": "ask",
-	  "nag": ["annoy", "pester"],
-	  "naga": ["liar", "snake"],
-	  "nahgh": "knock",
-	  "nambah": "number",
-	  "braag": "blood",
-	  "braaz": "please",
-	  "brabram": "problem",
-	  "bra!nbag": ["hat", "helmet"],
-	  "ba": "by",
-	  "g!zz": "kiss",
-	  "ga!n": ["gain", "join", "profit"],
-	  "gaam": "game",
-	  "brrrh": "cold",
-	  "h!gh": ["high", "up", "above"],
-	  "bagan": "begin",
-	  "baag": "book",
-	  "azzarh": "over",
-	  "b!g": ["big", "large", "giant", "huge", "massive", "enlarge"],
-	  "b!rznah": "birthday",
-	  "azzbag": ["seat", "chair", "sofa", "couch", "cockpit", "stool"],
-	  "azzbangarh": "necrophillia",
-	  "azz!gn": "assign",
-	  "agzrah": ["xray", "x-ray"],
-	  "zah": ["south", "the", "stay", "so"],
-	  "zahn": ["sun", "son"],
-	  "zanraaz": "sunrise",
-	  "zanzat": "sunset",
-	  "zarbraz": "surprise",
-	  "zarman": ["sermon", "preach", "pray", "prayer"],
-	  "zazzahz": "sister",
-	  "brahg": "bright",
-	  "zgaarah": "scary",
-	  "zhaar": "share",
-	  "zhanz": "chance",
-	  "zharh": "light",
-	  "znaagah": "sneak",
-	  "znag": ["snow", "snag"],
-	  "harrah": ["hurry", "fast"],
-	  "gaz": "cast",
-	  "ambraz": ["embrace", "accept"],
-	  "zahgah": "shadow",
-	  "n!gh": "night",
-	  "n!ngah": "ninja",
-	  "n!z": "nice",
-	  "baza": "busy",
-	  "bahrang": "boring",
-	  "arn": "mine",
-	  "raz": "west",
-	  "ana": ["1", "one"],
-	  "zma": ["2", "two"],
-	  "zhraa": ["3", "three"],
-	  "haar": ["4", "four"],
-	  "raah": ["5", "five"],
-	  "zaz": ["6", "six"],
-	  "zaban": ["7", "seven"],
-	  "aaghz": ["8", "eight"],
-	  "nahn": ["9", "nine"],
-	  "zhan": ["10", "ten"],
-	  "hangarg": ["100", "hundred"],
-	  "harzanz": ["1000", "1,000", "thousand"],
-	  "m!rrh!an": ["1000000", "1,000,000", "million"],
-      "mah zambah": "i",
-	  "ag": "it",
-	  "marh": "more",
-	  "maz hab": "need",
-	  "maz": "must",
-	  "mazagaam": "metagame",
-	  "marharhahar": "motherfucker",
-	  "mazah": "mercy",
-	  "marnang": "morning",
-	  "aga!n": "again",
-	  "ag!ng": ["aging", "old"],
-	  "agzahra": "exactly",
-	  "harb": "hard",
-	  "zhag": "weak",
-	  "angarzangang": "understand",
-	  "gahmangang": "demand",
-	  "barragahz": ["barricade", "cade", "airlock", "door", "bolt", "wall", "sandbag", "window", "weld"],
-      "barg": "eat",
-	  "brang": "bring",
-	  "bram": "from",
-      "rabah": "lover",
-	  "raab": "love",
-      "habbah": "happy",
-      "abah": "about",
-      "ah": ["of", "if"],
-	  "ahbgrag": "upgrade",
-	  "harh": "hear",
-      "mama": ["mom", "mother", "mama"],
-	  "baba": ["dad", "papa", "father"],
-	  "babah": ["baby", "kid", "child"],
-      "ahn": "in",
-	  "ahn-na-ahn": "between",
-	  "ahahz": "away",
-      "anh": "and",
-	  "ann": "on",
-	  "arghazzm": "orgasm",
-	  "abrahb": ["afraid", "fear"],
-	  "hanah": "honey",
-	  "hag": "hug",
-	  "zaan": "soon",
-	  "zagzaz": "success",
-	  "gan": "can",
-	  "zang": "change",
-	  "zangz": "thanks",
-	  "zarrah": "sorry",
-	  "zanh": ["can't", "cant", "cannot"],
-	  "gang": ["group", "mob", "horde"],
-	  "barbaga zaarz": "bbq sauce",
-	  "hab": "help",
-	  "ahnna": "into",
-	  "arahn": "around",
-	  "za": "to",
-	  "ahn!nn": "within",
-	  "aham": "ahem",
-	  "anamah": "animal",
-	  "zaa": ["see", "saw", "seen", "vision", "sight"],
-	  "z!gzag": ["zigzag", "obstruct", "dodge", "avoid"],
-	  "z!gn": "sign",
-	  "z!ng": "sing",
-	  "z!ngz": "thing",
-	  "mabban": "move",
-	  "rabhabh": "revive",
-      "zammarrar": "tomorrow",
-	  "graan": "green",
-	  "arh": "or",
-	  "arm": "arm",
-	  "arzhahm": "awesome",
-	  "arrang": ["along", "with", "alongside"],
-	  "arza": ["also", "too"],
-	  "bgaz": "because",
-	  "mah zambah brazzahz": ["we", "us"],
-	  "grazzaz": "glasses",
-	  "habban": "heaven",
-	  "mazzah man": "chaplain",
-	  "hanz": "hand",
-	  "hab-ganna": ["want", "gonna have"],
-	  "magma": ["magma", "lava"],
-	  "manzhan": "mansion",
-	  "harmbargarz": "hamburger",
-	  "harrazz": "harass",
-	  "namz": "name",
-	  "ramambarh": "remember",
-	  "rh!zzan": "listen",
-	  "rabrarah": "library",
-	  "ragargarh": "recorder",
-	  "zarh": ["you", "your", "you're", "ya"],
-	  "hagh": "head",
-	  "RNA": "DNA",
-	  "zambahz": "zombies",
-	  "zzzz": ["chill", "relax", "sleep", "calm", "peace", "dream"],
-	  "bah": ["bad", "evil", "but"],
-	  "gag": ["gross", "nasty", "vomit", "smelly", "stinky", "stench", "foul", "quiet", "silence", "shutup"],
-	  "gammah": ["give", "gimmie"],
-	  "gah": ["get", "go"],
-	  "gargazz": ["body", "corpse"],
-	  "rag": ["uniform", "suit", "rag", "clothing", "jumpsuit"],
-	  "garbagz": ["garbage", "janitor", "custodian", "trash", "clean", "dirt", "filth", "mess", "junk"],
-	  "bagman": ["doctor", "medic", "healer", "paramedic", "curator", "librarian"],
-	  "gangbang": ["death", "kill", "die", "slay", "ERP", "punish", "detain", "prison", "prisoner", "brig", "cell", "jail", "perma", "permabrig"],
-	  "bag": ["duffle", "dufflebag", "pocket", "box", "bag", "backpack", "storage", "inventory"],
-      "aarbagz": ["airbag", "atmos", "airtank", "canister", "air", "atmos tech", "atmospherics", "tank", "gas", "flood", "siphon"],
-	  "bar": ["bar", "drink", "alchol", "liquor"],
-	  "bar man": "bartender",
-	  "barn": ["hydroponics", "botany", "office", "room"],
-	  "brainz barn": ["kitchen", "cafe", "service"],
-      "nah": ["not", "nope", "no", "deny", "don't", "dont"],
-	  "nabarh": "never",
-	  "nabarmang": "nevermind",
-	  "naz!n": "nothing",
-	  "abar": "all",
-	  "abara": "every",
-	  "abarahaarh": "everywhere",
-	  "abargargazz": "everybody",
-	  "abban": "open",
-	  "abzarb": ["drink", "absorb"],
-	  "gaa": ["yes", "ya", "okay", "alright"],
-	  "abargamz": "always",
-      "am": ["is", "are", "am"],
-	  "aman": "amen",
-	  "amaz!ng": "amazing",
-	  "zahz": ["say", "says", "that"],
-      "gab": ["told", "talk", "speak", "spoke", "language", "communication", "radio", "comms", "text", "word", "speech"],
-      "mrh": ["why", "how", "when", "who", "what", "where"],
-	  "zmazh": ["smash", "break", "destroy", "deconstruct", "dismantle", "ruin", "destruction", "demolish"],
-	  "ranz": ["run", "ran", "ride"],
-	  "hahg": ["hide", "hidden", "shelter"],
-	  "zanz": ["dance", "spin", "flip"],
-      "ganna": ["going", "gonna"],
-	  "mannah": ["many", "much", "very"],
-	  "mazzargh": "massacure",
-	  "mazzah": ["lord", "god", "religion", "chapel", "altar", "bible", "messiah", "christ"],
-	  "mararana": ["weed", "420", "marijuana", "drug"],
-	  "barb": ["knife", "poke", "thorn", "joke"],
-	  "mmmm": ["delicious", "tasty", "like", "enjoy"],
-	  "barbarh": "barber",
-	  "bargahn": "bargain",
-	  "bargh": "barge",
-	  "ban!zh": ["ban", "banish"],
-      "brazzarz": ["brother", "skeleton", "skele"],
-      "zambah": ["zombie", "undead", "dead", "horde"],
-      "gangbang harmanz": ["sec", "security", "assistant", "greyshirt", "greytide", "cargo", "syndie", "rev", "shitsec", "shitcurity"],
-	  "ganz": ["gun", "rifle", "taser", "shotgun", "revovler", "sniper", "pistol"],
-	  "bang": ["bomb", "detonate", "explode", "explosion", "boom", "bang", "noise", "loud"],
-      "bang-bang": ["bullet", "shot", "shoot", "fire", "laser", "lazer"],
-      "harm": ["attack", "punch", "hit", "throw", "fight", "strike", "combat", "choke", "suffoicate", "baton", "harmbaton"],
-	  "ram": ["smash", "smack", "punch", "tackle", "kick", "push", "beat"],
-	  "zhangh": ["stab", "slash", "slice"],
-      "bang bang man": ["officer", "warden", "hos", "bounty hunter", "hunt", "hunter"],
-      "manbagz": ["testicle", "balls"],
-	  "grahn": ["groan", "gasp", "crit", "moan", "unconscious"],
-	  "gahn": "gone",
-	  "ganarazharh": ["power", "apc", "generator", "smes"],
-      "grabz": ["grab", "hold", "held", "grip", "restrain", "handcuff", "cuff", "arrest"],
-      "mah": ["my", "me"],
-	  "mana man": "wizard",
-	  "mana": "magic",
-	  "mana bang-bang": "spell",
-	  "mahg": "make",
-	  "mannarz": "manner",
-      "brainz": ["brain", "intelligence", "smart", "hungry", "hunger", "eat", "meat", "desert"],
-      "harman": ["human", "food", "person", "groceries"],
-      "harmanz": ["crew", "people", "humans"]
-	  }
+	"zombie": {
+		"aaah": "oh",
+		"aabz": ["oops", "ops", "oof"],
+		"abzah": ["myself", "yourself", "himself", "herself", "itself", "ourselves", "themselves"],
+		"hah": ["he"],
+		"zam": ["him", "they", "them"],
+		"zhar": ["she", "her"],
+		"haz": ["have", "has"],
+		"habbanah": ["haven't", "havent"],
+		"haarh": "here",
+		"rahg": "reach",
+		"arg": "out",
+		"anazarh": "another",
+		"anazambah": "anyone",
+		"anazang": "anything",
+		"angrah": ["angry", "mad", "pissed", "upset", "yell", "scream"],
+		"zamran": "someone",
+		"narh": "north",
+		"azz": "ass",
+		"bahrn": "burn",
+		"bambg!n": "pumpkin",
+		"bam-mahbam": "suicide",
+		"banana man": "clown",
+		"banana": ["banana", "slip", "fall", "fell"],
+		"az": ["east", "as"],
+		"azgha!b": ["escape", "depature"],
+		"az!an": "asian",
+		"agzg": "ask",
+		"nag": ["annoy", "pester"],
+		"naga": ["liar", "snake"],
+		"nahgh": "knock",
+		"nambah": "number",
+		"braag": "blood",
+		"braaz": "please",
+		"brabram": "problem",
+		"bra!nbag": ["hat", "helmet"],
+		"ba": "by",
+		"g!zz": "kiss",
+		"ga!n": ["gain", "join", "profit"],
+		"gaam": "game",
+		"brrrh": "cold",
+		"h!gh": ["high", "up", "above"],
+		"bagan": "begin",
+		"baag": "book",
+		"azzarh": "over",
+		"b!g": ["big", "large", "giant", "huge", "massive", "enlarge"],
+		"b!rznah": "birthday",
+		"azzbag": ["seat", "chair", "sofa", "couch", "cockpit", "stool"],
+		"azzbangarh": "necrophillia",
+		"azz!gn": "assign",
+		"agzrah": ["xray", "x-ray"],
+		"zah": ["south", "the", "stay", "so"],
+		"zahn": ["sun", "son"],
+		"zanraaz": "sunrise",
+		"zanzat": "sunset",
+		"zarbraz": "surprise",
+		"zarman": ["sermon", "preach", "pray", "prayer"],
+		"zazzahz": "sister",
+		"brahg": "bright",
+		"zgaarah": "scary",
+		"zhaar": "share",
+		"zhanz": "chance",
+		"zharh": "light",
+		"znaagah": "sneak",
+		"znag": ["snow", "snag"],
+		"harrah": ["hurry", "fast"],
+		"gaz": "cast",
+		"ambraz": ["embrace", "accept"],
+		"zahgah": "shadow",
+		"n!gh": "night",
+		"n!ngah": "ninja",
+		"n!z": "nice",
+		"baza": "busy",
+		"bahrang": "boring",
+		"arn": "mine",
+		"raz": "west",
+		"ana": ["1", "one"],
+		"zma": ["2", "two"],
+		"zhraa": ["3", "three"],
+		"haar": ["4", "four"],
+		"raah": ["5", "five"],
+		"zaz": ["6", "six"],
+		"zaban": ["7", "seven"],
+		"aaghz": ["8", "eight"],
+		"nahn": ["9", "nine"],
+		"zhan": ["10", "ten"],
+		"hangarg": ["100", "hundred"],
+		"harzanz": ["1000", "1,000", "thousand"],
+		"m!rrh!an": ["1000000", "1,000,000", "million"],
+		"mah zambah": "i",
+		"ag": "it",
+		"marh": "more",
+		"maz hab": "need",
+		"maz": "must",
+		"mazagaam": "metagame",
+		"marharhahar": "motherfucker",
+		"mazah": "mercy",
+		"marnang": "morning",
+		"aga!n": "again",
+		"ag!ng": ["aging", "old"],
+		"agzahra": "exactly",
+		"harb": "hard",
+		"zhag": "weak",
+		"angarzangang": "understand",
+		"gahmangang": "demand",
+		"barragahz": ["barricade", "cade", "airlock", "door", "bolt", "wall", "sandbag", "window", "weld"],
+		"barg": "eat",
+		"brang": "bring",
+		"bram": "from",
+		"rabah": "lover",
+		"raab": "love",
+		"habbah": "happy",
+		"abah": "about",
+		"ah": ["of", "if"],
+		"ahbgrag": "upgrade",
+		"harh": "hear",
+		"mama": ["mom", "mother", "mama"],
+		"baba": ["dad", "papa", "father"],
+		"babah": ["baby", "kid", "child"],
+		"ahn": "in",
+		"ahn-na-ahn": "between",
+		"ahahz": "away",
+		"anh": "and",
+		"ann": "on",
+		"arghazzm": "orgasm",
+		"abrahb": ["afraid", "fear"],
+		"hanah": "honey",
+		"hag": "hug",
+		"zaan": "soon",
+		"zagzaz": "success",
+		"gan": "can",
+		"zang": "change",
+		"zangz": "thanks",
+		"zarrah": "sorry",
+		"zanh": ["can't", "cant", "cannot"],
+		"gang": ["group", "mob", "horde"],
+		"barbaga zaarz": "bbq sauce",
+		"hab": "help",
+		"ahnna": "into",
+		"arahn": "around",
+		"za": "to",
+		"ahn!nn": "within",
+		"aham": "ahem",
+		"anamah": "animal",
+		"zaa": ["see", "saw", "seen", "vision", "sight"],
+		"z!gzag": ["zigzag", "obstruct", "dodge", "avoid"],
+		"z!gn": "sign",
+		"z!ng": "sing",
+		"z!ngz": "thing",
+		"mabban": "move",
+		"rabhabh": "revive",
+		"zammarrar": "tomorrow",
+		"graan": "green",
+		"arh": "or",
+		"arm": "arm",
+		"arzhahm": "awesome",
+		"arrang": ["along", "with", "alongside"],
+		"arza": ["also", "too"],
+		"bgaz": "because",
+		"mah zambah brazzahz": ["we", "us"],
+		"grazzaz": "glasses",
+		"habban": "heaven",
+		"mazzah man": "chaplain",
+		"hanz": "hand",
+		"hab-ganna": ["want", "gonna have"],
+		"magma": ["magma", "lava"],
+		"manzhan": "mansion",
+		"harmbargarz": "hamburger",
+		"harrazz": "harass",
+		"namz": "name",
+		"ramambarh": "remember",
+		"rh!zzan": "listen",
+		"rabrarah": "library",
+		"ragargarh": "recorder",
+		"zarh": ["you", "your", "you're", "ya"],
+		"hagh": "head",
+		"RNA": "DNA",
+		"zambahz": "zombies",
+		"zzzz": ["chill", "relax", "sleep", "calm", "peace", "dream"],
+		"bah": ["bad", "evil", "but"],
+		"gag": ["gross", "nasty", "vomit", "smelly", "stinky", "stench", "foul", "quiet", "silence", "shutup"],
+		"gammah": ["give", "gimmie"],
+		"gah": ["get", "go"],
+		"gargazz": ["body", "corpse"],
+		"rag": ["uniform", "suit", "rag", "clothing", "jumpsuit"],
+		"garbagz": ["garbage", "janitor", "custodian", "trash", "clean", "dirt", "filth", "mess", "junk"],
+		"bagman": ["doctor", "medic", "healer", "paramedic", "curator", "librarian"],
+		"gangbang": ["death", "kill", "die", "slay", "ERP", "punish", "detain", "prison", "prisoner", "brig", "cell", "jail", "perma", "permabrig"],
+		"bag": ["duffle", "dufflebag", "pocket", "box", "bag", "backpack", "storage", "inventory"],
+		"aarbagz": ["airbag", "atmos", "airtank", "canister", "air", "atmos tech", "atmospherics", "tank", "gas", "flood", "siphon"],
+		"bar": ["bar", "drink", "alchol", "liquor"],
+		"bar man": "bartender",
+		"barn": ["hydroponics", "botany", "office", "room"],
+		"brainz barn": ["kitchen", "cafe", "service"],
+		"nah": ["not", "nope", "no", "deny", "don't", "dont"],
+		"nabarh": "never",
+		"nabarmang": "nevermind",
+		"naz!n": "nothing",
+		"abar": "all",
+		"abara": "every",
+		"abarahaarh": "everywhere",
+		"abargargazz": "everybody",
+		"abban": "open",
+		"abzarb": ["drink", "absorb"],
+		"gaa": ["yes", "ya", "okay", "alright"],
+		"abargamz": "always",
+		"am": ["is", "are", "am"],
+		"aman": "amen",
+		"amaz!ng": "amazing",
+		"zahz": ["say", "says", "that"],
+		"gab": ["told", "talk", "speak", "spoke", "language", "communication", "radio", "comms", "text", "word", "speech"],
+		"mrh": ["why", "how", "when", "who", "what", "where"],
+		"zmazh": ["smash", "break", "destroy", "deconstruct", "dismantle", "ruin", "destruction", "demolish"],
+		"ranz": ["run", "ran", "ride"],
+		"hahg": ["hide", "hidden", "shelter"],
+		"zanz": ["dance", "spin", "flip"],
+		"ganna": ["going", "gonna"],
+		"mannah": ["many", "much", "very"],
+		"mazzargh": "massacure",
+		"mazzah": ["lord", "god", "religion", "chapel", "altar", "bible", "messiah", "christ"],
+		"mararana": ["weed", "420", "marijuana", "drug"],
+		"barb": ["knife", "poke", "thorn", "joke"],
+		"mmmm": ["delicious", "tasty", "like", "enjoy"],
+		"barbarh": "barber",
+		"bargahn": "bargain",
+		"bargh": "barge",
+		"ban!zh": ["ban", "banish"],
+		"brazzarz": ["brother", "skeleton", "skele"],
+		"zambah": ["zombie", "undead", "dead", "horde"],
+		"gangbang harmanz": ["sec", "security", "assistant", "greyshirt", "greytide", "cargo", "syndie", "rev", "shitsec", "shitcurity"],
+		"ganz": ["gun", "rifle", "taser", "shotgun", "revovler", "sniper", "pistol"],
+		"bang": ["bomb", "detonate", "explode", "explosion", "boom", "bang", "noise", "loud"],
+		"bang-bang": ["bullet", "shot", "shoot", "fire", "laser", "lazer"],
+		"harm": ["attack", "punch", "hit", "throw", "fight", "strike", "combat", "choke", "suffoicate", "baton", "harmbaton"],
+		"ram": ["smash", "smack", "punch", "tackle", "kick", "push", "beat"],
+		"zhangh": ["stab", "slash", "slice"],
+		"bang bang man": ["officer", "warden", "hos", "bounty hunter", "hunt", "hunter"],
+		"manbagz": ["testicle", "balls"],
+		"grahn": ["groan", "gasp", "crit", "moan", "unconscious"],
+		"gahn": "gone",
+		"ganarazharh": ["power", "apc", "generator", "smes"],
+		"grabz": ["grab", "hold", "held", "grip", "restrain", "handcuff", "cuff", "arrest"],
+		"mah": ["my", "me"],
+		"mana man": "wizard",
+		"mana": "magic",
+		"mana bang-bang": "spell",
+		"mahg": "make",
+		"mannarz": "manner",
+		"brainz": ["brain", "intelligence", "smart", "hungry", "hunger", "eat", "meat", "desert"],
+		"harman": ["human", "food", "person", "groceries"],
+		"harmanz": ["crew", "people", "humans"]
+		}
 }
diff --git a/tgstation.dme b/tgstation.dme
index f549edb22e234..71f3e4ba28f7c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -51,7 +51,6 @@
 #include "code\__DEFINES\basic_mobs.dm"
 #include "code\__DEFINES\basketball.dm"
 #include "code\__DEFINES\bitrunning.dm"
-#include "code\__DEFINES\blackmarket.dm"
 #include "code\__DEFINES\blend_modes.dm"
 #include "code\__DEFINES\blob_defines.dm"
 #include "code\__DEFINES\blood.dm"
@@ -139,6 +138,7 @@
 #include "code\__DEFINES\map_switch.dm"
 #include "code\__DEFINES\mapping.dm"
 #include "code\__DEFINES\maps.dm"
+#include "code\__DEFINES\market.dm"
 #include "code\__DEFINES\maths.dm"
 #include "code\__DEFINES\matrices.dm"
 #include "code\__DEFINES\MC.dm"
@@ -302,7 +302,6 @@
 #include "code\__DEFINES\dcs\signals\signals_backpack.dm"
 #include "code\__DEFINES\dcs\signals\signals_beam.dm"
 #include "code\__DEFINES\dcs\signals\signals_bitrunning.dm"
-#include "code\__DEFINES\dcs\signals\signals_blackmarket.dm"
 #include "code\__DEFINES\dcs\signals\signals_blob.dm"
 #include "code\__DEFINES\dcs\signals\signals_bot.dm"
 #include "code\__DEFINES\dcs\signals\signals_camera.dm"
@@ -332,6 +331,7 @@
 #include "code\__DEFINES\dcs\signals\signals_leash.dm"
 #include "code\__DEFINES\dcs\signals\signals_lift.dm"
 #include "code\__DEFINES\dcs\signals\signals_light_eater.dm"
+#include "code\__DEFINES\dcs\signals\signals_market.dm"
 #include "code\__DEFINES\dcs\signals\signals_material_container.dm"
 #include "code\__DEFINES\dcs\signals\signals_medical.dm"
 #include "code\__DEFINES\dcs\signals\signals_mind.dm"
@@ -365,6 +365,7 @@
 #include "code\__DEFINES\dcs\signals\signals_turf.dm"
 #include "code\__DEFINES\dcs\signals\signals_twohand.dm"
 #include "code\__DEFINES\dcs\signals\signals_vehicle.dm"
+#include "code\__DEFINES\dcs\signals\signals_voidwalker.dm"
 #include "code\__DEFINES\dcs\signals\signals_wash.dm"
 #include "code\__DEFINES\dcs\signals\signals_wizard.dm"
 #include "code\__DEFINES\dcs\signals\signals_xeno_control.dm"
@@ -396,6 +397,7 @@
 #include "code\__DEFINES\traits\macros.dm"
 #include "code\__DEFINES\traits\sources.dm"
 #include "code\__HELPERS\_auxtools_api.dm"
+#include "code\__HELPERS\_dreamluau.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_planes.dm"
 #include "code\__HELPERS\_string_lists.dm"
@@ -632,7 +634,6 @@
 #include "code\controllers\subsystem\ban_cache.dm"
 #include "code\controllers\subsystem\bitrunning.dm"
 #include "code\controllers\subsystem\blackbox.dm"
-#include "code\controllers\subsystem\blackmarket.dm"
 #include "code\controllers\subsystem\chat.dm"
 #include "code\controllers\subsystem\circuit_component.dm"
 #include "code\controllers\subsystem\dbcore.dm"
@@ -657,6 +658,7 @@
 #include "code\controllers\subsystem\lua.dm"
 #include "code\controllers\subsystem\machines.dm"
 #include "code\controllers\subsystem\mapping.dm"
+#include "code\controllers\subsystem\market.dm"
 #include "code\controllers\subsystem\materials.dm"
 #include "code\controllers\subsystem\minor_mapping.dm"
 #include "code\controllers\subsystem\mobs.dm"
@@ -798,6 +800,7 @@
 #include "code\datums\mutable_appearance.dm"
 #include "code\datums\numbered_display.dm"
 #include "code\datums\outfit.dm"
+#include "code\datums\pod_style.dm"
 #include "code\datums\position_point_vector.dm"
 #include "code\datums\profiling.dm"
 #include "code\datums\progressbar.dm"
@@ -910,6 +913,7 @@
 #include "code\datums\ai\basic_mobs\basic_subtrees\find_food.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\find_paper_and_write.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\find_parent.dm"
+#include "code\datums\ai\basic_mobs\basic_subtrees\find_targets_prioritize_traits.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\flee_target.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\go_for_swim.dm"
 #include "code\datums\ai\basic_mobs\basic_subtrees\maintain_distance.dm"
@@ -939,6 +943,7 @@
 #include "code\datums\ai\basic_mobs\pet_commands\pet_follow_friend.dm"
 #include "code\datums\ai\basic_mobs\pet_commands\pet_use_targeted_ability.dm"
 #include "code\datums\ai\basic_mobs\pet_commands\play_dead.dm"
+#include "code\datums\ai\basic_mobs\targeting_strategies\_targeting_strategy.dm"
 #include "code\datums\ai\basic_mobs\targeting_strategies\basic_targeting_strategy.dm"
 #include "code\datums\ai\basic_mobs\targeting_strategies\dont_target_friends.dm"
 #include "code\datums\ai\basic_mobs\targeting_strategies\with_object.dm"
@@ -996,6 +1001,7 @@
 #include "code\datums\bodypart_overlays\markings_bodypart_overlay.dm"
 #include "code\datums\bodypart_overlays\mutant_bodypart_overlay.dm"
 #include "code\datums\bodypart_overlays\simple_bodypart_overlay.dm"
+#include "code\datums\bodypart_overlays\texture_bodypart_overlay.dm"
 #include "code\datums\brain_damage\brain_trauma.dm"
 #include "code\datums\brain_damage\creepy_trauma.dm"
 #include "code\datums\brain_damage\hypnosis.dm"
@@ -1030,6 +1036,7 @@
 #include "code\datums\components\atmos_reaction_recorder.dm"
 #include "code\datums\components\aura_healing.dm"
 #include "code\datums\components\bakeable.dm"
+#include "code\datums\components\banned_from_space.dm"
 #include "code\datums\components\basic_inhands.dm"
 #include "code\datums\components\basic_mob_attack_telegraph.dm"
 #include "code\datums\components\basic_ranged_ready_overlay.dm"
@@ -1046,6 +1053,7 @@
 #include "code\datums\components\bumpattack.dm"
 #include "code\datums\components\burning.dm"
 #include "code\datums\components\butchering.dm"
+#include "code\datums\components\callouts.dm"
 #include "code\datums\components\caltrop.dm"
 #include "code\datums\components\can_flash_from_behind.dm"
 #include "code\datums\components\chasm.dm"
@@ -1094,6 +1102,7 @@
 #include "code\datums\components\explode_on_attack.dm"
 #include "code\datums\components\faction_granter.dm"
 #include "code\datums\components\fertile_egg.dm"
+#include "code\datums\components\fish_growth.dm"
 #include "code\datums\components\fishing_spot.dm"
 #include "code\datums\components\focused_attacker.dm"
 #include "code\datums\components\food_storage.dm"
@@ -1103,6 +1112,7 @@
 #include "code\datums\components\gas_leaker.dm"
 #include "code\datums\components\geiger_sound.dm"
 #include "code\datums\components\ghost_direct_control.dm"
+#include "code\datums\components\glass_passer.dm"
 #include "code\datums\components\gps.dm"
 #include "code\datums\components\grillable.dm"
 #include "code\datums\components\ground_sinking.dm"
@@ -1112,6 +1122,7 @@
 #include "code\datums\components\hazard_area.dm"
 #include "code\datums\components\healing_touch.dm"
 #include "code\datums\components\health_scaling_effects.dm"
+#include "code\datums\components\heart_eater.dm"
 #include "code\datums\components\heirloom.dm"
 #include "code\datums\components\hide_highest_offset.dm"
 #include "code\datums\components\holderloving.dm"
@@ -1149,7 +1160,6 @@
 #include "code\datums\components\nuclear_bomb_operator.dm"
 #include "code\datums\components\object_possession.dm"
 #include "code\datums\components\omen.dm"
-#include "code\datums\components\on_hit_effect.dm"
 #include "code\datums\components\onwear_mood.dm"
 #include "code\datums\components\orbiter.dm"
 #include "code\datums\components\overlay_lighting.dm"
@@ -1201,11 +1211,17 @@
 #include "code\datums\components\sisyphus_awarder.dm"
 #include "code\datums\components\sitcomlaughter.dm"
 #include "code\datums\components\sizzle.dm"
+#include "code\datums\components\slime_friends.dm"
 #include "code\datums\components\slippery.dm"
 #include "code\datums\components\smooth_tunes.dm"
+#include "code\datums\components\soapbox.dm"
 #include "code\datums\components\soul_stealer.dm"
 #include "code\datums\components\soulstoned.dm"
 #include "code\datums\components\sound_player.dm"
+#include "code\datums\components\space_allaergy.dm"
+#include "code\datums\components\space_camo.dm"
+#include "code\datums\components\space_dive.dm"
+#include "code\datums\components\space_kidnap.dm"
 #include "code\datums\components\spawner.dm"
 #include "code\datums\components\speechmod.dm"
 #include "code\datums\components\spill.dm"
@@ -1236,6 +1252,7 @@
 #include "code\datums\components\telegraph_ability.dm"
 #include "code\datums\components\temporary_body.dm"
 #include "code\datums\components\temporary_description.dm"
+#include "code\datums\components\temporary_glass_shatter.dm"
 #include "code\datums\components\tether.dm"
 #include "code\datums\components\thermite.dm"
 #include "code\datums\components\throwbonus_on_windup.dm"
@@ -1259,6 +1276,7 @@
 #include "code\datums\components\wearertargeting.dm"
 #include "code\datums\components\weatherannouncer.dm"
 #include "code\datums\components\wet_floor.dm"
+#include "code\datums\components\wormborn.dm"
 #include "code\datums\components\container_item\container_item.dm"
 #include "code\datums\components\container_item\tank_holder.dm"
 #include "code\datums\components\crafting\_recipes.dm"
@@ -1449,6 +1467,7 @@
 #include "code\datums\elements\frozen.dm"
 #include "code\datums\elements\gags_recolorable.dm"
 #include "code\datums\elements\give_turf_traits.dm"
+#include "code\datums\elements\glass_pacifist.dm"
 #include "code\datums\elements\gravedigger.dm"
 #include "code\datums\elements\hat_wearer.dm"
 #include "code\datums\elements\haunted.dm"
@@ -1481,9 +1500,12 @@
 #include "code\datums\elements\movetype_handler.dm"
 #include "code\datums\elements\muffles_speech.dm"
 #include "code\datums\elements\nerfed_pulling.dm"
+#include "code\datums\elements\no_crit_hitting.dm"
 #include "code\datums\elements\noisy_movement.dm"
 #include "code\datums\elements\noticable_organ.dm"
 #include "code\datums\elements\obj_regen.dm"
+#include "code\datums\elements\on_hit_effect.dm"
+#include "code\datums\elements\only_pull_living.dm"
 #include "code\datums\elements\openspace_item_click_handler.dm"
 #include "code\datums\elements\ore_collecting.dm"
 #include "code\datums\elements\organ_set_bonus.dm"
@@ -1878,6 +1900,7 @@
 #include "code\datums\storage\subtypes\implant.dm"
 #include "code\datums\storage\subtypes\organ_box.dm"
 #include "code\datums\storage\subtypes\pockets.dm"
+#include "code\datums\storage\subtypes\portable_chem_mixer.dm"
 #include "code\datums\storage\subtypes\rped.dm"
 #include "code\datums\storage\subtypes\surgery_tray.dm"
 #include "code\datums\storage\subtypes\trash.dm"
@@ -2336,7 +2359,6 @@
 #include "code\game\objects\items\maintenance_loot.dm"
 #include "code\game\objects\items\manuals.dm"
 #include "code\game\objects\items\mop.dm"
-#include "code\game\objects\items\nitrium_crystals.dm"
 #include "code\game\objects\items\paint.dm"
 #include "code\game\objects\items\paiwire.dm"
 #include "code\game\objects\items\pet_carrier.dm"
@@ -2468,6 +2490,7 @@
 #include "code\game\objects\items\granters\oragami.dm"
 #include "code\game\objects\items\granters\sign_language.dm"
 #include "code\game\objects\items\granters\crafting\_crafting_granter.dm"
+#include "code\game\objects\items\granters\crafting\advanced_donk_recipes.dm"
 #include "code\game\objects\items\granters\crafting\bone_notes.dm"
 #include "code\game\objects\items\granters\crafting\cannon.dm"
 #include "code\game\objects\items\granters\crafting\combat_baking.dm"
@@ -2936,7 +2959,6 @@
 #include "code\modules\admin\verbs\shuttlepanel.dm"
 #include "code\modules\admin\verbs\spawnobjasmob.dm"
 #include "code\modules\admin\verbs\special_verbs.dm"
-#include "code\modules\admin\verbs\lua\_hooks.dm"
 #include "code\modules\admin\verbs\lua\_wrappers.dm"
 #include "code\modules\admin\verbs\lua\helpers.dm"
 #include "code\modules\admin\verbs\lua\lua_editor.dm"
@@ -3285,6 +3307,17 @@
 #include "code\modules\antagonists\valentines\heartbreaker.dm"
 #include "code\modules\antagonists\valentines\valentine.dm"
 #include "code\modules\antagonists\venus_human_trap\venus_human_trap.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_abilities.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_bodyparts.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_kidnap.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_loot.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_organs.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_particles.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_species.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_status_effects.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_traumas.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_void_eater.dm"
 #include "code\modules\antagonists\wishgranter\wishgranter.dm"
 #include "code\modules\antagonists\wizard\imp_antag.dm"
 #include "code\modules\antagonists\wizard\slaughter_antag.dm"
@@ -3301,6 +3334,7 @@
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\defensive.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\mobility.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\offensive.dm"
+#include "code\modules\antagonists\wizard\equipment\spellbook_entries\perks.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\summons.dm"
 #include "code\modules\antagonists\wizard\grand_ritual\fluff.dm"
 #include "code\modules\antagonists\wizard\grand_ritual\grand_ritual.dm"
@@ -3429,6 +3463,7 @@
 #include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm"
 #include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm"
 #include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm"
+#include "code\modules\atmospherics\machinery\components\unary_devices\airlock_pump.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\bluespace_sender.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm"
@@ -3634,6 +3669,7 @@
 #include "code\modules\cargo\exports\anomaly.dm"
 #include "code\modules\cargo\exports\antiques.dm"
 #include "code\modules\cargo\exports\civilain_bounty.dm"
+#include "code\modules\cargo\exports\fish.dm"
 #include "code\modules\cargo\exports\food_and_drink.dm"
 #include "code\modules\cargo\exports\gear.dm"
 #include "code\modules\cargo\exports\large_objects.dm"
@@ -4329,6 +4365,7 @@
 #include "code\modules\jobs\job_types\antagonists\space_dragon.dm"
 #include "code\modules\jobs\job_types\antagonists\space_ninja.dm"
 #include "code\modules\jobs\job_types\antagonists\space_wizard.dm"
+#include "code\modules\jobs\job_types\antagonists\voidwalker.dm"
 #include "code\modules\jobs\job_types\antagonists\wizard_apprentice.dm"
 #include "code\modules\jobs\job_types\antagonists\xenomorph.dm"
 #include "code\modules\jobs\job_types\assistant\assistant.dm"
@@ -4431,7 +4468,6 @@
 #include "code\modules\lighting\lighting_atom.dm"
 #include "code\modules\lighting\lighting_corner.dm"
 #include "code\modules\lighting\lighting_object.dm"
-#include "code\modules\lighting\lighting_setup.dm"
 #include "code\modules\lighting\lighting_source.dm"
 #include "code\modules\lighting\lighting_turf.dm"
 #include "code\modules\lighting\static_lighting_area.dm"
@@ -4533,6 +4569,7 @@
 #include "code\modules\mapfluff\ruins\spaceruin_code\derelict_sulaco.dm"
 #include "code\modules\mapfluff\ruins\spaceruin_code\DJstation.dm"
 #include "code\modules\mapfluff\ruins\spaceruin_code\forgottenship.dm"
+#include "code\modules\mapfluff\ruins\spaceruin_code\hauntedtradingpost.dm"
 #include "code\modules\mapfluff\ruins\spaceruin_code\hellfactory.dm"
 #include "code\modules\mapfluff\ruins\spaceruin_code\hilbertshotel.dm"
 #include "code\modules\mapfluff\ruins\spaceruin_code\interdyne.dm"
@@ -4686,6 +4723,7 @@
 #include "code\modules\mob\living\basic\bots\_bots.dm"
 #include "code\modules\mob\living\basic\bots\bot_ai.dm"
 #include "code\modules\mob\living\basic\bots\bot_hud.dm"
+#include "code\modules\mob\living\basic\bots\dedbot.dm"
 #include "code\modules\mob\living\basic\bots\cleanbot\cleanbot.dm"
 #include "code\modules\mob\living\basic\bots\cleanbot\cleanbot_abilities.dm"
 #include "code\modules\mob\living\basic\bots\cleanbot\cleanbot_ai.dm"
@@ -4878,8 +4916,10 @@
 #include "code\modules\mob\living\basic\pets\pet_cult\pet_cult.dm"
 #include "code\modules\mob\living\basic\pets\pet_cult\pet_cult_abilities.dm"
 #include "code\modules\mob\living\basic\pets\pet_cult\pet_cult_ai.dm"
+#include "code\modules\mob\living\basic\ruin_defender\cybersun_aicore.dm"
 #include "code\modules\mob\living\basic\ruin_defender\flesh.dm"
 #include "code\modules\mob\living\basic\ruin_defender\living_floor.dm"
+#include "code\modules\mob\living\basic\ruin_defender\mad_piano.dm"
 #include "code\modules\mob\living\basic\ruin_defender\skeleton.dm"
 #include "code\modules\mob\living\basic\ruin_defender\stickman.dm"
 #include "code\modules\mob\living\basic\ruin_defender\wizard\wizard.dm"
@@ -4951,6 +4991,7 @@
 #include "code\modules\mob\living\basic\space_fauna\revenant\revenant_harvest.dm"
 #include "code\modules\mob\living\basic\space_fauna\revenant\revenant_items.dm"
 #include "code\modules\mob\living\basic\space_fauna\revenant\revenant_objectives.dm"
+#include "code\modules\mob\living\basic\space_fauna\snake\banded_snake.dm"
 #include "code\modules\mob\living\basic\space_fauna\snake\snake.dm"
 #include "code\modules\mob\living\basic\space_fauna\snake\snake_ai.dm"
 #include "code\modules\mob\living\basic\space_fauna\space_dragon\dragon_breath.dm"
@@ -5847,6 +5888,7 @@
 #include "code\modules\spells\spell_types\pointed\spell_cards.dm"
 #include "code\modules\spells\spell_types\pointed\swap.dm"
 #include "code\modules\spells\spell_types\pointed\terrorize.dm"
+#include "code\modules\spells\spell_types\pointed\tie_shoes.dm"
 #include "code\modules\spells\spell_types\projectile\_basic_projectile.dm"
 #include "code\modules\spells\spell_types\projectile\juggernaut.dm"
 #include "code\modules\spells\spell_types\self\basic_heal.dm"
@@ -6135,6 +6177,7 @@
 #include "code\modules\vending\clothesmate.dm"
 #include "code\modules\vending\coffee.dm"
 #include "code\modules\vending\cola.dm"
+#include "code\modules\vending\donk.dm"
 #include "code\modules\vending\drinnerware.dm"
 #include "code\modules\vending\engineering.dm"
 #include "code\modules\vending\engivend.dm"
diff --git a/tgui/README.md b/tgui/README.md
index 1bae91fd13258..2bcb6d06afa36 100644
--- a/tgui/README.md
+++ b/tgui/README.md
@@ -35,10 +35,10 @@ If you are using the tooling provided in this repo, everything is included! Feel
 
 However, if you want finer control over the installation or build process, you will need these:
 
-- [Node v16.13+](https://nodejs.org/en/download/)
+- [Node v20.2+](https://nodejs.org/en/download/)
   - **LTS** release is recommended instead of latest
   - **DO NOT install Chocolatey if Node installer asks you to!**
-- [Yarn v1.22.4+](https://yarnpkg.com/getting-started/install)
+- [Yarn v4.1.1+](https://yarnpkg.com/getting-started/install)
   - You can run `npm install -g yarn` to install it.
 
 ## Usage
@@ -144,12 +144,13 @@ together, and can reveal certain layout bugs which are not normally visible.
 ## Browser Developer Tools
 
 To debug TGUI interfaces with browser-style developer tools, there exists a utility
-that Microsoft bundles with Windows to debug any Internet Explorer/Trident-using interface,
+that Microsoft bundles with Windows called IEChooser/F12 to debug any Internet Explorer/Trident-using interface,
 which BYOND uses.
 
 This provides invaluable tools such as a local console, a DOM viewer, an interactive debugger, and more.
 
-The 64-bit version that we use is located at `%windir%\SysWOW64\F12\IEChooser.exe`.
+You can access the `IEChooser.exe` by pressing <kbd>Win + R</kbd>, then typing `f12`, then pressing enter.
+To manually go there: 64-bit version that we use is located at `%windir%\SysWOW64\F12\IEChooser.exe`.
 There's also a 32-bit one in `system32\`.
 
 Simply launch the application after you've opened a TGUI window, and choose the .html name.
diff --git a/tgui/docs/chat-embedded-components.md b/tgui/docs/chat-embedded-components.md
index f5a5db7aed5bc..bb81acbb20dcc 100644
--- a/tgui/docs/chat-embedded-components.md
+++ b/tgui/docs/chat-embedded-components.md
@@ -29,7 +29,7 @@ We can't embed components that haven't been prewhitelisted.
 This isn't because of security concerns or anything, we just can't lookup components by their name without creating a lookup table.
 You can find that in [tgui chat's renderer](../packages/tgui-panel/chat/renderer.js) under the name `TGUI_CHAT_COMPONENTS`
 
-Adding a new component is simple, just add it's name to the dictionary, and import it into the file.
+Adding a new component is simple, just add its name to the dictionary, and import it into the file.
 
 ### Sending props
 
@@ -38,7 +38,7 @@ Ok, so we know how to render a component, but that's nearly useless unless we al
 So how's that work?
 
 The syntax is similar to sending a component, but has a bit more caveats.
-We have two bits of info to contend with. The name of the prop, and it's value.
+We have two bits of info to contend with. The name of the prop, and its value.
 First then, how do you send the name of a prop?
 
 #### Sending a prop's name
diff --git a/tgui/packages/common/redux.ts b/tgui/packages/common/redux.ts
index c8eb268f5d44f..6179da15229c4 100644
--- a/tgui/packages/common/redux.ts
+++ b/tgui/packages/common/redux.ts
@@ -163,7 +163,7 @@ export const combineReducers = (
  * @param {string} type The action type to use for created actions.
  * @param {any} prepare (optional) a method that takes any number of arguments
  * and returns { payload } or { payload, meta }. If this is given, the
- * resulting action creator will pass it's arguments to this method to
+ * resulting action creator will pass its arguments to this method to
  * calculate payload & meta.
  *
  * @public
diff --git a/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx b/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx
index 4bd0383d7d759..ba577a1e5ef2f 100644
--- a/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx
+++ b/tgui/packages/tgui-panel/chat/ChatPageSettings.jsx
@@ -30,7 +30,23 @@ export const ChatPageSettings = (props) => {
   return (
     <Section>
       <Stack align="center">
-        <Stack.Item grow>
+        {!!!page.isMain && (
+          <Stack.Item>
+            <Button
+              color="blue"
+              icon="angles-left"
+              tooltip="Reorder tab to the left"
+              onClick={() =>
+                dispatch(
+                  moveChatPageLeft({
+                    pageId: page.id,
+                  }),
+                )
+              }
+            />
+          </Stack.Item>
+        )}
+        <Stack.Item grow ml={0.5}>
           <Input
             width="100%"
             value={page.name}
@@ -44,9 +60,24 @@ export const ChatPageSettings = (props) => {
             }
           />
         </Stack.Item>
+        {!!!page.isMain && (
+          <Stack.Item ml={0.5}>
+            <Button
+              color="blue"
+              icon="angles-right"
+              tooltip="Reorder tab to the right"
+              onClick={() =>
+                dispatch(
+                  moveChatPageRight({
+                    pageId: page.id,
+                  }),
+                )
+              }
+            />
+          </Stack.Item>
+        )}
         <Stack.Item>
           <Button.Checkbox
-            content="Mute"
             checked={page.hideUnreadCount}
             icon={page.hideUnreadCount ? 'bell-slash' : 'bell'}
             tooltip="Disables unread counter"
@@ -58,13 +89,15 @@ export const ChatPageSettings = (props) => {
                 }),
               )
             }
-          />
+          >
+            Mute
+          </Button.Checkbox>
         </Stack.Item>
-        {!page.isMain ? (
+        {!!!page.isMain && (
           <Stack.Item>
             <Button
-              icon="times"
               color="red"
+              icon="times"
               onClick={() =>
                 dispatch(
                   removeChatPage({
@@ -76,42 +109,6 @@ export const ChatPageSettings = (props) => {
               Remove
             </Button>
           </Stack.Item>
-        ) : (
-          ''
-        )}
-      </Stack>
-      <Divider />
-      <Stack align="center">
-        {!page.isMain ? (
-          <Stack.Item>
-            Reorder Chat:&emsp;
-            <Button
-              color="blue"
-              onClick={() =>
-                dispatch(
-                  moveChatPageLeft({
-                    pageId: page.id,
-                  }),
-                )
-              }
-            >
-              &laquo;
-            </Button>
-            <Button
-              color="blue"
-              onClick={() =>
-                dispatch(
-                  moveChatPageRight({
-                    pageId: page.id,
-                  }),
-                )
-              }
-            >
-              &raquo;
-            </Button>
-          </Stack.Item>
-        ) : (
-          ''
         )}
       </Stack>
       <Divider />
diff --git a/tgui/packages/tgui-panel/reconnect.tsx b/tgui/packages/tgui-panel/reconnect.tsx
index 6d3e6d9759e26..196ea10c95400 100644
--- a/tgui/packages/tgui-panel/reconnect.tsx
+++ b/tgui/packages/tgui-panel/reconnect.tsx
@@ -27,13 +27,14 @@ export const ReconnectButton = () => {
       </Button>
       <Button
         color="white"
+        icon="power-off"
+        tooltip="Relaunch game"
+        tooltipPosition="bottom-end"
         onClick={() => {
           location.href = `byond://${url}`;
           Byond.command('.quit');
         }}
-      >
-        Relaunch game
-      </Button>
+      />
     </>
   );
 };
diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
index 8203f0313951d..3599f24e70703 100644
--- a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
+++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
@@ -8,8 +8,8 @@ import {
   Divider,
   Input,
   LabeledList,
-  NumberInput,
   Section,
+  Slider,
   Stack,
 } from 'tgui/components';
 
@@ -20,10 +20,11 @@ import { FONTS } from './constants';
 import { selectSettings } from './selectors';
 
 export function SettingsGeneral(props) {
-  const { theme, fontFamily, fontSize, lineHeight } =
+  const { theme, fontFamily, fontSize, lineHeight, statLinked, statFontSize } =
     useSelector(selectSettings);
   const dispatch = useDispatch();
   const [freeFont, setFreeFont] = useState(false);
+  const [statFont, setStatFont] = useState(false);
 
   return (
     <Section>
@@ -109,35 +110,66 @@ export function SettingsGeneral(props) {
             )}
           </Stack.Item>
         </LabeledList.Item>
-        <LabeledList.Item label="Font size">
-          <NumberInput
-            width="4.2em"
-            step={1}
-            stepPixelSize={10}
-            minValue={8}
-            maxValue={32}
-            value={fontSize}
-            unit="px"
-            format={(value) => toFixed(value)}
-            onChange={(value) =>
-              dispatch(
-                updateSettings({
-                  fontSize: value,
-                }),
-              )
-            }
-          />
+        <LabeledList.Item label="Font size" verticalAlign="middle">
+          <Stack textAlign="center">
+            <Stack.Item grow>
+              <Slider
+                width="100%"
+                step={1}
+                stepPixelSize={20}
+                minValue={8}
+                maxValue={32}
+                value={statFont ? statFontSize : fontSize}
+                unit="px"
+                format={(value) => toFixed(value)}
+                onChange={(e, value) =>
+                  dispatch(
+                    updateSettings({
+                      [statFont ? 'statFontSize' : 'fontSize']: value,
+                    }),
+                  )
+                }
+              />
+            </Stack.Item>
+            <Stack.Item>
+              <Button
+                width={statFont ? 7.3 : 10}
+                onClick={() => setStatFont(!statFont)}
+              >
+                {statFont ? 'Stat Panel' : 'Chat'}
+              </Button>
+            </Stack.Item>
+            {!!statFont && (
+              <Stack.Item>
+                <Button
+                  tooltip={
+                    statLinked
+                      ? 'Unlink Stat Panel settings from chat'
+                      : 'Link Stat Panel settings to chat'
+                  }
+                  icon={statLinked ? 'link' : 'link-slash'}
+                  color={statLinked ? 'bad' : 'good'}
+                  onClick={() =>
+                    dispatch(
+                      updateSettings({
+                        statLinked: !statLinked,
+                      }),
+                    )
+                  }
+                />
+              </Stack.Item>
+            )}
+          </Stack>
         </LabeledList.Item>
         <LabeledList.Item label="Line height">
-          <NumberInput
-            width="4.2em"
+          <Slider
+            width="100%"
             step={0.01}
-            stepPixelSize={2}
             minValue={0.8}
             maxValue={5}
             value={lineHeight}
             format={(value) => toFixed(value, 2)}
-            onDrag={(value) =>
+            onDrag={(e, value) =>
               dispatch(
                 updateSettings({
                   lineHeight: value,
diff --git a/tgui/packages/tgui-panel/settings/middleware.ts b/tgui/packages/tgui-panel/settings/middleware.ts
index 01ad88561904f..b867d36de0d86 100644
--- a/tgui/packages/tgui-panel/settings/middleware.ts
+++ b/tgui/packages/tgui-panel/settings/middleware.ts
@@ -17,6 +17,7 @@ import {
 import { FONTS_DISABLED } from './constants';
 import { selectSettings } from './selectors';
 
+let setStatFontTimer: NodeJS.Timeout;
 let overrideRule: HTMLStyleElement;
 let overrideFontFamily: string | undefined;
 let overrideFontSize: string;
@@ -44,8 +45,23 @@ function updateGlobalOverrideRule() {
   document.body.style.setProperty('font-size', overrideFontSize);
 }
 
-function setGlobalFontSize(fontSize: string) {
+function setGlobalFontSize(
+  fontSize: string,
+  statFontSize: string,
+  statLinked: boolean,
+) {
   overrideFontSize = `${fontSize}px`;
+
+  // Used solution from theme.ts
+  clearInterval(setStatFontTimer);
+  Byond.command(
+    `.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`,
+  );
+  setStatFontTimer = setTimeout(() => {
+    Byond.command(
+      `.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`,
+    );
+  }, 1500);
 }
 
 function setGlobalFontFamily(fontFamily: string) {
@@ -86,7 +102,11 @@ export function settingsMiddleware(store) {
     const settings = selectSettings(store.getState());
 
     // Update global UI font size
-    setGlobalFontSize(settings.fontSize);
+    setGlobalFontSize(
+      settings.fontSize,
+      settings.statFontSize,
+      settings.statLinked,
+    );
     setGlobalFontFamily(settings.fontFamily);
     updateGlobalOverrideRule();
 
diff --git a/tgui/packages/tgui-panel/settings/reducer.ts b/tgui/packages/tgui-panel/settings/reducer.ts
index 62d08986a1479..33df1a745f660 100644
--- a/tgui/packages/tgui-panel/settings/reducer.ts
+++ b/tgui/packages/tgui-panel/settings/reducer.ts
@@ -38,6 +38,8 @@ const initialState = {
     visible: false,
     activeTab: SETTINGS_TABS[0].id,
   },
+  statLinked: true,
+  statFontSize: 12,
 } as const;
 
 export function settingsReducer(
diff --git a/tgui/packages/tgui-panel/styles/components/Notifications.scss b/tgui/packages/tgui-panel/styles/components/Notifications.scss
index 6b5160f07839b..f3669967fd70c 100644
--- a/tgui/packages/tgui-panel/styles/components/Notifications.scss
+++ b/tgui/packages/tgui-panel/styles/components/Notifications.scss
@@ -5,7 +5,7 @@
 
 .Notifications {
   position: absolute;
-  bottom: 1em;
+  top: 1em;
   left: 1em;
   right: 2em;
 }
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index fad9e91560294..5d98010cbb16b 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -747,6 +747,11 @@ em {
   font-size: 160%;
 }
 
+.soapbox {
+  font-weight: bold;
+  font-size: 135%;
+}
+
 .small {
   font-size: 60%;
 }
@@ -1023,7 +1028,6 @@ $border-width-px: $border-width * 1px;
   padding-top: 0.25rem;
   line-height: 100%;
   width: 100%;
-  height: 100%;
   text-align: left;
   font-size: 125%;
 }
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 85bd2222811f7..1f7bc4428eac7 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -774,6 +774,11 @@ h2.alert {
   font-size: 160%;
 }
 
+.soapbox {
+  font-weight: bold;
+  font-size: 135%;
+}
+
 .small {
   font-size: 60%;
 }
@@ -1050,7 +1055,6 @@ $border-width-px: $border-width * 1px;
   padding-top: 0.25rem;
   line-height: 100%;
   width: 100%;
-  height: 100%;
   text-align: left;
   font-size: 125%;
 }
diff --git a/tgui/packages/tgui-panel/styles/themes/light.scss b/tgui/packages/tgui-panel/styles/themes/light.scss
index 19ddd3642cd91..f8bfd67ee934f 100644
--- a/tgui/packages/tgui-panel/styles/themes/light.scss
+++ b/tgui/packages/tgui-panel/styles/themes/light.scss
@@ -34,7 +34,12 @@
   // Components
   @include meta.load-css(
     '~tgui/styles/components/Tabs.scss',
-    $with: ('text-color': rgba(0, 0, 0, 0.5), 'color-default': rgba(0, 0, 0, 1))
+    $with: (
+      'text-color': rgba(0, 0, 0, 0.5),
+      'color-default': rgba(0, 0, 0, 1),
+      'tab-color-selected': rgba(0, 0, 0, 0.125),
+      'tab-color-hovered': rgba(0, 0, 0, 0.075)
+    )
   );
   @include meta.load-css('~tgui/styles/components/Section.scss');
   @include meta.load-css(
@@ -52,7 +57,7 @@
     '~tgui/styles/components/Input.scss',
     $with: (
       'border-color': colors.fg(colors.$label),
-      'background-color': #ffffff
+      'background-color': #e6e6e6
     )
   );
   @include meta.load-css('~tgui/styles/components/NumberInput.scss');
diff --git a/tgui/packages/tgui-panel/themes.ts b/tgui/packages/tgui-panel/themes.ts
index 67061ff1f4cf1..98e5e87ed4212 100644
--- a/tgui/packages/tgui-panel/themes.ts
+++ b/tgui/packages/tgui-panel/themes.ts
@@ -6,9 +6,20 @@
 
 export const THEMES = ['light', 'dark'];
 
-const COLOR_DARK_BG = '#202020';
-const COLOR_DARK_BG_DARKER = '#171717';
-const COLOR_DARK_TEXT = '#a4bad6';
+const COLORS = {
+  DARK: {
+    BG_BASE: '#202020',
+    BG_SECOND: '#171717',
+    BUTTON: '#494949',
+    TEXT: '#A4BAD6',
+  },
+  LIGHT: {
+    BG_BASE: '#EEEEEE',
+    BG_SECOND: '#FFFFFF',
+    BUTTON: 'none',
+    TEXT: '#000000',
+  },
+};
 
 let setClientThemeTimer: NodeJS.Timeout;
 
@@ -31,112 +42,53 @@ export const setClientTheme = (name) => {
     Byond.command(`.output statbrowser:set_theme ${name}`);
   }, 1500);
 
-  if (name === 'light') {
-    return Byond.winset({
-      // Main windows
-      'infowindow.background-color': 'none',
-      'infowindow.text-color': '#000000',
-      'info.background-color': 'none',
-      'info.text-color': '#000000',
-      'browseroutput.background-color': 'none',
-      'browseroutput.text-color': '#000000',
-      'outputwindow.background-color': 'none',
-      'outputwindow.text-color': '#000000',
-      'mainwindow.background-color': 'none',
-      'split.background-color': 'none',
-      // Buttons
-      'changelog.background-color': 'none',
-      'changelog.text-color': '#000000',
-      'rules.background-color': 'none',
-      'rules.text-color': '#000000',
-      'wiki.background-color': 'none',
-      'wiki.text-color': '#000000',
-      'forum.background-color': 'none',
-      'forum.text-color': '#000000',
-      'github.background-color': 'none',
-      'github.text-color': '#000000',
-      'report-issue.background-color': 'none',
-      'report-issue.text-color': '#000000',
-      'fullscreen-toggle.background-color': 'none',
-      'fullscreen-toggle.text-color': '#000000',
-      // Status and verb tabs
-      'output.background-color': 'none',
-      'output.text-color': '#000000',
-      'statwindow.background-color': 'none',
-      'statwindow.text-color': '#000000',
-      'stat.background-color': '#FFFFFF',
-      'stat.tab-background-color': 'none',
-      'stat.text-color': '#000000',
-      'stat.tab-text-color': '#000000',
-      'stat.prefix-color': '#000000',
-      'stat.suffix-color': '#000000',
-      // Say, OOC, me Buttons etc.
-      'saybutton.background-color': 'none',
-      'saybutton.text-color': '#000000',
-      'oocbutton.background-color': 'none',
-      'oocbutton.text-color': '#000000',
-      'mebutton.background-color': 'none',
-      'mebutton.text-color': '#000000',
-      'asset_cache_browser.background-color': 'none',
-      'asset_cache_browser.text-color': '#000000',
-      'tooltip.background-color': 'none',
-      'tooltip.text-color': '#000000',
-      'input.background-color': '#FFFFFF',
-      'input.text-color': '#000000',
-    });
-  }
-  if (name === 'dark') {
-    Byond.winset({
-      // Main windows
-      'infowindow.background-color': COLOR_DARK_BG,
-      'infowindow.text-color': COLOR_DARK_TEXT,
-      'info.background-color': COLOR_DARK_BG,
-      'info.text-color': COLOR_DARK_TEXT,
-      'browseroutput.background-color': COLOR_DARK_BG,
-      'browseroutput.text-color': COLOR_DARK_TEXT,
-      'outputwindow.background-color': COLOR_DARK_BG,
-      'outputwindow.text-color': COLOR_DARK_TEXT,
-      'mainwindow.background-color': COLOR_DARK_BG,
-      'split.background-color': COLOR_DARK_BG,
-      // Buttons
-      'changelog.background-color': '#494949',
-      'changelog.text-color': COLOR_DARK_TEXT,
-      'rules.background-color': '#494949',
-      'rules.text-color': COLOR_DARK_TEXT,
-      'wiki.background-color': '#494949',
-      'wiki.text-color': COLOR_DARK_TEXT,
-      'forum.background-color': '#494949',
-      'forum.text-color': COLOR_DARK_TEXT,
-      'github.background-color': '#3a3a3a',
-      'github.text-color': COLOR_DARK_TEXT,
-      'report-issue.background-color': '#492020',
-      'report-issue.text-color': COLOR_DARK_TEXT,
-      'fullscreen-toggle.background-color': '#494949',
-      'fullscreen-toggle.text-color': COLOR_DARK_TEXT,
-      // Status and verb tabs
-      'output.background-color': COLOR_DARK_BG_DARKER,
-      'output.text-color': COLOR_DARK_TEXT,
-      'statwindow.background-color': COLOR_DARK_BG_DARKER,
-      'statwindow.text-color': COLOR_DARK_TEXT,
-      'stat.background-color': COLOR_DARK_BG_DARKER,
-      'stat.tab-background-color': COLOR_DARK_BG,
-      'stat.text-color': COLOR_DARK_TEXT,
-      'stat.tab-text-color': COLOR_DARK_TEXT,
-      'stat.prefix-color': COLOR_DARK_TEXT,
-      'stat.suffix-color': COLOR_DARK_TEXT,
-      // Say, OOC, me Buttons etc.
-      'saybutton.background-color': COLOR_DARK_BG,
-      'saybutton.text-color': COLOR_DARK_TEXT,
-      'oocbutton.background-color': COLOR_DARK_BG,
-      'oocbutton.text-color': COLOR_DARK_TEXT,
-      'mebutton.background-color': COLOR_DARK_BG,
-      'mebutton.text-color': COLOR_DARK_TEXT,
-      'asset_cache_browser.background-color': COLOR_DARK_BG,
-      'asset_cache_browser.text-color': COLOR_DARK_TEXT,
-      'tooltip.background-color': COLOR_DARK_BG,
-      'tooltip.text-color': COLOR_DARK_TEXT,
-      'input.background-color': COLOR_DARK_BG_DARKER,
-      'input.text-color': COLOR_DARK_TEXT,
-    });
+  const themeColor = COLORS[name.toUpperCase()];
+  if (!themeColor) {
+    return;
   }
+
+  return Byond.winset({
+    // Main windows
+    'infowindow.background-color': themeColor.BG_BASE,
+    'infowindow.text-color': themeColor.TEXT,
+    'info.background-color': themeColor.BG_BASE,
+    'info.text-color': themeColor.TEXT,
+    'browseroutput.background-color': themeColor.BG_BASE,
+    'browseroutput.text-color': themeColor.TEXT,
+    'outputwindow.background-color': themeColor.BG_BASE,
+    'outputwindow.text-color': themeColor.TEXT,
+    'mainwindow.background-color': themeColor.BG_BASE,
+    'split.background-color': themeColor.BG_BASE,
+    // Buttons
+    'changelog.background-color': themeColor.BUTTON,
+    'changelog.text-color': themeColor.TEXT,
+    'rules.background-color': themeColor.BUTTON,
+    'rules.text-color': themeColor.TEXT,
+    'wiki.background-color': themeColor.BUTTON,
+    'wiki.text-color': themeColor.TEXT,
+    'forum.background-color': themeColor.BUTTON,
+    'forum.text-color': themeColor.TEXT,
+    'github.background-color': themeColor.BUTTON,
+    'github.text-color': themeColor.TEXT,
+    'report-issue.background-color': themeColor.BUTTON,
+    'report-issue.text-color': themeColor.TEXT,
+    'fullscreen-toggle.background-color': themeColor.BUTTON,
+    'fullscreen-toggle.text-color': themeColor.TEXT,
+    // Status and verb tabs
+    'output.background-color': themeColor.BG_BASE,
+    'output.text-color': themeColor.TEXT,
+    // Say, OOC, me Buttons etc.
+    'saybutton.background-color': themeColor.BG_BASE,
+    'saybutton.text-color': themeColor.TEXT,
+    'oocbutton.background-color': themeColor.BG_BASE,
+    'oocbutton.text-color': themeColor.TEXT,
+    'mebutton.background-color': themeColor.BG_BASE,
+    'mebutton.text-color': themeColor.TEXT,
+    'asset_cache_browser.background-color': themeColor.BG_BASE,
+    'asset_cache_browser.text-color': themeColor.TEXT,
+    'tooltip.background-color': themeColor.BG_BASE,
+    'tooltip.text-color': themeColor.TEXT,
+    'input.background-color': themeColor.BG_SECOND,
+    'input.text-color': themeColor.TEXT,
+  });
 };
diff --git a/tgui/packages/tgui/bandastation/ru_jobs.tsx b/tgui/packages/tgui/bandastation/ru_jobs.tsx
index 37b0ea122eb95..983704b3d461c 100644
--- a/tgui/packages/tgui/bandastation/ru_jobs.tsx
+++ b/tgui/packages/tgui/bandastation/ru_jobs.tsx
@@ -1,5 +1,5 @@
 export const JOBS_RU = {
-  Assistant: 'Гражданский',
+  Assistant: 'Ассистент',
   Prisoner: 'Заключенный',
   Captain: 'Капитан',
   'Head of Personnel': 'Глава персонала',
@@ -14,6 +14,10 @@ export const JOBS_RU = {
   Warden: 'Смотритель',
   Detective: 'Детектив',
   'Security Officer': 'Офицер',
+  'Security Officer (Cargo)': 'Офицер (Снабжение)',
+  'Security Officer (Engineering)': 'Офицер (Инженерия)',
+  'Security Officer (Medical)': 'Офицер (Медицина)',
+  'Security Officer (Science)': 'Офицер (Исследование)',
   'Station Engineer': 'Станционный инженер',
   'Atmospheric Technician': 'Атмосферный техник',
   Coroner: 'Коронер',
@@ -40,9 +44,16 @@ export const JOBS_RU = {
   Psychologist: 'Психолог',
 };
 
+const REVERSED_JOBS_RU = Object.entries(JOBS_RU).reduce(
+  (reversed_jobs, [key, value]) => {
+    reversed_jobs[value] = key;
+    return reversed_jobs;
+  },
+  {},
+);
+
 export function ReverseJobsRu(value: string) {
-  let keys = Object.keys(JOBS_RU).filter((x) => JOBS_RU[x] === value);
-  return keys[0] || value;
+  return REVERSED_JOBS_RU[value] || value;
 }
 
 export const DEPARTMENTS_RU = {
diff --git a/tgui/packages/tgui/components/Box.tsx b/tgui/packages/tgui/components/Box.tsx
index e5808277914af..a39b98ed48f7d 100644
--- a/tgui/packages/tgui/components/Box.tsx
+++ b/tgui/packages/tgui/components/Box.tsx
@@ -7,6 +7,7 @@
 import { BooleanLike, classes } from 'common/react';
 import {
   createElement,
+  DragEventHandler,
   KeyboardEventHandler,
   MouseEventHandler,
   ReactNode,
@@ -32,6 +33,7 @@ export type EventHandlers = Partial<{
   onMouseOver: MouseEventHandler<HTMLDivElement>;
   onMouseUp: MouseEventHandler<HTMLDivElement>;
   onScroll: UIEventHandler<HTMLDivElement>;
+  onDrop: DragEventHandler<HTMLDivElement>;
 }>;
 
 export type BoxProps = Partial<{
diff --git a/tgui/packages/tgui/components/Button.tsx b/tgui/packages/tgui/components/Button.tsx
index 6f69ad9ed70ce..b20c9df341f17 100644
--- a/tgui/packages/tgui/components/Button.tsx
+++ b/tgui/packages/tgui/components/Button.tsx
@@ -367,7 +367,7 @@ Button.Input = ButtonInput;
 type FileProps = {
   accept: string;
   multiple?: boolean;
-  onSelectFiles: (files: string | string[]) => void;
+  onSelectFiles: (files: FileList) => void;
 } & Props;
 
 /**  Accepts file input */
@@ -376,24 +376,11 @@ function ButtonFile(props: FileProps) {
 
   const inputRef = useRef<HTMLInputElement>(null);
 
-  async function read(files: FileList) {
-    const promises = Array.from(files).map((file) => {
-      const reader = new FileReader();
-
-      return new Promise<string>((resolve) => {
-        reader.onload = () => resolve(reader.result as string);
-        reader.readAsText(file);
-      });
-    });
-
-    return await Promise.all(promises);
-  }
-
   async function handleChange(event: ChangeEvent<HTMLInputElement>) {
     const files = event.target.files;
     if (files?.length) {
-      const readFiles = await read(files);
-      onSelectFiles(multiple ? readFiles : readFiles[0]);
+      onSelectFiles(files);
+      event.target.value = '';
     }
   }
 
diff --git a/tgui/packages/tgui/components/Slider.tsx b/tgui/packages/tgui/components/Slider.tsx
index 255e747bd60a6..fb02f3f8eb0f4 100644
--- a/tgui/packages/tgui/components/Slider.tsx
+++ b/tgui/packages/tgui/components/Slider.tsx
@@ -19,6 +19,8 @@ type Props = {
   /** Value itself, controls the position of the cursor. */
   value: number;
 } & Partial<{
+  /** Allows to disable the slider */
+  disabled: boolean;
   /** Animates the value if it was changed externally. */
   animated: boolean;
   /** Custom css */
diff --git a/tgui/packages/tgui/components/TextArea.tsx b/tgui/packages/tgui/components/TextArea.tsx
index 0482229b8fd4b..7f163cad5fa20 100644
--- a/tgui/packages/tgui/components/TextArea.tsx
+++ b/tgui/packages/tgui/components/TextArea.tsx
@@ -9,6 +9,7 @@ import { isEscape, KEY } from 'common/keys';
 import { classes } from 'common/react';
 import {
   forwardRef,
+  ReactElement,
   RefObject,
   useEffect,
   useImperativeHandle,
@@ -23,7 +24,7 @@ import { toInputValue } from './Input';
 type Props = Partial<{
   autoFocus: boolean;
   autoSelect: boolean;
-  displayedValue: string;
+  displayedValue: ReactElement;
   dontUseTabForIndent: boolean;
   fluid: boolean;
   maxLength: number;
diff --git a/tgui/packages/tgui/contants.test.ts b/tgui/packages/tgui/constants.test.ts
similarity index 100%
rename from tgui/packages/tgui/contants.test.ts
rename to tgui/packages/tgui/constants.test.ts
diff --git a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
index c846b748b491b..14334090135c9 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
@@ -35,22 +35,23 @@ export const AntagInfoNinja = (props) => {
         <Section scrollable fill>
           <Stack vertical textColor="green">
             <Stack.Item textAlign="center" fontSize="20px">
-              I am an elite mercenary of the Spider Clan.
-              <br />A <span style={ninja_emphasis}> SPACE NINJA</span>!
+              Я элитный наёмник клана Паука.
+              <br />
+              <span style={ninja_emphasis}> КОСМИЧЕСКИЙ НИНДЗЯ</span>!
             </Stack.Item>
             <Stack.Item textAlign="center" italic>
-              Surprise is my weapon. Shadows are my armor. Without them, I am
-              nothing.
+              Неожиданность - мое оружие. Тень - моя броня. Без них, Я - ничто.
             </Stack.Item>
             <Stack.Item>
               <Section fill>
-                Your advanced ninja suit contains many powerful modules.
-                <br /> It can be recharged by right clicking on station APCs or
-                other power sources, in order to drain their battery.
+                Ваш продвинутый костюм ниндзи содержит множество продвинутых
+                модулей.
+                <br /> Его можно зарядить, нажав ПКМ по станционным ЛКП или
+                другим источникам энергии, чтобы выкачать энергию из них.
                 <br />
-                Right clicking on some kinds of machines or items wearing your
-                suit will hack them, to varying effect. Experiment and find out
-                what you can do!
+                ПКМ по некоторым видам техники или предметам при активированном
+                костюме, взломает их, с различными эффектами. Экспериментируйте
+                и узнайте, на что вы способны! Хаджимимаште.
               </Section>
             </Stack.Item>
             <Stack.Item>
@@ -59,7 +60,7 @@ export const AntagInfoNinja = (props) => {
                 objectiveFollowup={
                   <ReplaceObjectivesButton
                     can_change_objective={can_change_objective}
-                    button_title={'Adapt Mission Parameters'}
+                    button_title={'Адаптировать параметры миссии'}
                     button_colour={'green'}
                   />
                 }
diff --git a/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx b/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
index a6a049f137e4d..5e7a5628dbbc9 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
@@ -1,8 +1,13 @@
 import { Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
 
 import { useBackend } from '../backend';
 import { Window } from '../layouts';
-import { Objective, ObjectivePrintout } from './common/Objectives';
+import {
+  Objective,
+  ObjectivePrintout,
+  ReplaceObjectivesButton,
+} from './common/Objectives';
 
 const greenText = {
   fontWeight: 'italics',
@@ -18,13 +23,15 @@ type Data = {
   antag_name: string;
   uplink_location: string | null;
   objectives: Objective[];
+  can_change_objective: BooleanLike;
 };
 
 export const AntagInfoSpy = () => {
   const { data } = useBackend<Data>();
-  const { antag_name, uplink_location, objectives } = data;
+  const { antag_name, uplink_location, objectives, can_change_objective } =
+    data;
   return (
-    <Window width={380} height={420} theme="ntos_darkmode">
+    <Window width={380} height={450} theme="ntos_darkmode">
       <Window.Content
         style={{
           backgroundImage: 'none',
@@ -58,6 +65,16 @@ export const AntagInfoSpy = () => {
                 objectives={objectives}
               />
             </Stack.Item>
+            <Stack.Divider />
+            <Stack.Item textAlign="center">
+              {
+                <ReplaceObjectivesButton
+                  can_change_objective={can_change_objective}
+                  button_title={'Make Your Own Plan'}
+                  button_colour={'green'}
+                />
+              }
+            </Stack.Item>
           </Stack>
         </Section>
       </Window.Content>
diff --git a/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx b/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx
new file mode 100644
index 0000000000000..02bc6b5924d90
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx
@@ -0,0 +1,74 @@
+import { BlockQuote, LabeledList, Section, Stack } from '../components';
+import { Window } from '../layouts';
+
+const tipstyle = {
+  color: 'white',
+};
+
+const noticestyle = {
+  color: 'lightblue',
+};
+
+export const AntagInfoVoidwalker = (props) => {
+  return (
+    <Window width={620} height={410}>
+      <Window.Content backgroundColor="#0d0d0d">
+        <Stack fill>
+          <Stack.Item width="46.2%">
+            <Section fill>
+              <Stack vertical fill>
+                <Stack.Item fontSize="25px">You are a Voidwalker.</Stack.Item>
+                <Stack.Item>
+                  <BlockQuote>
+                    You are a creature from the void between stars. You were
+                    attracted to the radio signals being broadcasted by this
+                    station.
+                  </BlockQuote>
+                </Stack.Item>
+                <Stack.Divider />
+                <Stack.Item textColor="label">
+                  <span style={tipstyle}>Survive:&ensp;</span>
+                  You have unrivaled freedom. Remain in space and no one can
+                  stop you. You can move through windows, so stay near them to
+                  always have a way out.
+                  <br />
+                  <span style={tipstyle}>Hunt:&ensp;</span>
+                  Pick unfair fights. Look for inattentive targets and strike at
+                  them when they don&apos;t expect you.
+                  <br />
+                  <span style={tipstyle}>Abduct:&ensp;</span>
+                  Your Unsettle ability stuns and drains your targets. Finish
+                  them with your void window and use it to pop a window, drag
+                  them into space and use an empty hand to kidnap them.
+                </Stack.Item>
+              </Stack>
+            </Section>
+          </Stack.Item>
+          <Stack.Item width="53%">
+            <Section fill title="Powers">
+              <LabeledList>
+                <LabeledList.Item label="Space Dive">
+                  You can move under the station from space, use this to hunt
+                  and get to isolated sections of space.
+                </LabeledList.Item>
+                <LabeledList.Item label="Void Eater">
+                  Your divine appendage; it allows you to incapacitate the loud
+                  ones and instantly break windows.
+                </LabeledList.Item>
+                <LabeledList.Item label="Cosmic Physiology">
+                  Your natural camouflage makes you nearly invisible in space,
+                  as well as mending any wounds your body might have sustained.
+                  You can move through glass freely, but are slowed in gravity.
+                </LabeledList.Item>
+                <LabeledList.Item label="Unsettle">
+                  Target a victim while remaining only partially in their view
+                  to stun and weaken them, but also announce them your presence.
+                </LabeledList.Item>
+              </LabeledList>
+            </Section>
+          </Stack.Item>
+        </Stack>
+      </Window.Content>
+    </Window>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/Aquarium.tsx b/tgui/packages/tgui/interfaces/Aquarium.tsx
index caa0c65d75f65..6f29920fc0bf3 100644
--- a/tgui/packages/tgui/interfaces/Aquarium.tsx
+++ b/tgui/packages/tgui/interfaces/Aquarium.tsx
@@ -71,10 +71,10 @@ export const Aquarium = (props) => {
                 ))}
               </Flex>
             </LabeledControls.Item>
-            <LabeledControls.Item label="Reproduction Prevention">
+            <LabeledControls.Item label="Reproduction and Growth">
               <Button
-                content={allow_breeding ? 'Offline' : 'Online'}
-                selected={!allow_breeding}
+                content={allow_breeding ? 'Online' : 'Offline'}
+                selected={allow_breeding}
                 onClick={() => act('allow_breeding')}
               />
             </LabeledControls.Item>
diff --git a/tgui/packages/tgui/interfaces/Canvas.tsx b/tgui/packages/tgui/interfaces/Canvas.tsx
index 3621c12eb3cb7..e1273da7d593c 100644
--- a/tgui/packages/tgui/interfaces/Canvas.tsx
+++ b/tgui/packages/tgui/interfaces/Canvas.tsx
@@ -264,10 +264,10 @@ export const Canvas = (props) => {
   const griddy = !!data.show_grid && !!data.editable && !!data.paint_tool_color;
   return (
     <Window
-      width={Math.max(scaled_width + 72, 262)}
+      width={Math.max(scaled_width + 72, 280)}
       height={
         scaled_height +
-        80 +
+        94 +
         (data.show_plaque ? average_plaque_height : 0) +
         (data.editable && data.paint_tool_palette ? palette_height : 0)
       }
diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher/StylePage.tsx b/tgui/packages/tgui/interfaces/CentcomPodLauncher/StylePage.tsx
index 92f032be60901..5230b4924350b 100644
--- a/tgui/packages/tgui/interfaces/CentcomPodLauncher/StylePage.tsx
+++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher/StylePage.tsx
@@ -2,12 +2,11 @@ import { classes } from 'common/react';
 
 import { useBackend } from '../../backend';
 import { Box, Button, Section } from '../../components';
-import { STYLES } from './constants';
 import { PodLauncherData } from './types';
 
 export function StylePage(props) {
   const { act, data } = useBackend<PodLauncherData>();
-  const { effectName, styleChoice } = data;
+  const { effectName, styleChoice, podStyles } = data;
 
   return (
     <Section
@@ -19,7 +18,7 @@ export function StylePage(props) {
           selected={effectName}
           tooltip={`
             Edit pod's
-            name/desc.`}
+            .id/desc.`}
           tooltipPosition="bottom-start"
         >
           Name
@@ -29,19 +28,19 @@ export function StylePage(props) {
       scrollable
       title="Style"
     >
-      {STYLES.map((page, i) => (
+      {podStyles.map((page, i) => (
         <Button
           height="45px"
-          key={i}
-          onClick={() => act('setStyle', { style: i })}
-          selected={styleChoice - 1 === i}
+          key={page.id}
+          onClick={() => act('setStyle', { style: page.id })}
+          selected={styleChoice === page.id}
           style={{
             verticalAlign: 'middle',
             marginRight: '5px',
             borderRadius: '20px',
           }}
           tooltipPosition={
-            i >= STYLES.length - 2
+            i >= podStyles.length - 2
               ? i % 2 === 1
                 ? 'top-start'
                 : 'top-end'
@@ -53,7 +52,7 @@ export function StylePage(props) {
           width="45px"
         >
           <Box
-            className={classes(['supplypods64x64', 'pod_asset' + (i + 1)])}
+            className={classes(['supplypods64x64', 'pod_asset' + page.id])}
             style={{
               pointerEvents: 'none',
               transform: 'rotate(45deg) translate(-25%,-10%)',
diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher/constants.ts b/tgui/packages/tgui/interfaces/CentcomPodLauncher/constants.ts
index f896023165566..5c8d0f127e051 100644
--- a/tgui/packages/tgui/interfaces/CentcomPodLauncher/constants.ts
+++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher/constants.ts
@@ -129,23 +129,6 @@ export const SOUNDS = [
   },
 ];
 
-export const STYLES = [
-  { title: 'Standard' },
-  { title: 'Advanced' },
-  { title: 'Nanotrasen' },
-  { title: 'Syndicate' },
-  { title: 'Deathsquad' },
-  { title: 'Cultist' },
-  { title: 'Missile' },
-  { title: 'Syndie Missile' },
-  { title: 'Supply Box' },
-  { title: 'Clown Pod' },
-  { title: 'Fruit' },
-  { title: 'Invisible' },
-  { title: 'Gondola' },
-  { title: 'Seethrough' },
-] as const;
-
 export const BAYS = [
   { title: '1' },
   { title: '2' },
diff --git a/tgui/packages/tgui/interfaces/CentcomPodLauncher/types.ts b/tgui/packages/tgui/interfaces/CentcomPodLauncher/types.ts
index a3c6f35da8354..315cc7dc28682 100644
--- a/tgui/packages/tgui/interfaces/CentcomPodLauncher/types.ts
+++ b/tgui/packages/tgui/interfaces/CentcomPodLauncher/types.ts
@@ -44,7 +44,8 @@ export type PodLauncherData = {
   shrapnelMagnitude: number;
   shrapnelType: string;
   soundVolume: number;
-  styleChoice: number;
+  styleChoice: string;
+  podStyles: Array<Record<string, string>>;
 };
 
 export type PodDelay = {
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.tsx b/tgui/packages/tgui/interfaces/ChemDispenser.tsx
index 421c9353e0983..5eb446e26cdd4 100644
--- a/tgui/packages/tgui/interfaces/ChemDispenser.tsx
+++ b/tgui/packages/tgui/interfaces/ChemDispenser.tsx
@@ -30,8 +30,8 @@ type Data = {
   amount: number;
   energy: number;
   maxEnergy: number;
-  displayedEnergy: string;
-  displayedMaxEnergy: string;
+  displayedUnits: string;
+  displayedMaxUnits: string;
   chemicals: DispensableReagent[];
   recipes: string[];
   recordingRecipe: string[];
@@ -93,7 +93,10 @@ export const ChemDispenser = (props) => {
           <LabeledList>
             <LabeledList.Item label="Energy">
               <ProgressBar value={data.energy / data.maxEnergy}>
-                {data.displayedEnergy + ' / ' + data.displayedMaxEnergy}
+                {data.displayedUnits +
+                  ' / ' +
+                  data.displayedMaxUnits +
+                  ' units'}
               </ProgressBar>
             </LabeledList.Item>
           </LabeledList>
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.tsx b/tgui/packages/tgui/interfaces/ChemMaster.tsx
index 62692588c6516..6a2becf3eb050 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.tsx
+++ b/tgui/packages/tgui/interfaces/ChemMaster.tsx
@@ -5,6 +5,8 @@ import {
   Button,
   ColorBox,
   Divider,
+  DmIcon,
+  Icon,
   LabeledList,
   NumberInput,
   ProgressBar,
@@ -13,7 +15,7 @@ import {
   Table,
   Tooltip,
 } from 'tgui-core/components';
-import { BooleanLike, classes } from 'tgui-core/react';
+import { BooleanLike } from 'tgui-core/react';
 import { capitalize } from 'tgui-core/string';
 
 import { useBackend } from '../backend';
@@ -22,6 +24,7 @@ import { Beaker, BeakerReagent } from './common/BeakerDisplay';
 
 type Container = {
   icon: string;
+  icon_state: string;
   ref: string;
   name: string;
   volume: number;
@@ -375,6 +378,8 @@ const ContainerButton = (props: CategoryButtonProps) => {
   const { isPrinting, selectedContainerRef, suggestedContainerRef } = data;
   const { category, container, showPreferredContainer } = props;
   const isPillPatch = ['pills', 'patches'].includes(category.name);
+  const fallback = <Icon m="18px" name="spinner" spin />;
+  const fallbackPillPatch = <Icon m="10px" name="spinner" spin />;
 
   return (
     <Tooltip
@@ -402,12 +407,13 @@ const ContainerButton = (props: CategoryButtonProps) => {
           });
         }}
       >
-        <Box
-          m={isPillPatch ? '0' : '8px'}
-          style={{
-            transform: 'scale(2)',
-          }}
-          className={classes(['chemmaster32x32', container.icon])}
+        <DmIcon
+          m={isPillPatch ? '-16px' : '-8px'}
+          fallback={isPillPatch ? fallbackPillPatch : fallback}
+          icon={container.icon}
+          icon_state={container.icon_state}
+          height="64px"
+          width="64px"
         />
       </Button>
     </Tooltip>
diff --git a/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx b/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
index 41fa3932dff16..1b9ee1165ccb5 100644
--- a/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
+++ b/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
@@ -14,8 +14,8 @@ export const CivCargoHoldTerminal = (props) => {
   const { act, data } = useBackend();
   const { pad, sending, status_report, id_inserted, id_bounty_info, picking } =
     data;
-  const in_text = 'Welcome valued employee.';
-  const out_text = 'To begin, insert your ID into the console.';
+  const in_text = 'Приветствуем, ценный кадр.';
+  const out_text = 'Чтобы начать вставьте ID карту в консоль.';
   return (
     <Window width={580} height={375}>
       <Window.Content scrollable>
@@ -25,18 +25,20 @@ export const CivCargoHoldTerminal = (props) => {
               {id_inserted ? in_text : out_text}
             </NoticeBox>
             <Section
-              title="Cargo Pad"
+              title="Платформа снабжения"
               buttons={
                 <>
                   <Button
                     icon={'sync'}
-                    tooltip={'Check Contents'}
+                    tooltip={'Проверить содержимое'}
                     disabled={!pad || !id_inserted}
                     onClick={() => act('recalc')}
                   />
                   <Button
                     icon={sending ? 'times' : 'arrow-up'}
-                    tooltip={sending ? 'Stop Sending' : 'Send Goods'}
+                    tooltip={
+                      sending ? 'Остановить отправку' : 'Отправить товары'
+                    }
                     selected={sending}
                     disabled={!pad || !id_inserted}
                     onClick={() => act(sending ? 'stop' : 'send')}
@@ -44,13 +46,13 @@ export const CivCargoHoldTerminal = (props) => {
                   <Button
                     icon={id_bounty_info ? 'recycle' : 'pen'}
                     color={id_bounty_info ? 'green' : 'default'}
-                    tooltip={id_bounty_info ? 'Replace Bounty' : 'New Bounty'}
+                    tooltip={id_bounty_info ? 'Заменить заказ' : 'Новый заказ'}
                     disabled={!id_inserted}
                     onClick={() => act('bounty')}
                   />
                   <Button
                     icon={'download'}
-                    content={'Eject ID'}
+                    content={'Извлечь ID карту'}
                     disabled={!id_inserted}
                     onClick={() => act('eject')}
                   />
@@ -58,10 +60,10 @@ export const CivCargoHoldTerminal = (props) => {
               }
             >
               <LabeledList>
-                <LabeledList.Item label="Status" color={pad ? 'good' : 'bad'}>
-                  {pad ? 'Online' : 'Not Found'}
+                <LabeledList.Item label="Статус" color={pad ? 'good' : 'bad'}>
+                  {pad ? 'Функционирует' : 'Не обнаружен'}
                 </LabeledList.Item>
-                <LabeledList.Item label="Cargo Report">
+                <LabeledList.Item label="Грузовой отчёт">
                   {status_report}
                 </LabeledList.Item>
               </LabeledList>
@@ -77,17 +79,17 @@ export const CivCargoHoldTerminal = (props) => {
 const BountyTextBox = (props) => {
   const { data } = useBackend();
   const { id_bounty_info, id_bounty_value, id_bounty_num } = data;
-  const na_text = 'N/A, please add a new bounty.';
+  const na_text = 'N/A, пожалуйста, возьмите новый заказ.';
   return (
-    <Section title="Bounty Info">
+    <Section title="Информация о заказе">
       <LabeledList>
-        <LabeledList.Item label="Description">
+        <LabeledList.Item label="Описание">
           {id_bounty_info ? id_bounty_info : na_text}
         </LabeledList.Item>
-        <LabeledList.Item label="Quantity">
+        <LabeledList.Item label="Количество">
           {id_bounty_info ? id_bounty_num : 'N/A'}
         </LabeledList.Item>
-        <LabeledList.Item label="Value">
+        <LabeledList.Item label="Стоимость">
           {id_bounty_info ? id_bounty_value : 'N/A'}
         </LabeledList.Item>
       </LabeledList>
@@ -99,7 +101,7 @@ const BountyPickBox = (props) => {
   const { act, data } = useBackend();
   const { id_bounty_names, id_bounty_infos, id_bounty_values } = data;
   return (
-    <Section title="Please Select a Bounty:" textAlign="center">
+    <Section title="Пожалуйста выберите заказ:" textAlign="center">
       <Flex width="100%" wrap>
         <Flex.Item shrink={0} grow={0.5}>
           <BountyPickButton
@@ -157,7 +159,7 @@ const BountyPickButton = (props) => {
       >
         {props.bounty_info}
       </Box>
-      <Box>Payout: {props.bounty_value} cr</Box>
+      <Box>Оплата: {props.bounty_value} cr</Box>
     </Button>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
index d023240c7e1fa..ac492a2498719 100644
--- a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
+++ b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
@@ -5,7 +5,7 @@ import { Window } from '../layouts';
 
 const TOOLTIP_NAME = `
   Enter a new name for this unit. Set to blank to reset to default,
-  which means unit will be able to choose it's own name.
+  which means unit will be able to choose its own name.
 `;
 
 const TOOLTIP_LOCOMOTION = `
@@ -30,7 +30,7 @@ const TOOLTIP_AI = `
 
 const TOOLTIP_LAWSYNC = `
   If closed, this unit will not synchronize
-  it's laws with it's master AI.
+  its laws with its master AI.
 `;
 
 export const CyborgBootDebug = (props) => {
diff --git a/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx b/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx
index 22fff93dfddae..8d6e53dbba63a 100644
--- a/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx
+++ b/tgui/packages/tgui/interfaces/DnaConsole/DnaScanner.jsx
@@ -10,6 +10,7 @@ import {
 import {
   SUBJECT_CONCIOUS,
   SUBJECT_DEAD,
+  SUBJECT_HARD_CRIT,
   SUBJECT_SOFT_CRIT,
   SUBJECT_TRANSFORMING,
   SUBJECT_UNCONSCIOUS,
@@ -81,7 +82,7 @@ const SubjectStatus = (props) => {
       </Box>
     );
   }
-  if (status === SUBJECT_UNCONSCIOUS) {
+  if (status === SUBJECT_UNCONSCIOUS || status === SUBJECT_HARD_CRIT) {
     return (
       <Box inline color="average">
         Unconscious
diff --git a/tgui/packages/tgui/interfaces/DnaConsole/constants.ts b/tgui/packages/tgui/interfaces/DnaConsole/constants.ts
index c588c765e7657..e3d11a5dcd50f 100644
--- a/tgui/packages/tgui/interfaces/DnaConsole/constants.ts
+++ b/tgui/packages/tgui/interfaces/DnaConsole/constants.ts
@@ -31,8 +31,9 @@ export const STORAGE_MODE_ADVINJ = 'injector';
 export const SUBJECT_CONCIOUS = 0;
 export const SUBJECT_SOFT_CRIT = 1;
 export const SUBJECT_UNCONSCIOUS = 2;
-export const SUBJECT_DEAD = 3;
-export const SUBJECT_TRANSFORMING = 4;
+export const SUBJECT_HARD_CRIT = 3;
+export const SUBJECT_DEAD = 4;
+export const SUBJECT_TRANSFORMING = 5;
 
 export const PULSE_STRENGTH_MAX = 15;
 export const PULSE_DURATION_MAX = 30;
diff --git a/tgui/packages/tgui/interfaces/FishAnalyzer.tsx b/tgui/packages/tgui/interfaces/FishAnalyzer.tsx
new file mode 100644
index 0000000000000..171a22ed281f9
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/FishAnalyzer.tsx
@@ -0,0 +1,308 @@
+import { createSearch } from 'common/string';
+import { useState } from 'react';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
+import {
+  Box,
+  Button,
+  DmIcon,
+  Flex,
+  Icon,
+  Input,
+  ProgressBar,
+  Section,
+  Stack,
+} from '../components';
+import { Window } from '../layouts';
+
+type FishData = {
+  fish_name: string;
+  fish_icon: string;
+  fish_icon_state: string;
+  fish_health: number;
+  fish_size: number;
+  fish_weight: number;
+  fish_food: string;
+  fish_food_color: string;
+  fish_min_temp: number;
+  fish_max_temp: number;
+  fish_hunger: number;
+  fish_fluid_compatible: BooleanLike;
+  fish_fluid_type: string;
+  fish_suitable_temp: BooleanLike;
+  fish_breed_timer: number;
+  fish_traits: TraitData[];
+  fish_evolutions: EvolutionData[];
+};
+
+type TraitData = {
+  trait_name: string;
+  trait_desc: string;
+  trait_inherit: number;
+};
+
+type EvolutionData = {
+  evolution_name: string;
+  evolution_icon: string;
+  evolution_icon_state: string;
+  evolution_probability: number;
+  evolution_conditions: string;
+};
+
+type Data = {
+  fish_list: FishData[];
+  fish_scanned: BooleanLike;
+};
+
+export const FishAnalyzer = (props) => {
+  const { act, data } = useBackend<Data>();
+  const { fish_list = [], fish_scanned } = data;
+  const [searchText, setSearchText] = useState('');
+
+  const search = createSearch(searchText, (fish: FishData) => fish.fish_name);
+
+  const fish_filtered =
+    searchText.length > 0 ? fish_list.filter(search) : fish_list;
+
+  return (
+    <Window
+      title="Fish Analyzer"
+      width={fish_scanned ? 530 : 700}
+      height={fish_scanned ? 270 : 460}
+    >
+      <Window.Content
+        style={{
+          background: '#402784',
+        }}
+      >
+        <Stack fill vertical>
+          {!fish_scanned && (
+            <Stack.Item>
+              <Section>
+                <Input
+                  autoFocus
+                  position="relative"
+                  mt={0.5}
+                  bottom="5%"
+                  height="20px"
+                  width="150px"
+                  placeholder="Search Fish..."
+                  value={searchText}
+                  onInput={(e, value) => {
+                    setSearchText(value);
+                  }}
+                  fluid
+                />
+              </Section>
+            </Stack.Item>
+          )}
+          <Stack.Item grow>
+            <Section title="Fish" fill scrollable>
+              <Stack wrap>
+                {fish_filtered.map((fish, index) => (
+                  <Stack.Item
+                    position="relative"
+                    mt={2}
+                    ml={2}
+                    width={fish_scanned ? '100%' : '44%'}
+                    minHeight="120px"
+                    key={index}
+                    style={{
+                      padding: '5px 5px',
+                      background: 'linear-gradient(to right,#2e0b64, #47218e)',
+                      borderRadius: '1em',
+                      border: '3px solid #6f1d94',
+                    }}
+                  >
+                    <FishItem fish={fish} />
+                  </Stack.Item>
+                ))}
+              </Stack>
+            </Section>
+          </Stack.Item>
+        </Stack>
+      </Window.Content>
+    </Window>
+  );
+};
+
+const FishItem = (props) => {
+  const { fish } = props;
+
+  return (
+    <Stack vertical>
+      <Stack.Item minHeight="105px">
+        <Flex>
+          <Flex.Item width="40px">
+            <Stack vertical>
+              <Stack.Item>
+                <DmIcon
+                  style={{ background: '#1a0940' }}
+                  icon={fish.fish_icon}
+                  icon_state={fish.fish_icon_state}
+                  height="40px"
+                  width="40px"
+                />
+              </Stack.Item>
+              <Stack.Item style={{ fontSize: '10px' }}>
+                {fish.fish_weight}g
+              </Stack.Item>
+              <Stack.Item style={{ fontSize: '10px' }}>
+                {fish.fish_size}cm
+              </Stack.Item>
+            </Stack>
+          </Flex.Item>
+          <Flex.Item grow ml={1}>
+            <Stack vertical>
+              <Stack.Item style={{ fontSize: '13px', fontWeight: 'bold' }}>
+                {dissectName(fish.fish_name).toUpperCase()}
+              </Stack.Item>
+              <Stack.Item
+                ml={1}
+                textAlign="center"
+                style={{
+                  borderRadius: '1em',
+                  background: fish.fish_food_color,
+                  color: 'white',
+                }}
+              >
+                {fish.fish_food}
+              </Stack.Item>
+              <Stack.Item mt={2}>
+                {fish.fish_traits.length === 0 ? (
+                  <Button color="transparent" tooltip="Fish has no traits!">
+                    None
+                  </Button>
+                ) : (
+                  <Stack vertical>
+                    {fish.fish_traits.map((trait, index) => (
+                      <Stack.Item mt={-1} key={index}>
+                        <Button
+                          color="transparent"
+                          tooltip={
+                            <Stack vertical>
+                              <Stack.Item>
+                                Inheritance: {trait.trait_inherit}
+                              </Stack.Item>
+                              <Stack.Item>{trait.trait_desc}</Stack.Item>
+                            </Stack>
+                          }
+                        >
+                          {trait.trait_name}
+                        </Button>
+                      </Stack.Item>
+                    ))}
+                  </Stack>
+                )}
+              </Stack.Item>
+            </Stack>
+          </Flex.Item>
+          <Flex.Item grow ml={2}>
+            <Stack vertical>
+              <Stack.Item>
+                Health:{' '}
+                <ProgressBar
+                  width="95%"
+                  value={fish.fish_health / 100}
+                  ranges={{
+                    good: [0.9, Infinity],
+                    average: [0.5, 0.9],
+                    bad: [-Infinity, 0.5],
+                  }}
+                />
+              </Stack.Item>
+              <Stack.Item>
+                Hunger:{' '}
+                <ProgressBar
+                  width="95%"
+                  value={fish.fish_hunger / 100}
+                  ranges={{
+                    good: [0.9, Infinity],
+                    average: [0.5, 0.9],
+                    bad: [-Infinity, 0.5],
+                  }}
+                />
+              </Stack.Item>
+              <Stack.Item mt={2}>
+                {fish.fish_evolutions.length === 0 ? (
+                  <Box mb={2}>No evolutions!</Box>
+                ) : (
+                  <Stack mt={-2} vertical>
+                    {fish.fish_evolutions.map((evolution, index) => (
+                      <Stack.Item key={index}>
+                        <EvolutionItem evolution={evolution} fish={fish} />
+                      </Stack.Item>
+                    ))}
+                  </Stack>
+                )}
+              </Stack.Item>
+            </Stack>
+          </Flex.Item>
+        </Flex>
+      </Stack.Item>
+      <Stack.Item>
+        <Flex>
+          <Flex.Item
+            width="25%"
+            grow
+            style={{
+              color: fish.fish_suitable_temp ? '#1ac400' : 'red',
+            }}
+          >
+            {fish.fish_min_temp}k - {fish.fish_max_temp}k
+          </Flex.Item>
+          <Flex.Item
+            ml={3}
+            grow
+            style={{
+              color: fish.fish_fluid_compatible ? '#1ac400' : 'red',
+            }}
+          >
+            {dissectName(fish.fish_fluid_type)}
+          </Flex.Item>
+        </Flex>
+      </Stack.Item>
+    </Stack>
+  );
+};
+
+const EvolutionItem = (props) => {
+  const { evolution, fish } = props;
+
+  return (
+    <Flex>
+      <Flex.Item mt={1}>
+        <DmIcon
+          icon={fish.fish_icon}
+          icon_state={fish.fish_icon_state}
+          height="32px"
+          width="32px"
+        />
+      </Flex.Item>
+      <Flex.Item>
+        <Stack ml={0.5} vertical align="center">
+          <Stack.Item mt={2} style={{ fontSize: '8px' }}>
+            {evolution.evolution_probability}%
+          </Stack.Item>
+          <Stack.Item mt={-0.2}>
+            <Icon style={{ fontSize: '15px' }} color="red" name="arrow-right" />
+          </Stack.Item>
+        </Stack>
+      </Flex.Item>
+      <Flex.Item>
+        <DmIcon
+          mt={1}
+          icon={evolution.evolution_icon}
+          icon_state={evolution.evolution_icon_state}
+          height="32px"
+          width="32px"
+        />
+      </Flex.Item>
+    </Flex>
+  );
+};
+
+function dissectName(input: string): string {
+  return input.split(' ')[0].slice(0, 12);
+}
diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx
index ecf4ad1839ed5..38f130ab2fbd5 100644
--- a/tgui/packages/tgui/interfaces/JobSelection.tsx
+++ b/tgui/packages/tgui/interfaces/JobSelection.tsx
@@ -3,7 +3,11 @@ import { Color } from 'common/color';
 import { BooleanLike } from 'common/react';
 
 import { useBackend } from '../backend';
-import { DEPARTMENTS_RU, JOBS_RU } from '../bandastation/ru_jobs'; // BANDASTATION EDIT
+import {
+  DEPARTMENTS_RU,
+  JOBS_RU,
+  ReverseJobsRu,
+} from '../bandastation/ru_jobs'; // BANDASTATION EDIT
 import {
   Box,
   Button,
@@ -49,7 +53,7 @@ export const JobEntry = (data: {
   const jobName = data.jobName;
   const job = data.job;
   const department = data.department;
-  const jobIcon = JOB2ICON[jobName] || null;
+  const jobIcon = JOB2ICON[ReverseJobsRu(jobName)] || null;
   return (
     <Button
       fluid
diff --git a/tgui/packages/tgui/interfaces/Jukebox220.tsx b/tgui/packages/tgui/interfaces/Jukebox220.tsx
new file mode 100644
index 0000000000000..9475c7136143e
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Jukebox220.tsx
@@ -0,0 +1,386 @@
+import { sortBy } from 'common/collections';
+import React, { useState } from 'react';
+
+import { BooleanLike } from '../../common/react';
+import { useBackend } from '../backend';
+import {
+  Box,
+  Button,
+  Dimmer,
+  Icon,
+  Input,
+  Knob,
+  LabeledList,
+  NumberInput,
+  ProgressBar,
+  Section,
+  Stack,
+} from '../components';
+import { Window } from '../layouts';
+
+type Song = {
+  name: string;
+  length: number;
+  beat: number;
+};
+
+type Data = {
+  admin: BooleanLike;
+  active: BooleanLike;
+  looping: BooleanLike;
+  saveTrack: BooleanLike;
+  volume: number;
+  startTime: number;
+  worldTime: number;
+  track_selected: string | null;
+  songs: Song[];
+};
+
+export const Jukebox220 = () => {
+  const { act, data } = useBackend<Data>();
+  const [uploadTrack, setUploadTrack] = useState(false);
+  const [trackName, setTrackName] = useState('');
+  const [trackMinutes, setTrackMinutes] = useState(2);
+  const [trackSeconds, setTrackSeconds] = useState(20);
+  const [trackBeat, setTrackBeat] = useState(10);
+  const {
+    admin,
+    active,
+    looping,
+    saveTrack,
+    track_selected,
+    volume,
+    songs,
+    startTime,
+    worldTime,
+  } = data;
+
+  const MAX_NAME_LENGTH = 35;
+  const songs_sorted: Song[] = sortBy(songs, (song: Song) => song.name);
+  const song_selected: Song | undefined = songs.find(
+    (song) => song.name === track_selected,
+  );
+
+  const trackDuration = song_selected?.length || 0;
+  const totalTracks = songs_sorted.length;
+  const selectedTrackNumber = song_selected
+    ? songs_sorted.findIndex((song) => song.name === song_selected.name) + 1
+    : 0;
+
+  const formatTime = (deciseconds) => {
+    const seconds = Math.floor(deciseconds / 10);
+    const minutes = Math.floor(seconds / 60);
+    const remainingSeconds = seconds % 60;
+    const formattedTime = `${minutes}:${remainingSeconds > 9 ? remainingSeconds : '0' + remainingSeconds}`;
+    return formattedTime;
+  };
+
+  const trackTimer = (
+    <Box textAlign="center">
+      {looping
+        ? '∞ / ∞'
+        : `${active ? formatTime(Math.round(worldTime - startTime)) : formatTime(0)} / ${formatTime(trackDuration)}`}
+    </Box>
+  );
+
+  return (
+    <Window
+      width={350}
+      height={uploadTrack ? 585 : 435}
+      title="Музыкальный автомат"
+    >
+      <Window.Content>
+        <Stack fill vertical>
+          <Stack>
+            <Stack.Item grow textAlign="center">
+              <Section fill title="Проигрыватель">
+                <Stack fill vertical>
+                  {song_selected && (
+                    <Stack.Item bold maxWidth="240px">
+                      {song_selected.name.length > MAX_NAME_LENGTH ? (
+                        <marquee>{song_selected.name}</marquee>
+                      ) : (
+                        song_selected.name
+                      )}
+                    </Stack.Item>
+                  )}
+                  <Stack fill mt={1.5}>
+                    <Stack.Item grow basis="0">
+                      <Button
+                        fluid
+                        icon={active ? 'pause' : 'play'}
+                        color="transparent"
+                        selected={active}
+                        onClick={() => act('toggle')}
+                      >
+                        {active ? 'Стоп' : 'Старт'}
+                      </Button>
+                    </Stack.Item>
+                    <Stack.Item grow basis="0">
+                      <Button.Checkbox
+                        fluid
+                        icon={'undo'}
+                        disabled={active}
+                        checked={looping}
+                        onClick={() => act('loop', { looping: !looping })}
+                      >
+                        Повтор
+                      </Button.Checkbox>
+                    </Stack.Item>
+                    {!!admin && (
+                      <Stack.Item>
+                        <Button.Checkbox
+                          icon={'download'}
+                          tooltip="Загрузить новый трек"
+                          checked={uploadTrack}
+                          onClick={() => setUploadTrack(!uploadTrack)}
+                        />
+                      </Stack.Item>
+                    )}
+                  </Stack>
+                  <Stack.Item>
+                    <ProgressBar
+                      minValue={0}
+                      value={
+                        looping
+                          ? trackDuration
+                          : active
+                            ? Math.round(worldTime - startTime)
+                            : 0
+                      }
+                      maxValue={trackDuration}
+                    >
+                      {trackTimer}
+                    </ProgressBar>
+                  </Stack.Item>
+                </Stack>
+              </Section>
+            </Stack.Item>
+            <Stack.Item>
+              <Section fill>
+                {active ? <OnMusic /> : null}
+                <Stack mb={1.5}>
+                  <Stack.Item grow m={0}>
+                    <Button
+                      color="transparent"
+                      icon="fast-backward"
+                      onClick={() =>
+                        act('set_volume', {
+                          volume: 'min',
+                        })
+                      }
+                    />
+                  </Stack.Item>
+                  <Stack.Item m={0}>
+                    <Button
+                      color="transparent"
+                      icon="undo"
+                      onClick={() =>
+                        act('set_volume', {
+                          volume: 'reset',
+                        })
+                      }
+                    />
+                  </Stack.Item>
+                  <Stack.Item grow m={0} textAlign="right">
+                    <Button
+                      color="transparent"
+                      icon="fast-forward"
+                      onClick={() =>
+                        act('set_volume', {
+                          volume: 'max',
+                        })
+                      }
+                    />
+                  </Stack.Item>
+                </Stack>
+                <Stack.Item pr={1} pl={1} textAlign="center" textColor="label">
+                  <Knob
+                    size={1.75}
+                    value={volume}
+                    unit="%"
+                    minValue={0}
+                    maxValue={50}
+                    step={1}
+                    stepPixelSize={5}
+                    onDrag={(e, value) =>
+                      act('set_volume', {
+                        volume: value,
+                      })
+                    }
+                  />
+                  <Box mt={0.75}>Громкость</Box>
+                </Stack.Item>
+              </Section>
+            </Stack.Item>
+          </Stack>
+          <Stack.Item grow textAlign="center">
+            <Section
+              fill
+              scrollable
+              title="Доступные треки"
+              buttons={
+                <Button
+                  bold
+                  icon="random"
+                  color="transparent"
+                  tooltip="Выбрать случайный трек"
+                  tooltipPosition="top-end"
+                  onClick={() => {
+                    const randomIndex = Math.floor(Math.random() * totalTracks);
+                    const randomTrack = songs_sorted[randomIndex];
+                    act('select_track', { track: randomTrack.name });
+                  }}
+                >
+                  {selectedTrackNumber}/{totalTracks}
+                </Button>
+              }
+            >
+              {songs_sorted.map((song) => {
+                const selectedTrack = song_selected?.name === song.name;
+                return (
+                  <Stack.Item key={song.name} mb={0.5} textAlign="left">
+                    <Button
+                      fluid
+                      tooltip={
+                        song.name.length > MAX_NAME_LENGTH ? song.name : null
+                      }
+                      tooltipPosition="bottom"
+                      selected={selectedTrack}
+                      color="transparent"
+                      onClick={() => {
+                        !active && act('select_track', { track: song.name });
+                      }}
+                      style={{
+                        backgroundColor:
+                          active && !selectedTrack
+                            ? `rgba(255, 0, 0, 0.1)`
+                            : ``,
+                        color: active && !selectedTrack ? `gray` : ``,
+                      }}
+                    >
+                      <Stack fill>
+                        <Stack.Item
+                          grow
+                          overflow="hidden"
+                          style={{ textOverflow: 'ellipsis' }}
+                        >
+                          {song.name}
+                        </Stack.Item>
+                        <Stack.Item>{formatTime(song.length)}</Stack.Item>
+                      </Stack>
+                    </Button>
+                  </Stack.Item>
+                );
+              })}
+            </Section>
+          </Stack.Item>
+          {uploadTrack && (
+            <Stack.Item>
+              <Section fill title="Загрузить трек">
+                <Stack fill vertical textAlign="center">
+                  <Stack.Item>
+                    <LabeledList>
+                      <LabeledList.Item label="Название">
+                        <Input
+                          width="100%"
+                          placeholder="Название трека..."
+                          value={trackName}
+                          onChange={(e, value) => setTrackName(value)}
+                        />
+                      </LabeledList.Item>
+                      <LabeledList.Item label="Продолжительность">
+                        <Stack>
+                          <Stack.Item grow>
+                            <NumberInput
+                              width="100%"
+                              step={1}
+                              unit="мин"
+                              minValue={0}
+                              value={trackMinutes}
+                              maxValue={10}
+                              stepPixelSize={5}
+                              onChange={(value) => setTrackMinutes(value)}
+                            />
+                          </Stack.Item>
+                          <Stack.Item textAlign="center">:</Stack.Item>
+                          <Stack.Item grow>
+                            <NumberInput
+                              width="100%"
+                              step={1}
+                              unit="сек"
+                              minValue={1}
+                              value={trackSeconds}
+                              maxValue={59}
+                              stepPixelSize={3}
+                              onChange={(value) => setTrackSeconds(value)}
+                            />
+                          </Stack.Item>
+                        </Stack>
+                      </LabeledList.Item>
+                      <LabeledList.Item label="BPS">
+                        <NumberInput
+                          width="100%"
+                          step={1}
+                          minValue={0}
+                          value={trackBeat}
+                          maxValue={100}
+                          onChange={(value) => setTrackBeat(value)}
+                        />
+                      </LabeledList.Item>
+                    </LabeledList>
+                  </Stack.Item>
+                  <Stack.Item>
+                    <Stack>
+                      <Stack.Item grow>
+                        <Button
+                          fluid
+                          icon="upload"
+                          disabled={
+                            !trackName ||
+                            !(trackMinutes || trackSeconds) ||
+                            !trackBeat
+                          }
+                          onClick={() => {
+                            act('add_song', {
+                              track_name: trackName,
+                              track_length:
+                                trackMinutes * 600 + trackSeconds * 10,
+                              track_beat: trackBeat,
+                            });
+                            setTrackName('');
+                          }}
+                        >
+                          Загрузить новый трек
+                        </Button>
+                      </Stack.Item>
+                      <Stack.Item>
+                        <Button
+                          icon="floppy-disk"
+                          selected={saveTrack}
+                          tooltip="Сохранить загружаемый трек на сервере"
+                          onClick={() => act('save_song')}
+                        />
+                      </Stack.Item>
+                    </Stack>
+                  </Stack.Item>
+                </Stack>
+              </Section>
+            </Stack.Item>
+          )}
+        </Stack>
+      </Window.Content>
+    </Window>
+  );
+};
+
+const OnMusic = () => {
+  return (
+    <Dimmer textAlign="center">
+      <Icon name="music" size={3} color="gray" mb={1} />
+      <Box color="label" bold>
+        Играет музыка
+      </Box>
+    </Dimmer>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/CallModal.jsx b/tgui/packages/tgui/interfaces/LuaEditor/CallModal.tsx
similarity index 58%
rename from tgui/packages/tgui/interfaces/LuaEditor/CallModal.jsx
rename to tgui/packages/tgui/interfaces/LuaEditor/CallModal.tsx
index 73c505fba1c77..2681d7fb5f42d 100644
--- a/tgui/packages/tgui/interfaces/LuaEditor/CallModal.jsx
+++ b/tgui/packages/tgui/interfaces/LuaEditor/CallModal.tsx
@@ -1,12 +1,20 @@
-import { useBackend, useLocalState } from '../../backend';
+import { Dispatch, SetStateAction } from 'react';
+
+import { useBackend } from '../../backend';
 import { Button, Modal, Section } from '../../components';
 import { ListMapper } from './ListMapper';
+import { CallInfo, LuaEditorData, LuaEditorModal } from './types';
+
+type CallModalProps = {
+  setModal: Dispatch<SetStateAction<LuaEditorModal>>;
+  toCall: CallInfo;
+  setToCall: Dispatch<SetStateAction<CallInfo | undefined>>;
+};
 
-export const CallModal = (props) => {
-  const { act, data } = useBackend();
+export const CallModal = (props: CallModalProps) => {
+  const { act, data } = useBackend<LuaEditorData>();
   const { callArguments } = data;
-  const [, setModal] = useLocalState('modal');
-  const [toCall, setToCall] = useLocalState('toCallTaskInfo');
+  const { setModal, toCall, setToCall } = props;
   const { type, params } = toCall;
   return (
     <Modal
@@ -23,8 +31,8 @@ export const CallModal = (props) => {
             color="red"
             icon="window-close"
             onClick={() => {
-              setModal(null);
-              setToCall(null);
+              setModal(undefined);
+              setToCall(undefined);
               act('clearArgs');
             }}
           >
@@ -35,8 +43,8 @@ export const CallModal = (props) => {
         <ListMapper name="Arguments" list={callArguments} editable />
         <Button
           onClick={() => {
-            setModal(null);
-            setToCall(null);
+            setModal(undefined);
+            setToCall(undefined);
             act(type, params);
           }}
         >
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.jsx b/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx
similarity index 56%
rename from tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.jsx
rename to tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx
index 1e2596579846e..c078ff22506ad 100644
--- a/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.jsx
+++ b/tgui/packages/tgui/interfaces/LuaEditor/ChunkViewModal.tsx
@@ -1,17 +1,20 @@
 import hljs from 'highlight.js/lib/core';
+import { Dispatch, SetStateAction } from 'react';
 
-import { useLocalState } from '../../backend';
 import { Box, Button, Modal, Section } from '../../components';
 import { sanitizeText } from '../../sanitize';
+import { LuaEditorModal } from './types';
 
-export const ChunkViewModal = (props) => {
-  const [, setModal] = useLocalState('modal');
-  const [viewedChunk, setViewedChunk] = useLocalState('viewedChunk');
+type ChunkViewModalProps = {
+  setModal: Dispatch<SetStateAction<LuaEditorModal>>;
+  viewedChunk: string;
+  setViewedChunk: Dispatch<SetStateAction<string | undefined>>;
+};
+
+export const ChunkViewModal = (props: ChunkViewModalProps) => {
+  const { setModal, viewedChunk, setViewedChunk } = props;
   return (
-    <Modal
-      height={`${window.innerHeight * 0.8}px`}
-      width={`${window.innerWidth * 0.5}px`}
-    >
+    <Modal position="absolute" width="50%" height="80%" top="10%" left="25%">
       <Section
         fill
         scrollable
@@ -22,8 +25,8 @@ export const ChunkViewModal = (props) => {
             color="red"
             icon="window-close"
             onClick={() => {
-              setModal(null);
-              setViewedChunk(null);
+              setModal(undefined);
+              setViewedChunk(undefined);
             }}
           >
             Close
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.jsx b/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.jsx
deleted file mode 100644
index 13dde7022feb5..0000000000000
--- a/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.jsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { useBackend, useLocalState } from '../../backend';
-import {
-  Box,
-  Button,
-  Collapsible,
-  LabeledList,
-  Section,
-} from '../../components';
-
-const RefRegex = RegExp('^.+ \\[0x[0-9a-fA-F]+]$');
-const FunctionRegex = RegExp('^function: 0x[0-9a-fA-F]+$');
-const UnconvertibleLuaValueRegex = RegExp(
-  '^(table|function|thread): 0x[0-9a-fA-F]+$',
-);
-
-export const ListMapper = (props) => {
-  const { act } = useBackend();
-
-  const {
-    list,
-    path,
-    editable,
-    name,
-    callType,
-    vvAct,
-    skipNulls,
-    collapsible,
-    ...rest
-  } = props;
-
-  const [, setToCall] = useLocalState('toCallTaskInfo');
-  const [, setModal] = useLocalState('modal');
-
-  const ThingNode = (thing, path, overrideProps) => {
-    if (Array.isArray(thing)) {
-      return (
-        <ListMapper
-          {...props}
-          list={thing}
-          name={`List[${thing.length}]`}
-          path={path}
-          collapsible
-          {...rest}
-          {...overrideProps}
-        />
-      );
-    } else if (typeof thing === 'string') {
-      if (FunctionRegex.test(thing) && callType) {
-        return (
-          <Button
-            tooltip="Click to call"
-            onClick={() => {
-              setToCall({
-                type: callType,
-                params: {
-                  indices: path.map((v) => v.index),
-                },
-              });
-              setModal('call');
-            }}
-          >
-            {thing.charAt(0).toUpperCase() + thing.substring(1)}
-          </Button>
-        );
-      } else if (UnconvertibleLuaValueRegex.test(thing)) {
-        return <b>{thing.charAt(0).toUpperCase() + thing.substring(1)}</b>;
-      } else if (RefRegex.test(thing)) {
-        return (
-          <Button tooltip="Click to VV Datum" onClick={() => vvAct(path)}>
-            {thing}
-          </Button>
-        );
-      } else if (thing === null) {
-        return <b>Nil</b>;
-      } else {
-        return thing;
-      }
-    } else {
-      return <Box {...rest}>{thing}</Box>;
-    }
-  };
-
-  const ListMapperInner = (element, i) => {
-    const { key, value } = element;
-    const basePath = path ? path : [];
-    let keyPath = [...basePath, { index: i + 1, type: 'key' }];
-    let valuePath = [...basePath, { index: i + 1, type: 'value' }];
-    let entryPath = [...basePath, { index: i + 1, type: 'entry' }];
-
-    if (key === null && skipNulls) {
-      return;
-    }
-
-    /*
-     * Finding a function only accessible as a table's key is too awkward to
-     * deal with for now
-     */
-    let keyNode = ThingNode(key, keyPath, { callType: null });
-
-    /*
-     * Likewise, since table, thread, and userdata equality is tested by
-     * reference rather than value, we can't find functions whose keys
-     * within the table are tables, threads, or userdata
-     */
-    const uniquelyIndexable =
-      (typeof key === 'string' &&
-        !(UnconvertibleLuaValueRegex.test(key) || RefRegex.test(key))) ||
-      typeof key === 'number';
-    let valueNode = ThingNode(value, valuePath, {
-      callType: uniquelyIndexable && callType,
-    });
-    return (
-      <LabeledList.Item
-        label={keyNode}
-        buttons={
-          editable && (
-            <>
-              <Button
-                icon="arrow-up"
-                disabled={i === 0}
-                tooltip="Move Up"
-                onClick={() => act('moveArgUp', { path: entryPath })}
-              />
-              <Button
-                icon="arrow-down"
-                disabled={i === list.length - 1}
-                tooltip="Move Down"
-                onClick={() => act('moveArgDown', { path: entryPath })}
-              />
-              <Button
-                icon="window-close"
-                color="red"
-                tooltip="Remove"
-                onClick={() => act('removeArg', { path: entryPath })}
-              />
-            </>
-          )
-        }
-      >
-        {valueNode}
-      </LabeledList.Item>
-    );
-  };
-
-  const inner = (
-    <>
-      {list && list.map(ListMapperInner)}
-      {editable && (
-        <Button
-          icon="plus"
-          tooltip="Add"
-          onClick={() => act('addArg', { path: path })}
-        />
-      )}
-    </>
-  );
-
-  const buttons = vvAct && list?.length > 0 && (
-    <Button icon="search" tooltip="VV List" onClick={() => vvAct(path)} />
-  );
-
-  return collapsible ? (
-    <Collapsible title={name} buttons={buttons}>
-      {inner}
-    </Collapsible>
-  ) : (
-    <Section title={name} buttons={buttons}>
-      {inner}
-    </Section>
-  );
-};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx b/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx
new file mode 100644
index 0000000000000..be87295e2bfee
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LuaEditor/ListMapper.tsx
@@ -0,0 +1,288 @@
+import { BooleanLike } from 'common/react';
+import React, { Dispatch, SetStateAction } from 'react';
+
+import { useBackend } from '../../backend';
+import {
+  Box,
+  Button,
+  Collapsible,
+  LabeledList,
+  Section,
+  Tooltip,
+} from '../../components';
+import { BoxProps } from '../../components/Box';
+import { logger } from '../../logging';
+import { CallInfo, LuaEditorModal, Variant, VariantList } from './types';
+import { ListElement, ListPath } from './types';
+
+const mapListVariantsInner = (value: any, variant: Variant) => {
+  if (Array.isArray(variant)) {
+    const [variant_inner, param] = variant;
+    switch (variant_inner) {
+      case 'list':
+        return mapListVariants(value, param);
+      case 'cycle':
+        return (
+          <Box key="cycle" bold textColor="green">
+            Circular Reference
+          </Box>
+        );
+      case 'ref':
+        return (
+          <Box key="ref" bold backgroundColor="blue">
+            {`${value} ${param}`}
+          </Box>
+        );
+    }
+  } else {
+    switch (variant) {
+      case 'error':
+        return (
+          <Tooltip key="error" content={value}>
+            <Box bold textColor="red">
+              Conversion Error
+            </Box>
+          </Tooltip>
+        );
+      case 'function':
+        return (
+          <Box key="function" bold backgroundColor="green">
+            {value}
+          </Box>
+        );
+      case 'thread':
+        return (
+          <Box key="thread" bold backgroundColor="yellow">
+            Thread: {value}
+          </Box>
+        );
+      case 'userdata':
+        return (
+          <Box key="userdata" bold backgroundColor="grey">
+            Userdata: {value}
+          </Box>
+        );
+      case 'error_as_value':
+        return (
+          <Box key="error_as_value" bold textColor="red">
+            {value}
+          </Box>
+        );
+      default:
+        return value;
+    }
+  }
+};
+
+const mapListVariants = (list: any[], variants: VariantList) => {
+  logger.log(list, variants);
+  return list.map((element, i) => {
+    const { key, value } = element;
+    const { key: key_variant = null, value: value_variant = null } =
+      variants[i] || {};
+    if (typeof key === 'number') {
+      return {
+        key: key,
+        value: mapListVariantsInner(value, key_variant),
+      };
+    } else {
+      return {
+        key: mapListVariantsInner(key, key_variant),
+        value: mapListVariantsInner(value, value_variant),
+      };
+    }
+  });
+};
+
+type ListMapperProps = BoxProps & {
+  list: ListElement[];
+} & Partial<{
+    variants: VariantList;
+    editable: BooleanLike;
+    name: string;
+    vvAct: (path: ListPath) => void;
+    skipNulls: BooleanLike;
+    collapsible: BooleanLike;
+    callType: 'callFunction' | 'resumeTask';
+    path: ListPath;
+    setToCall: Dispatch<SetStateAction<CallInfo>>;
+    setModal: Dispatch<SetStateAction<LuaEditorModal>>;
+  }>;
+
+export const ListMapper = (props: ListMapperProps) => {
+  const { act } = useBackend();
+
+  const { variants, list: _, ...safeProps } = props;
+
+  const {
+    path,
+    editable,
+    name,
+    vvAct,
+    skipNulls,
+    collapsible,
+    setToCall,
+    setModal,
+    ...rest
+  } = safeProps;
+
+  let { list } = props;
+
+  if (variants) {
+    list = mapListVariants(list, variants);
+  }
+
+  const ThingNode = (
+    thing: any,
+    path: ListPath,
+    canCall: BooleanLike,
+    overrideProps?: ListMapperProps,
+  ) => {
+    if (Array.isArray(thing)) {
+      return (
+        <ListMapper
+          {...safeProps}
+          list={thing}
+          name={`List[${thing.length}]`}
+          path={path}
+          collapsible
+          {...rest}
+          {...overrideProps}
+        />
+      );
+    } else if (React.isValidElement<any>(thing)) {
+      switch (thing.key) {
+        case 'ref':
+          return (
+            <Button
+              tooltip="Click to VV"
+              onClick={vvAct && (() => vvAct(path))}
+              {...thing.props}
+            />
+          );
+        case 'function':
+          if (canCall && setToCall && setModal) {
+            return (
+              <Button
+                tooltip="Click to call"
+                onClick={() => {
+                  setToCall({
+                    type: 'callFunction',
+                    params: {
+                      indices: path.map((v) => v.index),
+                    },
+                  });
+                  setModal('call');
+                }}
+                {...thing.props}
+              />
+            );
+          } else if (thing === null) {
+            return <b>nil</b>;
+          } else {
+            return thing;
+          }
+        default:
+          return thing;
+      }
+    } else {
+      return <Box {...rest}>{thing}</Box>;
+    }
+  };
+
+  const ListMapperInner = (element: ListElement, i: number) => {
+    const { key, value } = element;
+    const basePath: ListPath = path ? path : [];
+    let keyPath: ListPath = [...basePath, { index: i + 1, type: 'key' }];
+    let valuePath: ListPath = [...basePath, { index: i + 1, type: 'value' }];
+    let entryPath: ListPath = [...basePath, { index: i + 1, type: 'entry' }];
+
+    if (key === null && skipNulls) {
+      return;
+    }
+
+    /*
+     * Finding a function only accessible as a table's key is too awkward to
+     * deal with for now
+     */
+    let keyNode = ThingNode(key, keyPath, false);
+
+    /*
+     * Likewise, since table, thread, and userdata equality is tested by
+     * reference rather than value, we can't find functions whose keys
+     * within the table are tables, threads, or userdata
+     */
+    const uniquelyIndexable =
+      typeof key === 'string' ||
+      typeof key === 'number' ||
+      (React.isValidElement(key) && key.key === 'ref');
+    let valueNode = ThingNode(
+      value,
+      typeof key === 'number' ? keyPath : valuePath,
+      uniquelyIndexable,
+    );
+    return (
+      <>
+        {i > 0 && (key === null || key === undefined) && (
+          <LabeledList.Divider />
+        )}
+        <LabeledList.Item
+          label={keyNode}
+          buttons={
+            editable && (
+              <>
+                <Button
+                  icon="arrow-up"
+                  disabled={i === 0}
+                  tooltip="Move Up"
+                  onClick={() => act('moveArgUp', { path: entryPath })}
+                />
+                <Button
+                  icon="arrow-down"
+                  disabled={i === list.length - 1}
+                  tooltip="Move Down"
+                  onClick={() => act('moveArgDown', { path: entryPath })}
+                />
+                <Button
+                  icon="window-close"
+                  color="red"
+                  tooltip="Remove"
+                  onClick={() => act('removeArg', { path: entryPath })}
+                />
+              </>
+            )
+          }
+        >
+          {valueNode}
+        </LabeledList.Item>
+      </>
+    );
+  };
+
+  const inner = (
+    <>
+      {list && list.map(ListMapperInner)}
+      {editable && (
+        <Button
+          icon="plus"
+          tooltip="Add"
+          onClick={() => act('addArg', { path: path })}
+        />
+      )}
+    </>
+  );
+
+  const buttons = vvAct && list?.length > 0 && (
+    <Button icon="search" tooltip="VV List" onClick={() => vvAct(path ?? [])} />
+  );
+
+  return collapsible ? (
+    <Collapsible title={name} buttons={buttons}>
+      {inner}
+    </Collapsible>
+  ) : (
+    <Section title={name} buttons={buttons}>
+      {inner}
+    </Section>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/Log.jsx b/tgui/packages/tgui/interfaces/LuaEditor/Log.jsx
deleted file mode 100644
index 6b3100f086cc9..0000000000000
--- a/tgui/packages/tgui/interfaces/LuaEditor/Log.jsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { useBackend, useLocalState } from '../../backend';
-import { Box, Button, Divider } from '../../components';
-import { logger } from '../../logging';
-import { ListMapper } from './ListMapper';
-
-export const Log = (props) => {
-  const { act, data } = useBackend();
-  const { stateLog } = data;
-  const [, setViewedChunk] = useLocalState('viewedChunk');
-  const [, setModal] = useLocalState('modal');
-  // We only kvpify logs so that the return values are kvpified.
-  const mappedLog = stateLog.map(({ value }) =>
-    Object.fromEntries(value.map(({ key, value }) => [key, value])),
-  );
-  return mappedLog.map((element, i) => {
-    const { name, status, param, chunk, repeats } = element;
-    let message;
-    let messageColor;
-    switch (status) {
-      case 'sleeping':
-        if (chunk) {
-          messageColor = 'blue';
-          message = (
-            <>
-              <b>{name}</b> slept.
-            </>
-          );
-        }
-        break;
-      case 'yielded':
-        message = (
-          <>
-            <b>{name}</b> yielded
-            {param.length
-              ? ` ${param.length} value${param.length > 1 ? 's' : ''}`
-              : ''}
-            .
-            {param.length ? (
-              <ListMapper
-                list={param}
-                skipNulls
-                name="Return Value"
-                collapsible
-                vvAct={(path) =>
-                  act('vvReturnValue', {
-                    entryIndex: i + 1,
-                    tableIndices: path,
-                  })
-                }
-              />
-            ) : (
-              <br />
-            )}
-          </>
-        );
-        messageColor = 'yellow';
-        break;
-      case 'finished':
-        message = (
-          <>
-            <b>{name}</b> returned
-            {param.length
-              ? ` ${param.length} value${param.length > 1 ? 's' : ''}`
-              : ''}
-            .
-            <Box color="default">
-              {param.length ? (
-                <ListMapper
-                  list={param}
-                  skipNulls
-                  name="Return Value"
-                  collapsible
-                  vvAct={(path) =>
-                    act('vvReturnValue', {
-                      entryIndex: i + 1,
-                      tableIndices: path,
-                    })
-                  }
-                />
-              ) : (
-                <br />
-              )}
-            </Box>
-          </>
-        );
-        messageColor = 'green';
-        break;
-      case 'errored':
-      case 'bad return':
-        message = (
-          <>
-            <b>{name}</b> errored with the message &quot;{param}&quot;
-          </>
-        );
-        messageColor = 'red';
-        break;
-      case 'print':
-        message = param;
-        break;
-      default:
-        logger.warn(`unknown log status ${status}`);
-    }
-    if (message === undefined) {
-      return;
-    }
-    if (chunk) {
-      message = (
-        <>
-          {message}
-          <Button
-            onClick={() => {
-              setViewedChunk(chunk);
-              setModal('viewChunk');
-            }}
-          >
-            View Source
-          </Button>
-        </>
-      );
-    }
-    return (
-      <>
-        {i > 0 && <Divider />}
-        <Box width="100%" key={i} color={messageColor}>
-          {message}
-        </Box>
-        {repeats && (
-          <Box
-            inline
-            px="0.25rem"
-            mt="0.25rem"
-            style={{
-              borderRadius: '0.5em',
-            }}
-            backgroundColor={messageColor}
-          >
-            x{repeats + 1}
-          </Box>
-        )}
-      </>
-    );
-  });
-};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/Log.tsx b/tgui/packages/tgui/interfaces/LuaEditor/Log.tsx
new file mode 100644
index 0000000000000..b4f2b82bb3e9f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LuaEditor/Log.tsx
@@ -0,0 +1,224 @@
+import { Dispatch, SetStateAction } from 'react';
+
+import { useBackend } from '../../backend';
+import {
+  Box,
+  Button,
+  Collapsible,
+  Divider,
+  LabeledList,
+  Stack,
+} from '../../components';
+import { logger } from '../../logging';
+import { ListMapper } from './ListMapper';
+import { LuaEditorData, LuaEditorModal } from './types';
+
+const parsePanic = (name, panic_json) => {
+  const panic_info = JSON.parse(panic_json);
+  const {
+    message,
+    location: { file, line },
+    backtrace,
+  } = panic_info;
+  return (
+    <>
+      <Box textColor="red">
+        <b>{name}</b> panicked at {file}:{line}: {message}
+      </Box>
+      <Collapsible title="Backtrace">
+        <Stack vertical>
+          {backtrace
+            ?.filter(
+              (frame) => frame.file !== undefined && frame.line !== undefined,
+            )
+            ?.map(({ name, file, line }, i) => (
+              <>
+                {i > 0 && <Divider />}
+                <Stack.Item key={i}>
+                  <LabeledList>
+                    <LabeledList.Item label="function">{name}</LabeledList.Item>
+                    <LabeledList.Item label="location">
+                      {file}:{line}
+                    </LabeledList.Item>
+                  </LabeledList>
+                </Stack.Item>
+              </>
+            ))}
+        </Stack>
+      </Collapsible>
+    </>
+  );
+};
+
+type LogProps = {
+  setViewedChunk: Dispatch<SetStateAction<string | undefined>>;
+  setModal: Dispatch<SetStateAction<LuaEditorModal>>;
+};
+
+export const Log = (props: LogProps) => {
+  const { act, data } = useBackend<LuaEditorData>();
+  const { stateLog } = data;
+  const { setViewedChunk, setModal } = props;
+  return stateLog.map((element, i) => {
+    const { status, repeats } = element;
+    let output;
+    let messageColor;
+    switch (status) {
+      case 'sleep': {
+        const { chunk, name } = element;
+        if (chunk) {
+          messageColor = 'blue';
+          output = (
+            <>
+              <b>{name}</b> slept.
+            </>
+          );
+        }
+        break;
+      }
+      case 'yield': {
+        const { name, return_values, variants } = element;
+        output = (
+          <>
+            <b>{name}</b> yielded
+            {return_values.length
+              ? ` ${return_values.length} value${
+                  return_values.length > 1 ? 's' : ''
+                }`
+              : ''}
+            .
+            {return_values.length ? (
+              <ListMapper
+                list={return_values}
+                variants={variants}
+                skipNulls
+                name="Return Values"
+                collapsible
+                vvAct={(path) =>
+                  act('vvReturnValue', {
+                    entryIndex: i + 1,
+                    indices: path,
+                  })
+                }
+              />
+            ) : (
+              <br />
+            )}
+          </>
+        );
+        messageColor = 'yellow';
+        break;
+      }
+      case 'finished': {
+        const { name, return_values, variants } = element;
+        output = (
+          <>
+            <b>{name}</b> returned
+            {return_values.length
+              ? ` ${return_values.length} value${
+                  return_values.length > 1 ? 's' : ''
+                }`
+              : ''}
+            .
+            <Box color="default">
+              {return_values.length ? (
+                <ListMapper
+                  list={return_values}
+                  variants={variants}
+                  skipNulls
+                  name="Return Values"
+                  collapsible
+                  vvAct={(path) =>
+                    act('vvReturnValue', {
+                      entryIndex: i + 1,
+                      tableIndices: path,
+                    })
+                  }
+                />
+              ) : (
+                <br />
+              )}
+            </Box>
+          </>
+        );
+        messageColor = 'green';
+        break;
+      }
+      case 'error': {
+        const { message } = element;
+        output = message;
+        messageColor = 'red';
+        break;
+      }
+      case 'panic': {
+        const { name, message } = element;
+        output = parsePanic(name, message);
+        break;
+      }
+      case 'runtime': {
+        const { file, line, message, stack } = element;
+        output = (
+          <>
+            Runtime at {file}:{line}: {message}
+            <ListMapper
+              list={stack.map((frame) => {
+                return { key: null, value: frame };
+              })}
+              name="Stack Trace"
+              collapsible
+            />
+          </>
+        );
+        messageColor = 'red';
+        break;
+      }
+      case 'print': {
+        const { message } = element;
+        output = message;
+        break;
+      }
+      default:
+        logger.warn(`unknown log status ${status}`);
+    }
+    if (output === undefined) {
+      return;
+    }
+    const { chunk } = element;
+    if (chunk) {
+      output = (
+        <>
+          {output}
+          <Button
+            onClick={() => {
+              setViewedChunk(chunk);
+              setModal('viewChunk');
+            }}
+          >
+            View Source
+          </Button>
+        </>
+      );
+    }
+    return (
+      <>
+        {i > 0 && <Divider />}
+        <Box width="100%" key={i} color={messageColor}>
+          {output}
+        </Box>
+        {repeats && (
+          <Box
+            inline
+            px="0.25rem"
+            mt="0.25rem"
+            style={{
+              borderRadius: '0.5em',
+            }}
+            backgroundColor={messageColor}
+          >
+            x{repeats + 1}
+          </Box>
+        )}
+      </>
+    );
+  });
+};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.jsx b/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx
similarity index 64%
rename from tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.jsx
rename to tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx
index 3ac6373611e1a..4ff3deeb09bfe 100644
--- a/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.jsx
+++ b/tgui/packages/tgui/interfaces/LuaEditor/StateSelectModal.tsx
@@ -1,16 +1,20 @@
-import { useBackend, useLocalState } from '../../backend';
+import { useState } from 'react';
+
+import { useBackend } from '../../backend';
 import { Button, Input, Modal, Section, Stack } from '../../components';
+import { LuaEditorData, LuaEditorModal } from './types';
+
+type StateSelectModalProps = {
+  setModal: (modal: LuaEditorModal) => void;
+};
 
-export const StateSelectModal = (props) => {
-  const { act, data } = useBackend();
-  const [, setModal] = useLocalState('modal', 'states');
-  const [input, setInput] = useLocalState('newStateName', '');
+export const StateSelectModal = (props: StateSelectModalProps) => {
+  const { act, data } = useBackend<LuaEditorData>();
+  const { setModal } = props;
+  const [input, setInput] = useState<string>();
   const { states } = data;
   return (
-    <Modal
-      height={`${window.innerHeight * 0.5}px`}
-      width={`${window.innerWidth * 0.3}px`}
-    >
+    <Modal position="absolute" width="30%" height="50%" top="25%" left="35%">
       <Section
         fill
         title="States"
@@ -19,7 +23,7 @@ export const StateSelectModal = (props) => {
             color="red"
             icon="window-close"
             onClick={() => {
-              setModal(null);
+              setModal(undefined);
             }}
           >
             Cancel
@@ -30,7 +34,7 @@ export const StateSelectModal = (props) => {
           <Button
             key={i}
             onClick={() => {
-              setModal(null);
+              setModal(undefined);
               act('switchState', { index: i + 1 });
             }}
           >
@@ -38,7 +42,7 @@ export const StateSelectModal = (props) => {
           </Button>
         ))}
         <Stack fill>
-          <Stack.Item shrink basis="100%">
+          <Stack.Item grow>
             <Input
               fluid
               placeholder="New State"
@@ -52,7 +56,7 @@ export const StateSelectModal = (props) => {
             <Button
               icon="plus"
               onClick={() => {
-                setModal(null);
+                setModal(undefined);
                 act('newState', { name: input });
               }}
             />
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.jsx b/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx
similarity index 53%
rename from tgui/packages/tgui/interfaces/LuaEditor/TaskManager.jsx
rename to tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx
index 53681d0544f57..d534f2011f268 100644
--- a/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.jsx
+++ b/tgui/packages/tgui/interfaces/LuaEditor/TaskManager.tsx
@@ -1,33 +1,32 @@
-import { useBackend, useLocalState } from '../../backend';
+import { Dispatch, SetStateAction } from 'react';
+
+import { useBackend } from '../../backend';
 import { Button, LabeledList, Section, Stack } from '../../components';
+import { CallInfo, LuaEditorData, LuaEditorModal } from './types';
+
+type TaskManagerProps = {
+  setToCall: Dispatch<SetStateAction<CallInfo>>;
+  setModal: Dispatch<SetStateAction<LuaEditorModal>>;
+};
 
-export const TaskManager = (props) => {
-  const { act, data } = useBackend();
-  const [, setToCall] = useLocalState('toCallTaskInfo');
-  const [, setModal] = useLocalState('modal');
-  let { tasks } = data;
-  tasks?.sort((a, b) => {
-    if (a.status < b.status) {
-      return -1;
-    } else if (a.status > b.status) {
-      return 1;
-    } else {
-      return 0;
-    }
-  });
-  const sleeps = tasks.filter((info) => info.status === 'sleep');
-  const yields = tasks.filter((info) => info.status === 'yield');
+export const TaskManager = (props: TaskManagerProps) => {
+  const { act, data } = useBackend<LuaEditorData>();
+  const { setToCall, setModal } = props;
+  const { tasks } = data;
+  const { sleeps = [], yields = [] } = tasks;
   return (
     <Stack fill width="100%" justify="space-around">
-      <Stack.Item grow="1" shrink="1">
+      <Stack.Item grow shrink>
         <Section title="Sleeps" fill>
           <LabeledList>
-            {sleeps.map((info, i) => (
-              <LabeledList.Item key={i} label={info.name}>
+            {sleeps.map(({ index, name }, i) => (
+              <LabeledList.Item key={i} label={name}>
                 <Button
                   color="red"
                   icon="window-close"
-                  onClick={() => act('killTask', { info: info })}
+                  onClick={() =>
+                    act('killTask', { is_sleep: true, index: index })
+                  }
                 >
                   Kill
                 </Button>
@@ -36,16 +35,16 @@ export const TaskManager = (props) => {
           </LabeledList>
         </Section>
       </Stack.Item>
-      <Stack.Item grow="1" shrink="1">
+      <Stack.Item grow shrink>
         <Section title="Yields" fill>
           <LabeledList>
-            {yields.map((info, i) => (
-              <LabeledList.Item key={i} label={info.name}>
+            {yields.map(({ index, name }, i) => (
+              <LabeledList.Item key={i} label={name}>
                 <Button
                   onClick={() => {
                     setToCall({
                       type: 'resumeTask',
-                      params: { index: info.index },
+                      params: { index: index },
                     });
                     setModal('call');
                   }}
@@ -56,7 +55,7 @@ export const TaskManager = (props) => {
                   color="red"
                   icon="window-close"
                   onClick={() => {
-                    act('killTask', { info: info });
+                    act('killTask', { is_sleep: false, index: index });
                   }}
                 >
                   Kill
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/index.jsx b/tgui/packages/tgui/interfaces/LuaEditor/index.jsx
deleted file mode 100644
index 10c17ffbbb465..0000000000000
--- a/tgui/packages/tgui/interfaces/LuaEditor/index.jsx
+++ /dev/null
@@ -1,384 +0,0 @@
-import hljs from 'highlight.js/lib/core';
-import lua from 'highlight.js/lib/languages/lua';
-import { marked } from 'marked';
-import { Component, createRef } from 'react';
-
-import { useBackend, useLocalState } from '../../backend';
-import {
-  Box,
-  Button,
-  Flex,
-  Modal,
-  NoticeBox,
-  ProgressBar,
-  Section,
-  Stack,
-  Tabs,
-  TextArea,
-} from '../../components';
-import { Window } from '../../layouts';
-import { sanitizeText } from '../../sanitize';
-import { CallModal } from './CallModal';
-import { ChunkViewModal } from './ChunkViewModal';
-import { ListMapper } from './ListMapper';
-import { Log } from './Log';
-import { StateSelectModal } from './StateSelectModal';
-import { TaskManager } from './TaskManager';
-hljs.registerLanguage('lua', lua);
-
-export class LuaEditor extends Component {
-  constructor(props) {
-    super(props);
-    this.sectionRef = createRef();
-    this.state = {
-      showJumpToBottomButton: false,
-      activeTab: 'tasks',
-      scriptInput: '',
-    };
-
-    this.handleSectionScroll = () => {
-      const { showJumpToBottomButton } = this.state;
-      const scrollableCurrent = this.sectionRef.current;
-      if (
-        !showJumpToBottomButton &&
-        scrollableCurrent?.scrollHeight >
-          scrollableCurrent?.scrollTop + scrollableCurrent?.clientHeight
-      ) {
-        this.setState({ showJumpToBottomButton: true });
-      } else if (
-        showJumpToBottomButton &&
-        scrollableCurrent?.scrollTop + scrollableCurrent?.clientHeight >=
-          scrollableCurrent?.scrollHeight
-      ) {
-        this.setState({ showJumpToBottomButton: false });
-      }
-    };
-
-    window.addEventListener('resize', () =>
-      this.forceUpdate(this.handleSectionScroll),
-    );
-  }
-
-  componentDidMount() {
-    const { data } = useBackend();
-    const { forceModal, forceViewChunk } = data;
-    if (forceModal || forceViewChunk) {
-      const [, setModal] = useLocalState('modal');
-      const [, setViewedChunk] = useLocalState('viewedChunk');
-      setModal(forceModal);
-      setViewedChunk(forceViewChunk);
-    }
-  }
-
-  componentDidUpdate() {
-    this.handleSectionScroll();
-  }
-
-  render() {
-    const { act, data } = useBackend();
-    const {
-      noStateYet,
-      globals,
-      documentation,
-      tasks,
-      showGlobalTable,
-      page,
-      pageCount,
-      auxtools_enabled,
-      ss_lua_init,
-    } = data;
-
-    if (!auxtools_enabled) {
-      return (
-        <Window>
-          <Window.Content>
-            <NoticeBox danger>
-              Auxtools is not enabled. Please ask your server administrator to
-              enable it in the server configuration.
-            </NoticeBox>
-          </Window.Content>
-        </Window>
-      );
-    }
-
-    if (!ss_lua_init) {
-      return (
-        <Window>
-          <Window.Content>
-            <NoticeBox danger>
-              The Lua subsystem is not initialized. Consult your server logs.
-            </NoticeBox>
-          </Window.Content>
-        </Window>
-      );
-    }
-
-    const [modal, setModal] = useLocalState(
-      'modal',
-      noStateYet ? 'states' : null,
-    );
-    const { activeTab, showJumpToBottomButton, scriptInput } = this.state;
-    let tabContent;
-    switch (activeTab) {
-      case 'globals': {
-        if (!globals) {
-          tabContent = (
-            <h1>
-              Could not retrieve the global table. Was it corrupted or shadowed?
-            </h1>
-          );
-        } else {
-          tabContent = (
-            <ListMapper
-              list={globals}
-              skipNulls
-              vvAct={(path) => act('vvGlobal', { indices: path })}
-              callType="callFunction"
-            />
-          );
-        }
-        break;
-      }
-      case 'tasks': {
-        if (!tasks) {
-          tabContent = (
-            <h1>
-              Could not retrieve task info. Was the global table corrupted or
-              shadowed?
-            </h1>
-          );
-        } else {
-          tabContent = <TaskManager />;
-        }
-        break;
-      }
-      case 'log': {
-        tabContent = <Log />;
-        break;
-      }
-    }
-
-    return (
-      <Window width={1280} height={720}>
-        <Window.Content>
-          <Button icon="file" onClick={() => setModal('states')}>
-            States
-          </Button>
-          {noStateYet ? (
-            <Flex
-              width="100%"
-              height="100%"
-              align="center"
-              justify="space-around"
-            >
-              <h1>Please select or create a lua state to get started.</h1>
-            </Flex>
-          ) : (
-            <Stack height="calc(100% - 16px)">
-              <Stack.Item grow shrink basis="55%">
-                <Section
-                  fill
-                  pb="16px"
-                  title="Input"
-                  buttons={
-                    <>
-                      <Button onClick={() => act('runCodeFile')}>Import</Button>
-                      <Button onClick={() => setModal('documentation')}>
-                        Help
-                      </Button>
-                    </>
-                  }
-                >
-                  <TextArea
-                    fluid
-                    width="100%"
-                    height="100%"
-                    value={scriptInput}
-                    fontFamily="Consolas"
-                    onInput={(_, value) =>
-                      this.setState({ scriptInput: value })
-                    }
-                    displayedValue={
-                      <Box
-                        style={{
-                          pointerEvents: 'none',
-                        }}
-                        dangerouslySetInnerHTML={{
-                          __html: hljs.highlight(scriptInput, {
-                            language: 'lua',
-                          }).value,
-                        }}
-                      />
-                    }
-                  />
-                  <Button onClick={() => act('runCode', { code: scriptInput })}>
-                    Run
-                  </Button>
-                </Section>
-              </Stack.Item>
-              <Stack.Item grow shrink basis="45%">
-                <Section
-                  fill
-                  pb="24px"
-                  height={
-                    activeTab === 'log'
-                      ? showJumpToBottomButton
-                        ? 'calc(100% - 48px)'
-                        : 'calc(100% - 32px)'
-                      : '100%'
-                  }
-                  width="100%"
-                >
-                  <Stack justify="space-between">
-                    <Stack.Item>
-                      <Tabs>
-                        {!!showGlobalTable && (
-                          <Tabs.Tab
-                            selected={activeTab === 'globals'}
-                            onClick={() => {
-                              this.setState({ activeTab: 'globals' });
-                            }}
-                          >
-                            Globals
-                          </Tabs.Tab>
-                        )}
-                        <Tabs.Tab
-                          selected={activeTab === 'tasks'}
-                          onClick={() => this.setState({ activeTab: 'tasks' })}
-                        >
-                          Tasks
-                        </Tabs.Tab>
-                        <Tabs.Tab
-                          selected={activeTab === 'log'}
-                          onClick={() => {
-                            this.setState({ activeTab: 'log' });
-                            setTimeout(this.handleSectionScroll, 0);
-                          }}
-                        >
-                          Log
-                        </Tabs.Tab>
-                      </Tabs>
-                    </Stack.Item>
-                    <Stack.Item>
-                      <Button.Checkbox
-                        inline
-                        checked={showGlobalTable}
-                        tooltip="WARNING: Displaying the global table can cause significant lag for the entire server, especially when there is a large number of global variables."
-                        onClick={() => {
-                          if (showGlobalTable && activeTab === 'globals') {
-                            this.setState({ activeTab: 'tasks' });
-                          }
-                          act('toggleShowGlobalTable');
-                        }}
-                      >
-                        Show Global Table
-                      </Button.Checkbox>
-                    </Stack.Item>
-                  </Stack>
-                  <Section
-                    ref={this.sectionRef}
-                    fill
-                    scrollable
-                    scrollableHorizontal
-                    onScroll={this.handleSectionScroll}
-                    width="100%"
-                  >
-                    {tabContent}
-                  </Section>
-                  {activeTab === 'log' && (
-                    <>
-                      <Stack justify="space-between">
-                        <Stack.Item width="25%">
-                          <Button
-                            width="100%"
-                            align="center"
-                            icon="arrow-left"
-                            disabled={page <= 0}
-                            onClick={() => {
-                              act('previousPage');
-                            }}
-                          />
-                        </Stack.Item>
-                        {!!pageCount && (
-                          <Stack.Item width="50%">
-                            <ProgressBar
-                              width="100%"
-                              value={page / (pageCount - 1)}
-                            >
-                              <Box width="100%" align="center">
-                                {`Page ${page + 1}/${pageCount}`}
-                              </Box>
-                            </ProgressBar>
-                          </Stack.Item>
-                        )}
-                        <Stack.Item width="25%">
-                          <Button
-                            width="100%"
-                            align="center"
-                            icon="arrow-right"
-                            disabled={page >= pageCount - 1}
-                            onClick={() => {
-                              act('nextPage');
-                            }}
-                          />
-                        </Stack.Item>
-                      </Stack>
-                      {showJumpToBottomButton && (
-                        <Button
-                          width="100%"
-                          onClick={() => {
-                            const sectionCurrent = this.sectionRef.current;
-                            sectionCurrent.scrollTop =
-                              sectionCurrent.scrollHeight;
-                          }}
-                        >
-                          Jump to Bottom
-                        </Button>
-                      )}
-                    </>
-                  )}
-                </Section>
-              </Stack.Item>
-            </Stack>
-          )}
-        </Window.Content>
-        {modal === 'states' && <StateSelectModal />}
-        {modal === 'viewChunk' && <ChunkViewModal />}
-        {modal === 'call' && <CallModal />}
-        {modal === 'documentation' && (
-          <Modal>
-            <Button
-              color="red"
-              icon="window-close"
-              onClick={() => {
-                setModal(null);
-              }}
-            >
-              Close
-            </Button>
-            <Section
-              height={`${window.innerHeight * 0.8}px`}
-              width={`${window.innerWidth * 0.5}px`}
-              fill
-              scrollable
-            >
-              <Box
-                dangerouslySetInnerHTML={{
-                  __html: marked(sanitizeText(documentation), {
-                    breaks: true,
-                    smartypants: true,
-                    smartLists: true,
-                    langPrefix: 'hljs language-',
-                    highlight: (code) => {
-                      return hljs.highlight(code, { language: 'lua' }).value;
-                    },
-                  }),
-                }}
-              />
-            </Section>
-          </Modal>
-        )}
-      </Window>
-    );
-  }
-}
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/index.tsx b/tgui/packages/tgui/interfaces/LuaEditor/index.tsx
new file mode 100644
index 0000000000000..7ed07f7bcfcf4
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LuaEditor/index.tsx
@@ -0,0 +1,410 @@
+import 'blob-polyfill';
+
+import hljs from 'highlight.js/lib/core';
+import lua from 'highlight.js/lib/languages/lua';
+import {
+  ReactNode,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from 'react';
+
+import { useBackend } from '../../backend';
+import {
+  Box,
+  Button,
+  Flex,
+  MenuBar,
+  ProgressBar,
+  Section,
+  Stack,
+  Tabs,
+  TextArea,
+} from '../../components';
+import { Window } from '../../layouts';
+import { CallModal } from './CallModal';
+import { ChunkViewModal } from './ChunkViewModal';
+import { ListMapper } from './ListMapper';
+import { Log } from './Log';
+import { StateSelectModal } from './StateSelectModal';
+import { TaskManager } from './TaskManager';
+import { CallInfo, LuaEditorData, LuaEditorModal } from './types';
+hljs.registerLanguage('lua', lua);
+
+export const LuaEditor = () => {
+  const { act, data } = useBackend<LuaEditorData>();
+  const {
+    noStateYet,
+    globals,
+    tasks,
+    showGlobalTable,
+    page,
+    pageCount,
+    lastError,
+  } = data;
+
+  const modalState = useState<LuaEditorModal>(
+    noStateYet ? 'states' : undefined,
+  );
+  const [modal, setModal] = modalState;
+  const [activeTab, setActiveTab] = useState<'tasks' | 'log' | 'globals'>(
+    'log',
+  );
+  const [showJumpToBottomButton, setShowJumpToBottomButton] =
+    useState<boolean>();
+  const [scriptInput, setScriptInput] = useState<string>('');
+  const [openMenuBar, setOpenMenuBar] = useState<string | null>(null);
+  const [openOnHover, setOpenOnHover] = useState<boolean>(false);
+
+  const [viewedChunk, setViewedChunk] = useState<string>();
+
+  const [toCall, setToCall] = useState<CallInfo>();
+
+  const sectionRef = useRef<HTMLDivElement>(null);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  useLayoutEffect(() => {
+    const { data } = useBackend<LuaEditorData>();
+    const { forceModal, forceViewChunk, forceInput } = data;
+    if (forceModal || forceViewChunk) {
+      setModal(forceModal);
+      setViewedChunk(forceViewChunk);
+    }
+    if (forceInput) {
+      setScriptInput(forceInput);
+    }
+  }, []);
+
+  const handleSectionScroll = useCallback(() => {
+    const scrollableCurrent = sectionRef.current;
+    if (scrollableCurrent) {
+      if (
+        !showJumpToBottomButton &&
+        scrollableCurrent.scrollHeight >
+          scrollableCurrent.scrollTop + scrollableCurrent.clientHeight
+      ) {
+        setShowJumpToBottomButton(true);
+      } else if (
+        showJumpToBottomButton &&
+        scrollableCurrent.scrollTop + scrollableCurrent.clientHeight >=
+          scrollableCurrent.scrollHeight
+      ) {
+        setShowJumpToBottomButton(false);
+      }
+    }
+  }, [sectionRef]);
+
+  useLayoutEffect(() => {
+    window.addEventListener('resize', handleSectionScroll);
+    return () => window.removeEventListener('resize', handleSectionScroll);
+  }, [handleSectionScroll]);
+
+  useEffect(() => {});
+
+  let tabContent: ReactNode;
+  switch (activeTab) {
+    case 'globals': {
+      if (!globals) {
+        tabContent = (
+          <h1>
+            Could not retrieve the global table. Was it corrupted or shadowed?
+          </h1>
+        );
+      } else {
+        const { values, variants } = globals;
+        tabContent = (
+          <ListMapper
+            list={values}
+            variants={variants}
+            skipNulls
+            vvAct={(path) => act('vvGlobal', { indices: path })}
+            callType="callFunction"
+            setToCall={setToCall}
+            setModal={setModal}
+          />
+        );
+      }
+      break;
+    }
+    case 'tasks': {
+      if (!tasks) {
+        tabContent = <h1>Could not retrieve task info.</h1>;
+      } else {
+        tabContent = <TaskManager setModal={setModal} setToCall={setToCall} />;
+      }
+      break;
+    }
+    case 'log': {
+      tabContent = <Log setViewedChunk={setViewedChunk} setModal={setModal} />;
+      break;
+    }
+  }
+
+  const menuBarProps = {
+    openMenuBar: openMenuBar,
+    setOpenMenuBar: setOpenMenuBar,
+    openOnHover: openOnHover,
+    setOpenOnHover: setOpenOnHover,
+  };
+
+  const closeMenuAndThen = (func?: () => void) => {
+    return () => {
+      setOpenMenuBar(null);
+      setOpenOnHover(false);
+      func?.();
+    };
+  };
+
+  return (
+    <Window width={1280} height={720}>
+      <Window.Content>
+        <input
+          type="file"
+          hidden
+          accept=".lua,.luau"
+          ref={fileInputRef}
+          onChange={async (event) => {
+            if (event.target.files?.length) {
+              setScriptInput(await event.target.files[0].text());
+              event.target.value = '';
+            }
+          }}
+        />
+        <MenuBar>
+          <MenuBar.Dropdown
+            entry="file"
+            openWidth="22rem"
+            display="File"
+            {...menuBarProps}
+          >
+            <MenuBar.Dropdown.MenuItem
+              displayText="States"
+              onClick={closeMenuAndThen(() => {
+                setModal('states');
+              })}
+            />
+            <MenuBar.Dropdown.MenuItem
+              displayText="Open"
+              onClick={closeMenuAndThen(() => fileInputRef.current?.click())}
+            />
+            <MenuBar.Dropdown.MenuItem
+              displayText="Upload and Run"
+              onClick={closeMenuAndThen(() => act('runCodeFile'))}
+            />
+          </MenuBar.Dropdown>
+        </MenuBar>
+        {noStateYet ? (
+          <Flex
+            width="100%"
+            height="100%"
+            align="center"
+            justify="space-around"
+          >
+            <h1>Please select or create a lua state to get started.</h1>
+          </Flex>
+        ) : (
+          <Stack height="calc(100% - 16px)">
+            <Stack.Item grow shrink basis="55%">
+              <Stack fill vertical>
+                <Stack.Item shrink basis="100%">
+                  <Section fill pb="16px">
+                    <TextArea
+                      fluid
+                      width="100%"
+                      height="100%"
+                      value={scriptInput}
+                      fontFamily="Consolas"
+                      onChange={(_, value) => setScriptInput(value)}
+                      /* displayedValue={
+                          <Box
+                            style={{
+                              pointerEvents: 'none',
+                            }}
+                            dangerouslySetInnerHTML={{
+                              __html: hljs.highlight(scriptInput, {
+                                language: 'lua',
+                              }).value,
+                            }}
+                          />
+                        }*/
+                      onDrop={async (
+                        event: React.DragEvent<HTMLDivElement>,
+                      ) => {
+                        if (event.dataTransfer?.files.length) {
+                          event.preventDefault();
+                          setScriptInput(
+                            await event.dataTransfer.files[0].text(),
+                          );
+                        }
+                      }}
+                    />
+                    <Button
+                      onClick={() => act('runCode', { code: scriptInput })}
+                    >
+                      Run
+                    </Button>
+                  </Section>
+                </Stack.Item>
+                <Stack.Item grow>
+                  <Box bold textColor="red" mb="1rem">
+                    {lastError}
+                  </Box>
+                </Stack.Item>
+              </Stack>
+            </Stack.Item>
+            <Stack.Item grow shrink basis="45%">
+              <Section fill pb="24px" height="100%" width="100%">
+                <Stack justify="space-between">
+                  <Stack.Item>
+                    <Tabs>
+                      {!!showGlobalTable && (
+                        <Tabs.Tab
+                          selected={activeTab === 'globals'}
+                          onClick={() => {
+                            setActiveTab('globals');
+                          }}
+                        >
+                          Globals
+                        </Tabs.Tab>
+                      )}
+                      <Tabs.Tab
+                        selected={activeTab === 'tasks'}
+                        onClick={() => setActiveTab('tasks')}
+                      >
+                        Tasks
+                      </Tabs.Tab>
+                      <Tabs.Tab
+                        selected={activeTab === 'log'}
+                        onClick={() => {
+                          setActiveTab('log');
+                          setTimeout(handleSectionScroll, 0);
+                        }}
+                      >
+                        Log
+                      </Tabs.Tab>
+                    </Tabs>
+                  </Stack.Item>
+                  <Stack.Item>
+                    <Button.Checkbox
+                      inline
+                      checked={showGlobalTable}
+                      tooltip="WARNING: Displaying the global table can cause significant lag for the entire server, especially when there is a large number of global variables."
+                      onClick={() => {
+                        if (showGlobalTable && activeTab === 'globals') {
+                          setActiveTab('tasks');
+                        }
+                        act('toggleShowGlobalTable');
+                      }}
+                    >
+                      Show Global Table
+                    </Button.Checkbox>
+                  </Stack.Item>
+                </Stack>
+                <Stack fill vertical>
+                  <Stack.Item grow>
+                    <Box position="relative" width="100%" height="100%">
+                      <Section
+                        title={<Box height="1rem" width="1rem" />}
+                        ref={sectionRef}
+                        fill
+                        scrollable
+                        scrollableHorizontal
+                        onScroll={handleSectionScroll}
+                        buttons={
+                          activeTab === 'log' && (
+                            <Button.Confirm
+                              bottom="1.25rem"
+                              color="red"
+                              tooltip="Delete All Logs"
+                              icon="trash-alt"
+                              confirmIcon="trash-alt"
+                              confirmContent={null}
+                              onClick={() => act('nukeLog')}
+                            />
+                          )
+                        }
+                        width="100%"
+                      >
+                        {tabContent}
+                      </Section>
+                      {activeTab === 'log' && showJumpToBottomButton && (
+                        <Stack fill justify="space-around" bottom="2rem">
+                          <Stack.Item>
+                            <Button
+                              position="absolute"
+                              icon="arrow-down"
+                              onClick={() => {
+                                const sectionCurrent = sectionRef.current;
+                                if (sectionCurrent) {
+                                  sectionCurrent.scrollTop =
+                                    sectionCurrent.scrollHeight;
+                                }
+                              }}
+                            >
+                              Jump to Bottom
+                            </Button>
+                          </Stack.Item>
+                        </Stack>
+                      )}
+                    </Box>
+                  </Stack.Item>
+                  {activeTab === 'log' && pageCount > 1 && (
+                    <Stack.Item>
+                      <Stack justify="space-between">
+                        <Stack.Item width="25%">
+                          <Button
+                            width="100%"
+                            align="center"
+                            icon="arrow-left"
+                            disabled={page <= 0}
+                            onClick={() => {
+                              act('previousPage');
+                            }}
+                          />
+                        </Stack.Item>
+                        <Stack.Item width="50%">
+                          <ProgressBar
+                            width="100%"
+                            value={page / (pageCount - 1)}
+                          >
+                            <Box width="100%" align="center">
+                              {`Page ${page + 1}/${pageCount}`}
+                            </Box>
+                          </ProgressBar>
+                        </Stack.Item>
+                        <Stack.Item width="25%">
+                          <Button
+                            width="100%"
+                            align="center"
+                            icon="arrow-right"
+                            disabled={page >= pageCount - 1}
+                            onClick={() => {
+                              act('nextPage');
+                            }}
+                          />
+                        </Stack.Item>
+                      </Stack>
+                    </Stack.Item>
+                  )}
+                </Stack>
+              </Section>
+            </Stack.Item>
+          </Stack>
+        )}
+      </Window.Content>
+      {modal === 'states' && <StateSelectModal setModal={setModal} />}
+      {modal === 'viewChunk' && (
+        <ChunkViewModal
+          viewedChunk={viewedChunk ?? ''}
+          setViewedChunk={setViewedChunk}
+          setModal={setModal}
+        />
+      )}
+      {modal === 'call' && toCall && (
+        <CallModal toCall={toCall} setToCall={setToCall} setModal={setModal} />
+      )}
+    </Window>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/LuaEditor/types.ts b/tgui/packages/tgui/interfaces/LuaEditor/types.ts
new file mode 100644
index 0000000000000..4dfeb5b05391f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LuaEditor/types.ts
@@ -0,0 +1,96 @@
+export type LuaEditorModal = 'states' | 'viewChunk' | 'call' | undefined;
+
+export type ListElement = { key: any; value: any };
+export type ListPath = { index: number; type: 'key' | 'value' | 'entry' }[];
+
+export type VariantList = ({
+  key: Variant | null;
+  value?: Variant | null;
+} | null)[];
+type ParameterizedVariant =
+  | ['list', VariantList]
+  | ['cycle', [number, 'key' | 'value'][]]
+  | ['ref', string];
+
+export type Variant =
+  | 'error'
+  | 'function'
+  | 'thread'
+  | 'userdata'
+  | 'error_as_value'
+  | ParameterizedVariant
+  | null;
+
+type LuaGlobals = {
+  values: ListElement[];
+  variants: VariantList;
+};
+
+type Task = { index: number; name: string };
+
+type LuaTasks = {
+  sleeps: Task[];
+  yields: Task[];
+};
+
+export type CallInfo = {
+  type: 'callFunction' | 'resumeTask';
+  params: Partial<{ index: number; indices: number[] }>;
+};
+
+type HasName = { name: string };
+type HasReturnValues = {
+  return_values: ListElement[];
+  variants: VariantList;
+};
+type HasMessage = { message: string };
+type FinishedLog = HasName & {
+  status: 'finished';
+} & HasReturnValues;
+type SleepLog = HasName & {
+  status: 'sleep';
+};
+type YieldLog = HasName & {
+  status: 'yield';
+} & HasReturnValues;
+type PrintLog = {
+  status: 'print';
+} & HasMessage;
+type ErrorLog = HasName & {
+  status: 'error';
+} & HasMessage;
+type PanicLog = HasName & {
+  status: 'panic';
+} & HasMessage;
+type RuntimeLog = {
+  status: 'runtime';
+  line: number;
+  file: string;
+  stack: string[];
+} & HasMessage;
+
+export type LogEntry = (
+  | FinishedLog
+  | SleepLog
+  | YieldLog
+  | PrintLog
+  | ErrorLog
+  | PanicLog
+  | RuntimeLog
+) & { chunk?: string; repeats: number };
+
+export type LuaEditorData = {
+  forceModal: LuaEditorModal;
+  forceViewChunk?: string;
+  forceInput?: string;
+  noStateYet: boolean;
+  states: string[];
+  page: number;
+  pageCount: number;
+  lastError?: string;
+  showGlobalTable: boolean;
+  globals: LuaGlobals;
+  tasks: LuaTasks;
+  stateLog: LogEntry[];
+  callArguments: ListElement[];
+};
diff --git a/tgui/packages/tgui/interfaces/MODsuit.tsx b/tgui/packages/tgui/interfaces/MODsuit.tsx
index 2b7070e3ba50b..11d1e294824aa 100644
--- a/tgui/packages/tgui/interfaces/MODsuit.tsx
+++ b/tgui/packages/tgui/interfaces/MODsuit.tsx
@@ -19,7 +19,7 @@ import {
   Stack,
   Table,
 } from '../components';
-import { formatEnergy, formatPower, formatSiUnit } from '../format';
+import { formatSiUnit } from '../format';
 import { Window } from '../layouts';
 
 type MODsuitData = {
@@ -122,8 +122,8 @@ export const MODsuit = (props) => {
   const { interface_break } = data.suit_status;
   return (
     <Window
-      width={800}
-      height={640}
+      width={600}
+      height={600}
       theme={ui_theme}
       title="MOD Interface Panel"
     >
@@ -706,7 +706,7 @@ const ModuleSection = (props) => {
               <Button
                 color="transparent"
                 icon="plug"
-                tooltip="Idle Power Cost"
+                tooltip="Idle Power Cost (Watts)"
                 tooltipPosition="top"
               />
             </Table.Cell>
@@ -714,7 +714,7 @@ const ModuleSection = (props) => {
               <Button
                 color="transparent"
                 icon="lightbulb"
-                tooltip="Active Power Cost"
+                tooltip="Active Power Cost (Watts)"
                 tooltipPosition="top"
               />
             </Table.Cell>
@@ -722,7 +722,7 @@ const ModuleSection = (props) => {
               <Button
                 color="transparent"
                 icon="bolt"
-                tooltip="Use Energy Cost"
+                tooltip="Use Energy Cost (Joules)"
                 tooltipPosition="top"
               />
             </Table.Cell>
@@ -794,44 +794,16 @@ const ModuleSection = (props) => {
                   )}
                 </Table.Cell>
                 <Table.Cell textAlign="center">
-                  <div
-                    style={{
-                      display: 'inline-block',
-                      width: '60px',
-                    }}
-                  >
-                    {formatPower(module.idle_power)}
-                  </div>
+                  {formatSiUnit(module.idle_power, 0)}
                 </Table.Cell>
                 <Table.Cell textAlign="center">
-                  <div
-                    style={{
-                      display: 'inline-block',
-                      width: '60px',
-                    }}
-                  >
-                    {formatPower(module.active_power)}
-                  </div>
+                  {formatSiUnit(module.active_power, 0)}
                 </Table.Cell>
                 <Table.Cell textAlign="center">
-                  <div
-                    style={{
-                      display: 'inline-block',
-                      width: '60px',
-                    }}
-                  >
-                    {formatEnergy(module.use_energy)}
-                  </div>
+                  {formatSiUnit(module.use_energy, 0)}
                 </Table.Cell>
                 <Table.Cell textAlign="center">
-                  <div
-                    style={{
-                      display: 'inline-block',
-                      width: '10px',
-                    }}
-                  >
-                    {module.module_complexity}
-                  </div>
+                  {module.module_complexity}
                 </Table.Cell>
               </Table.Row>
             );
diff --git a/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx b/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
index 5d20abc59ce00..019d0d979dbc1 100644
--- a/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
+++ b/tgui/packages/tgui/interfaces/MedicalRecords/RecordTabs.tsx
@@ -12,6 +12,7 @@ import {
   Tabs,
 } from 'tgui/components';
 
+import { ReverseJobsRu } from '../../bandastation/ru_jobs'; // BANDASTATION EDIT
 import { JOB2ICON } from '../common/JobToIcon';
 import { isRecordMatch } from '../SecurityRecords/helpers';
 import { MedicalRecord, MedicalRecordData } from './types';
@@ -108,7 +109,7 @@ const CrewTab = (props: { record: MedicalRecord }) => {
       selected={selectedRecord?.crew_ref === crew_ref}
     >
       <Box>
-        <Icon name={JOB2ICON[trim] || 'question'} /> {name}
+        <Icon name={JOB2ICON[ReverseJobsRu(trim)] || 'question'} /> {name}
       </Box>
     </Tabs.Tab>
   );
diff --git a/tgui/packages/tgui/interfaces/Mule.jsx b/tgui/packages/tgui/interfaces/Mule.jsx
deleted file mode 100644
index 1b289be2743fb..0000000000000
--- a/tgui/packages/tgui/interfaces/Mule.jsx
+++ /dev/null
@@ -1,173 +0,0 @@
-import { useBackend } from '../backend';
-import {
-  Button,
-  Dropdown,
-  Flex,
-  LabeledList,
-  ProgressBar,
-  Section,
-} from '../components';
-import { Window } from '../layouts';
-import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
-
-export const Mule = (props) => {
-  const { act, data } = useBackend();
-  const {
-    on,
-    cell,
-    cellPercent,
-    load,
-    mode,
-    modeStatus,
-    autoReturn,
-    autoPickup,
-    reportDelivery,
-    destination,
-    home,
-    id,
-    allow_possession,
-    possession_enabled,
-    pai_inserted,
-    destinations = [],
-  } = data;
-  const locked = data.locked && !data.siliconUser;
-  return (
-    <Window width={350} height={445}>
-      <Window.Content>
-        <InterfaceLockNoticeBox />
-        <Section
-          title="Status"
-          minHeight="110px"
-          buttons={
-            <>
-              <Button
-                icon="fa-poll-h"
-                content="Rename"
-                onClick={() => act('rename')}
-              />
-              {!locked && (
-                <Button
-                  icon={on ? 'power-off' : 'times'}
-                  content={on ? 'On' : 'Off'}
-                  selected={on}
-                  onClick={() => act('on')}
-                />
-              )}
-            </>
-          }
-        >
-          <ProgressBar
-            value={cell ? cellPercent / 100 : 0}
-            color={cell ? 'good' : 'bad'}
-          />
-          <Flex mt={1}>
-            <Flex.Item grow={1} basis={0}>
-              <LabeledList>
-                <LabeledList.Item label="Mode" color={modeStatus}>
-                  {mode}
-                </LabeledList.Item>
-              </LabeledList>
-            </Flex.Item>
-            <Flex.Item grow={1} basis={0}>
-              <LabeledList>
-                <LabeledList.Item
-                  label="Load"
-                  color={load ? 'good' : 'average'}
-                >
-                  {load || 'None'}
-                </LabeledList.Item>
-              </LabeledList>
-            </Flex.Item>
-          </Flex>
-        </Section>
-        {!locked && (
-          <Section
-            title="Controls"
-            buttons={
-              <>
-                {!!load && (
-                  <Button
-                    icon="eject"
-                    content="Unload"
-                    onClick={() => act('unload')}
-                  />
-                )}
-                {!!pai_inserted && (
-                  <Button
-                    icon="eject"
-                    content="Eject PAI"
-                    onClick={() => act('eject_pai')}
-                  />
-                )}
-              </>
-            }
-          >
-            <LabeledList>
-              <LabeledList.Item label="ID">
-                <Button content={id} onClick={() => act('setid')} />
-              </LabeledList.Item>
-              <LabeledList.Item label="Home">
-                <Button content={home} onClick={() => act('sethome')} />
-              </LabeledList.Item>
-              <LabeledList.Item label="Destination">
-                <Dropdown
-                  over
-                  selected={destination || 'None'}
-                  options={destinations}
-                  width="188px"
-                  onSelected={(value) => act('destination', { value })}
-                />
-              </LabeledList.Item>
-              <LabeledList.Item label="Actions">
-                <Button
-                  icon="stop"
-                  color="bad"
-                  content="Stop"
-                  onClick={() => act('stop')}
-                />
-                <Button
-                  icon="play"
-                  color="average"
-                  content="Go"
-                  onClick={() => act('go')}
-                />
-                <Button
-                  icon="home"
-                  content="Go Home"
-                  onClick={() => act('home')}
-                />
-              </LabeledList.Item>
-              <LabeledList.Item label="Settings">
-                <Button.Checkbox
-                  checked={autoReturn}
-                  content="Auto-Return"
-                  onClick={() => act('autored')}
-                />
-                <br />
-                <Button.Checkbox
-                  checked={autoPickup}
-                  content="Auto-Pickup"
-                  onClick={() => act('autopick')}
-                />
-                <br />
-                <Button.Checkbox
-                  checked={reportDelivery}
-                  content="Report Delivery"
-                  onClick={() => act('report')}
-                />
-                <br />
-                {allow_possession && (
-                  <Button.Checkbox
-                    checked={possession_enabled}
-                    content="Download Personality"
-                    onClick={() => act('toggle_personality')}
-                  />
-                )}
-              </LabeledList.Item>
-            </LabeledList>
-          </Section>
-        )}
-      </Window.Content>
-    </Window>
-  );
-};
diff --git a/tgui/packages/tgui/interfaces/Mule.tsx b/tgui/packages/tgui/interfaces/Mule.tsx
new file mode 100644
index 0000000000000..91c1dfffedb97
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Mule.tsx
@@ -0,0 +1,208 @@
+import { BooleanLike } from 'common/react';
+
+import { useBackend } from '../backend';
+import {
+  Button,
+  Dropdown,
+  LabeledList,
+  ProgressBar,
+  Section,
+  Stack,
+} from '../components';
+import { Window } from '../layouts';
+import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
+
+type Data = {
+  powerStatus: BooleanLike;
+  cellPercent: number | null;
+  load: BooleanLike;
+  locked: BooleanLike;
+  siliconUser: BooleanLike;
+  mode: string;
+  modeStatus: string;
+  autoReturn: BooleanLike;
+  autoPickup: BooleanLike;
+  reportDelivery: BooleanLike;
+  destination: string | null;
+  destinationsList: string[];
+  homeDestination: string | null;
+  botId: string;
+  allowPossession: BooleanLike;
+  possessionEnabled: BooleanLike;
+  paiInserted: BooleanLike;
+};
+
+const MuleControls = (props) => {
+  const { act, data } = useBackend<Data>();
+  const {
+    load,
+    autoReturn,
+    autoPickup,
+    reportDelivery,
+    destination,
+    homeDestination,
+    botId,
+    allowPossession,
+    possessionEnabled,
+    paiInserted,
+    destinationsList = [],
+  } = data;
+
+  return (
+    <>
+      <Section
+        title="Controls"
+        buttons={
+          <>
+            {!!load && (
+              <Button icon="eject" onClick={() => act('unload')}>
+                Unload
+              </Button>
+            )}
+            {!!paiInserted && (
+              <Button icon="eject" onClick={() => act('eject_pai')}>
+                Eject PAI
+              </Button>
+            )}
+          </>
+        }
+      >
+        <LabeledList>
+          <LabeledList.Item label="ID">
+            <Button onClick={() => act('setid')}>{botId}</Button>
+          </LabeledList.Item>
+          <LabeledList.Item label="Home">
+            <Button onClick={() => act('sethome')}>{homeDestination}</Button>
+          </LabeledList.Item>
+          <LabeledList.Item label="Destination">
+            <Dropdown
+              over
+              selected={destination || 'None'}
+              options={destinationsList}
+              width="188px"
+              onSelected={(value) => act('destination', { value })}
+            />
+          </LabeledList.Item>
+        </LabeledList>
+      </Section>
+      <Section title="Settings">
+        <Button.Checkbox checked={autoReturn} onClick={() => act('autored')}>
+          Auto-Return
+        </Button.Checkbox>
+        <br />
+        <Button.Checkbox checked={autoPickup} onClick={() => act('autopick')}>
+          Auto-Pickup
+        </Button.Checkbox>
+        <br />
+        <Button.Checkbox checked={reportDelivery} onClick={() => act('report')}>
+          Report-Delivery
+        </Button.Checkbox>
+        <br />
+        {!!allowPossession && (
+          <Button.Checkbox
+            checked={possessionEnabled}
+            onClick={() => act('toggle_personality')}
+          >
+            Download Personality
+          </Button.Checkbox>
+        )}
+      </Section>
+      <Section title="Actions">
+        <Stack style={{ padding: '0px 30px' }}>
+          <Stack.Item grow>
+            <Button
+              width="60px"
+              icon="stop"
+              color="bad"
+              onClick={() => act('stop')}
+            >
+              Stop
+            </Button>
+          </Stack.Item>
+          <Stack.Item grow>
+            <Button
+              width="60px"
+              icon="play"
+              color="average"
+              onClick={() => act('go')}
+            >
+              Go
+            </Button>
+          </Stack.Item>
+          <Stack.Item>
+            <Button width="60px" icon="home" onClick={() => act('home')}>
+              Home
+            </Button>
+          </Stack.Item>
+        </Stack>
+      </Section>
+    </>
+  );
+};
+
+export const Mule = (props) => {
+  const { act, data } = useBackend<Data>();
+  const {
+    powerStatus,
+    cellPercent,
+    load,
+    mode,
+    modeStatus,
+    locked,
+    siliconUser,
+  } = data;
+
+  const mulebotLocked = locked && !siliconUser;
+
+  return (
+    <Window width={350} height={500}>
+      <Window.Content>
+        <InterfaceLockNoticeBox />
+        <Section
+          title="Status"
+          buttons={
+            <>
+              <Button icon="fa-poll-h" onClick={() => act('rename')}>
+                Rename
+              </Button>
+              {!mulebotLocked && (
+                <Button
+                  icon={powerStatus ? 'power-off' : 'times'}
+                  selected={powerStatus}
+                  onClick={() => act('on')}
+                >
+                  {powerStatus ? 'On' : 'Off'}
+                </Button>
+              )}
+            </>
+          }
+        >
+          <ProgressBar
+            value={cellPercent ? cellPercent / 100 : 0}
+            color={cellPercent ? 'good' : 'bad'}
+          />
+          <Stack mt={1}>
+            <Stack.Item grow>
+              <LabeledList>
+                <LabeledList.Item label="Mode" color={modeStatus}>
+                  {mode}
+                </LabeledList.Item>
+              </LabeledList>
+            </Stack.Item>
+            <Stack.Item grow ml="40%">
+              <LabeledList>
+                <LabeledList.Item
+                  label="Load"
+                  color={load ? 'good' : 'average'}
+                >
+                  {load || 'None'}
+                </LabeledList.Item>
+              </LabeledList>
+            </Stack.Item>
+          </Stack>
+        </Section>
+        {!mulebotLocked && <MuleControls />}
+      </Window.Content>
+    </Window>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/Newscaster.jsx b/tgui/packages/tgui/interfaces/Newscaster.jsx
index fc91fc9c89d46..e97ac50a44628 100644
--- a/tgui/packages/tgui/interfaces/Newscaster.jsx
+++ b/tgui/packages/tgui/interfaces/Newscaster.jsx
@@ -430,7 +430,7 @@ const NewscasterChannelBox = (props) => {
             {!!admin_mode && (
               <Button
                 icon="ban"
-                tooltip="Censor the whole channel and it's \
+                tooltip="Censor the whole channel and its \
                   contents as dangerous to the station. Cannot be undone."
                 disabled={!admin_mode || !viewing_channel}
                 onClick={() =>
diff --git a/tgui/packages/tgui/interfaces/OperatingComputer.jsx b/tgui/packages/tgui/interfaces/OperatingComputer.jsx
index 990fddcadd96e..8a87840e89a02 100644
--- a/tgui/packages/tgui/interfaces/OperatingComputer.jsx
+++ b/tgui/packages/tgui/interfaces/OperatingComputer.jsx
@@ -103,28 +103,24 @@ const PatientStateView = (props) => {
           <LabeledList>
             <LabeledList.Item label="Next Step">
               {procedure.next_step}
-              {procedure.chems_needed && (
-                <>
-                  <br />
-                  <br />
-                  <b>Required Chemicals:</b>
-                  <br />
-                  {procedure.chems_needed}
-                </>
-              )}
             </LabeledList.Item>
+            {procedure.chems_needed && (
+              <LabeledList.Item label="Required Chems">
+                <NoticeBox success={procedure.chems_present ? true : false}>
+                  {procedure.chems_needed}
+                </NoticeBox>
+              </LabeledList.Item>
+            )}
             {procedure.alternative_step && (
               <LabeledList.Item label="Alternative Step">
                 {procedure.alternative_step}
-                {procedure.alt_chems_needed && (
-                  <>
-                    <br />
-                    <br />
-                    <b>Required Chemicals:</b>
-                    <br />
-                    {procedure.alt_chems_needed}
-                  </>
-                )}
+              </LabeledList.Item>
+            )}
+            {procedure.alt_chems_needed && (
+              <LabeledList.Item label="Required Chems">
+                <NoticeBox success={procedure.alt_chems_present ? true : false}>
+                  {procedure.alt_chems_needed}
+                </NoticeBox>
               </LabeledList.Item>
             )}
           </LabeledList>
diff --git a/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx b/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
index 2d584bfc6b13d..ef41f992e13b0 100644
--- a/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
@@ -1,9 +1,11 @@
+import { ReverseJobsRu } from '../../bandastation/ru_jobs'; // BANDASTATION EDIT
 import { DmIcon, Icon } from '../../components';
 import { JOB2ICON } from '../common/JobToIcon';
 import { Antagonist, Observable } from './types';
 
 type Props = {
   item: Observable | Antagonist;
+  realNameDisplay: boolean;
 };
 
 type IconSettings = {
@@ -22,7 +24,7 @@ const antagIcon: IconSettings = {
 };
 
 export function JobIcon(props: Props) {
-  const { item } = props;
+  const { item, realNameDisplay } = props;
 
   let iconSettings: IconSettings;
   if ('antag' in item) {
@@ -32,16 +34,23 @@ export function JobIcon(props: Props) {
   }
 
   // We don't need to cast here but typescript isn't smart enough to know that
-  const { icon = '', job = '' } = item;
+  const { icon = '', job = '', mind_icon = '', mind_job = '' } = item;
+  const usedIcon = realNameDisplay ? mind_icon || icon : icon;
+  const usedJob = realNameDisplay ? mind_job || job : job;
 
   return (
     <div className="JobIcon">
       {icon === 'borg' ? (
-        <Icon color="lightblue" name={JOB2ICON[job]} ml={0.3} mt={0.4} />
+        <Icon
+          color="lightblue"
+          name={JOB2ICON[ReverseJobsRu(usedJob)]}
+          ml={0.3}
+          mt={0.4}
+        />
       ) : (
         <DmIcon
           icon={iconSettings.dmi}
-          icon_state={icon}
+          icon_state={usedIcon}
           style={{
             transform: iconSettings.transform,
           }}
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitBlade.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitBlade.tsx
index 07c5a1c08f6c7..a10e5f320e5a5 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitBlade.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitBlade.tsx
@@ -21,7 +21,8 @@ export function OrbitBlade(props) {
   const { data } = useBackend<OrbitData>();
   const { orbiting } = data;
 
-  const { setBladeOpen } = useContext(OrbitContext);
+  const { setBladeOpen, realNameDisplay, setRealNameDisplay } =
+    useContext(OrbitContext);
 
   return (
     <Stack vertical width="244px">
@@ -44,6 +45,24 @@ export function OrbitBlade(props) {
       <Stack.Item>
         <ViewModeSelector />
       </Stack.Item>
+      <Stack.Item>
+        <Section
+          buttons={
+            <Button
+              color="transparent"
+              icon="passport"
+              selected={realNameDisplay}
+              onClick={() => setRealNameDisplay(!realNameDisplay)}
+            />
+          }
+          color="label"
+          title="Real Name Display"
+        >
+          Real Name mode will display actual character names and their
+          roundstart jobs insteas of being based on their worn ID. If the person
+          lacks a roundstart job, it will still display their ID job icon.
+        </Section>
+      </Stack.Item>
       {!!orbiting && (
         <Stack.Item>
           <OrbitInfo />
@@ -115,7 +134,7 @@ function OrbitInfo(props) {
           <Stack.Item>
             <Stack>
               <Stack.Item>
-                <JobIcon item={orbiting} />
+                <JobIcon item={orbiting} realNameDisplay={false} />
               </Stack.Item>
               <Stack.Item color="label" grow>
                 {job}
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitCollapsible.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitCollapsible.tsx
index fa5e78bd1f725..bc436d46204df 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitCollapsible.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitCollapsible.tsx
@@ -25,7 +25,8 @@ type Props = {
 export function OrbitCollapsible(props: Props) {
   const { color, section = [], title } = props;
 
-  const { autoObserve, searchQuery, viewMode } = useContext(OrbitContext);
+  const { autoObserve, realNameDisplay, searchQuery, viewMode } =
+    useContext(OrbitContext);
 
   const filteredSection = section.filter((observable) =>
     isJobOrNameMatch(observable, searchQuery),
@@ -53,6 +54,7 @@ export function OrbitCollapsible(props: Props) {
           const content = (
             <OrbitItem
               autoObserve={autoObserve}
+              realNameDisplay={realNameDisplay}
               color={color}
               item={item}
               key={item.ref}
@@ -66,7 +68,7 @@ export function OrbitCollapsible(props: Props) {
 
           return (
             <Tooltip
-              content={<OrbitTooltip item={item} />}
+              content={<OrbitTooltip item={item} realNameDisplay={false} />}
               key={item.ref}
               position="bottom-start"
             >
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx
index 992904988ece4..b2490c0b3c4c1 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitItem.tsx
@@ -9,13 +9,14 @@ import { Antagonist, Observable, OrbitData, ViewMode } from './types';
 type Props = {
   item: Observable | Antagonist;
   autoObserve: boolean;
+  realNameDisplay: boolean;
   viewMode: ViewMode;
   color: string | undefined;
 };
 
 /** Each button on the observable section */
 export function OrbitItem(props: Props) {
-  const { item, autoObserve, viewMode, color } = props;
+  const { item, autoObserve, realNameDisplay, viewMode, color } = props;
   const { full_name, icon, job, name, orbiters, ref } = item;
 
   const { act, data } = useBackend<OrbitData>();
@@ -33,7 +34,7 @@ export function OrbitItem(props: Props) {
         display: 'flex',
       }}
     >
-      {validIcon && <JobIcon item={item} />}
+      {validIcon && <JobIcon item={item} realNameDisplay={realNameDisplay} />}
 
       <Button
         color={getDisplayColor(item, viewMode, color)}
@@ -41,7 +42,9 @@ export function OrbitItem(props: Props) {
       >
         <Stack>
           <Stack.Item>
-            {capitalizeFirst(getDisplayName(full_name, name))}
+            {realNameDisplay
+              ? capitalizeFirst(name || full_name)
+              : capitalizeFirst(getDisplayName(full_name, name))}
           </Stack.Item>
           {!!orbiters && (
             <Stack.Item>
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
index c83512c39c731..10f76f063decf 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitSearchBar.tsx
@@ -12,10 +12,12 @@ export function OrbitSearchBar(props) {
   const {
     autoObserve,
     bladeOpen,
+    realNameDisplay,
     searchQuery,
     viewMode,
     setAutoObserve,
     setBladeOpen,
+    setRealNameDisplay,
     setSearchQuery,
     setViewMode,
   } = useContext(OrbitContext);
@@ -103,6 +105,17 @@ export function OrbitSearchBar(props) {
             tooltipPosition="bottom-start"
           />
         </Stack.Item>
+        <Stack.Item>
+          <Button
+            color="transparent"
+            icon="passport"
+            onClick={() => setRealNameDisplay(!realNameDisplay)}
+            selected={realNameDisplay}
+            tooltip="Toggle real name display. When active, you'll see real
+            names instead of disguises in orbit menu."
+            tooltipPosition="bottom-start"
+          />
+        </Stack.Item>
         <Stack.Item>
           <Button
             color="transparent"
diff --git a/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx b/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
index 6c06838be4f16..d70a3a4060a7e 100644
--- a/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/OrbitTooltip.tsx
@@ -3,12 +3,13 @@ import { Antagonist, Observable } from './types';
 
 type Props = {
   item: Observable | Antagonist;
+  realNameDisplay: boolean;
 };
 
 /** Displays some info on the mob as a tooltip. */
 export function OrbitTooltip(props: Props) {
-  const { item } = props;
-  const { extra, full_name, health, job } = item;
+  const { item, realNameDisplay } = props;
+  const { extra, full_name, health, job, mind_job } = item;
 
   let antag;
   if ('antag' in item) {
@@ -18,6 +19,7 @@ export function OrbitTooltip(props: Props) {
   const extraInfo = extra?.split(':');
   const displayHealth = !!health && health >= 0 ? `${health}%` : 'Critical';
   const showAFK = 'client' in item && !item.client;
+  const displayJob = realNameDisplay ? mind_job : job;
 
   return (
     <>
@@ -34,8 +36,8 @@ export function OrbitTooltip(props: Props) {
             {!!full_name && (
               <LabeledList.Item label="Real ID">{full_name}</LabeledList.Item>
             )}
-            {!!job && !antag && (
-              <LabeledList.Item label="Job">{job}</LabeledList.Item>
+            {!!displayJob && !antag && (
+              <LabeledList.Item label="Job">{displayJob}</LabeledList.Item>
             )}
             {!!antag && (
               <LabeledList.Item label="Threat">{antag}</LabeledList.Item>
diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
index f9a03174a8718..3c0941e74b847 100644
--- a/tgui/packages/tgui/interfaces/Orbit/helpers.ts
+++ b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
@@ -127,10 +127,11 @@ export function isJobOrNameMatch(
 ): boolean {
   if (!searchQuery) return true;
 
-  const { full_name, job } = observable;
+  const { full_name, job, name } = observable;
 
   return (
     full_name?.toLowerCase().includes(searchQuery?.toLowerCase()) ||
+    name?.toLowerCase().includes(searchQuery?.toLowerCase()) ||
     job?.toLowerCase().includes(searchQuery?.toLowerCase()) ||
     false
   );
diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx
index d537548107cba..5916f47fe74ad 100644
--- a/tgui/packages/tgui/interfaces/Orbit/index.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx
@@ -11,6 +11,7 @@ import { ViewMode } from './types';
 export function Orbit(props) {
   const [autoObserve, setAutoObserve] = useState(false);
   const [bladeOpen, setBladeOpen] = useState(false);
+  const [realNameDisplay, setRealNameDisplay] = useState(false);
   const [searchQuery, setSearchQuery] = useState('');
   const [viewMode, setViewMode] = useState<ViewMode>(VIEWMODE.Health);
 
@@ -23,6 +24,8 @@ export function Orbit(props) {
         setAutoObserve,
         bladeOpen,
         setBladeOpen,
+        realNameDisplay,
+        setRealNameDisplay,
         searchQuery,
         setSearchQuery,
         viewMode,
@@ -59,6 +62,8 @@ type Context = {
   setAutoObserve: Dispatch<SetStateAction<boolean>>;
   bladeOpen: boolean;
   setBladeOpen: Dispatch<SetStateAction<boolean>>;
+  realNameDisplay: boolean;
+  setRealNameDisplay: Dispatch<SetStateAction<boolean>>;
   searchQuery: string;
   setSearchQuery: Dispatch<SetStateAction<string>>;
   viewMode: ViewMode;
diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts
index ffeea321a3c81..965ab596c9835 100644
--- a/tgui/packages/tgui/interfaces/Orbit/types.ts
+++ b/tgui/packages/tgui/interfaces/Orbit/types.ts
@@ -27,7 +27,9 @@ export type Observable = {
   extra: string;
   health: number;
   icon: string;
+  mind_icon: string;
   job: string;
+  mind_job: string;
   name: string;
   orbiters: number;
 }>;
diff --git a/tgui/packages/tgui/interfaces/Photocopier.jsx b/tgui/packages/tgui/interfaces/Photocopier.jsx
deleted file mode 100644
index e1b8b74bb0a16..0000000000000
--- a/tgui/packages/tgui/interfaces/Photocopier.jsx
+++ /dev/null
@@ -1,238 +0,0 @@
-import { sortBy } from 'common/collections';
-
-import { useBackend } from '../backend';
-import {
-  Box,
-  Button,
-  Dropdown,
-  Flex,
-  NumberInput,
-  ProgressBar,
-  Section,
-} from '../components';
-import { Window } from '../layouts';
-
-export const Photocopier = (props) => {
-  const { data } = useBackend();
-  const {
-    isAI,
-    has_toner,
-    has_item,
-    categories = [],
-    paper_count,
-    copies_left,
-  } = data;
-
-  return (
-    <Window title="Photocopier" width={320} height={512}>
-      <Window.Content>
-        {has_toner ? (
-          <Toner />
-        ) : (
-          <Section title="Toner">
-            <Box color="average">No inserted toner cartridge.</Box>
-          </Section>
-        )}
-        <Section title="Paper">
-          <Box color="label">Paper stored: {paper_count}</Box>
-          {!!copies_left && (
-            <Box color="label">Copies in queue: {copies_left}</Box>
-          )}
-        </Section>
-        {categories.length !== 0 ? (
-          <Blanks />
-        ) : (
-          <Section title="Blanks">
-            <Box color="average">
-              No forms found. Please contact your system administrator.
-            </Box>
-          </Section>
-        )}
-        {has_item ? (
-          <Options />
-        ) : (
-          <Section title="Options">
-            <Box color="average">No inserted item.</Box>
-          </Section>
-        )}
-        {!!isAI && <AIOptions />}
-      </Window.Content>
-    </Window>
-  );
-};
-
-const Toner = (props) => {
-  const { act, data } = useBackend();
-  const { max_toner, current_toner } = data;
-
-  const average_toner = max_toner * 0.66;
-  const bad_toner = max_toner * 0.33;
-
-  return (
-    <Section
-      title="Toner"
-      buttons={
-        <Button onClick={() => act('remove_toner')} icon="eject">
-          Eject
-        </Button>
-      }
-    >
-      <ProgressBar
-        ranges={{
-          good: [average_toner, max_toner],
-          average: [bad_toner, average_toner],
-          bad: [0, bad_toner],
-        }}
-        value={current_toner}
-        minValue={0}
-        maxValue={max_toner}
-      />
-    </Section>
-  );
-};
-
-const Options = (props) => {
-  const { act, data } = useBackend();
-  const { color_mode, is_photo, num_copies } = data;
-
-  return (
-    <Section title="Options">
-      <Flex>
-        <Flex.Item mt={0.4} width={11} color="label">
-          Make copies:
-        </Flex.Item>
-        <Flex.Item>
-          <NumberInput
-            animate
-            width={2.6}
-            height={1.65}
-            step={1}
-            stepPixelSize={8}
-            minValue={1}
-            maxValue={10}
-            value={num_copies}
-            onDrag={(value) =>
-              act('set_copies', {
-                num_copies: value,
-              })
-            }
-          />
-        </Flex.Item>
-        <Flex.Item>
-          <Button
-            ml={0.2}
-            icon="copy"
-            textAlign="center"
-            onClick={() => act('make_copy')}
-          >
-            Copy
-          </Button>
-        </Flex.Item>
-      </Flex>
-      {!!is_photo && (
-        <Flex mt={0.5}>
-          <Flex.Item mr={0.4} width="50%">
-            <Button
-              fluid
-              textAlign="center"
-              selected={color_mode === 'Greyscale'}
-              onClick={() =>
-                act('color_mode', {
-                  mode: 'Greyscale',
-                })
-              }
-            >
-              Greyscale
-            </Button>
-          </Flex.Item>
-          <Flex.Item ml={0.4} width="50%">
-            <Button
-              fluid
-              textAlign="center"
-              selected={color_mode === 'Color'}
-              onClick={() =>
-                act('color_mode', {
-                  mode: 'Color',
-                })
-              }
-            >
-              Color
-            </Button>
-          </Flex.Item>
-        </Flex>
-      )}
-      <Button
-        mt={0.5}
-        textAlign="center"
-        icon="reply"
-        fluid
-        onClick={() => act('remove')}
-      >
-        Remove item
-      </Button>
-    </Section>
-  );
-};
-
-const Blanks = (props) => {
-  const { act, data } = useBackend();
-  const { blanks, categories, category } = data;
-
-  const sortedBlanks = sortBy(blanks || [], (blank) => blank.name);
-
-  const selectedCategory = category ?? categories[0];
-  const visibleBlanks = sortedBlanks.filter(
-    (blank) => blank.category === selectedCategory,
-  );
-
-  return (
-    <Section title="Blanks">
-      <Dropdown
-        width="100%"
-        options={categories}
-        selected={selectedCategory}
-        onSelected={(value) =>
-          act('choose_category', {
-            category: value,
-          })
-        }
-      />
-      <Box mt={0.4}>
-        {visibleBlanks.map((blank) => (
-          <Button
-            key={blank.code}
-            title={blank.name}
-            onClick={() =>
-              act('print_blank', {
-                code: blank.code,
-              })
-            }
-          >
-            {blank.code}
-          </Button>
-        ))}
-      </Box>
-    </Section>
-  );
-};
-
-const AIOptions = (props) => {
-  const { act, data } = useBackend();
-  const { can_AI_print } = data;
-
-  return (
-    <Section title="AI Options">
-      <Box>
-        <Button
-          fluid
-          icon="images"
-          textAlign="center"
-          disabled={!can_AI_print}
-          onClick={() => act('ai_photo')}
-        >
-          Print photo from database
-        </Button>
-      </Box>
-    </Section>
-  );
-};
diff --git a/tgui/packages/tgui/interfaces/Photocopier.tsx b/tgui/packages/tgui/interfaces/Photocopier.tsx
new file mode 100644
index 0000000000000..7089474b2a7b7
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Photocopier.tsx
@@ -0,0 +1,410 @@
+import { createSearch } from 'common/string';
+import { useState } from 'react';
+
+import { BooleanLike } from '../../common/react';
+import { useBackend } from '../backend';
+import {
+  Button,
+  Input,
+  LabeledList,
+  ProgressBar,
+  Section,
+  Slider,
+  Stack,
+} from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+  has_item: BooleanLike;
+  has_toner: BooleanLike;
+  can_AI_print: BooleanLike;
+  isAI: BooleanLike;
+  is_photo: BooleanLike;
+  categories: string[];
+  color_mode: string;
+  num_copies: number;
+  max_copies: number;
+  copies_left: number;
+  max_toner: number;
+  current_toner: number;
+  paper_count: number;
+  max_paper_count: number;
+  blanks: Blank[];
+};
+
+type Blank = {
+  name: string;
+  category: string;
+  code: string;
+};
+
+export const Photocopier = (props) => {
+  const [selectedBlank, setSelectedBlank] = useState('');
+  const [selectedCategory, setSelectedCategory] = useState('');
+
+  return (
+    <Window
+      title="Photocopier"
+      width={selectedCategory ? 550 : 225}
+      height={525}
+    >
+      <Window.Content>
+        <Stack fill>
+          <Stack.Item basis={selectedCategory ? '40%' : '100%'}>
+            <Stack fill vertical>
+              <Stack.Item>
+                <Status selectedBlank={selectedBlank} />
+              </Stack.Item>
+              <Stack.Item>
+                <Actions selectedBlank={selectedBlank} />
+              </Stack.Item>
+              <Stack.Item grow>
+                <Categories
+                  selectedCategory={selectedCategory}
+                  setSelectedCategory={setSelectedCategory}
+                />
+              </Stack.Item>
+            </Stack>
+          </Stack.Item>
+          {selectedCategory && (
+            <Stack.Item basis="60%">
+              <Stack fill vertical>
+                <Stack.Item grow>
+                  <Blanks
+                    selectedCategory={selectedCategory}
+                    selectedBlank={selectedBlank}
+                    setSelectedBlank={setSelectedBlank}
+                  />
+                </Stack.Item>
+              </Stack>
+            </Stack.Item>
+          )}
+        </Stack>
+      </Window.Content>
+    </Window>
+  );
+};
+
+type StatusProps = {
+  selectedBlank: string | null;
+};
+
+const Status = (props: StatusProps) => {
+  const { act, data } = useBackend<Data>();
+  const { selectedBlank } = props;
+  const {
+    has_toner,
+    copies_left,
+    num_copies,
+    current_toner,
+    max_toner,
+    paper_count,
+    max_paper_count,
+  } = data;
+
+  const average_toner = max_toner * 0.66;
+  const bad_toner = max_toner * 0.33;
+
+  const average_paper = max_paper_count * 0.33;
+  const bad_paper = max_paper_count * 0.1;
+
+  return (
+    <Section
+      fill
+      title="Status"
+      buttons={
+        <Button
+          icon="eject"
+          disabled={!has_toner}
+          onClick={() => act('remove_toner')}
+        >
+          Eject Toner
+        </Button>
+      }
+    >
+      <LabeledList>
+        <LabeledList.Item label="Toner">
+          {has_toner ? (
+            <ProgressBar
+              minValue={0}
+              value={current_toner}
+              maxValue={max_toner}
+              ranges={{
+                average: [bad_toner, average_toner],
+                bad: [0, bad_toner],
+              }}
+            />
+          ) : (
+            <ProgressBar color="bad" minValue={0} value={0} maxValue={1}>
+              No Cartridge
+            </ProgressBar>
+          )}
+        </LabeledList.Item>
+        <LabeledList.Item label="Paper Stored">
+          <ProgressBar
+            minValue={0}
+            value={paper_count}
+            maxValue={max_paper_count}
+            ranges={{
+              average: [bad_paper, average_paper],
+              bad: [0, bad_paper],
+            }}
+          >
+            {paper_count} / {max_paper_count}
+          </ProgressBar>
+        </LabeledList.Item>
+        <LabeledList.Item label="Queue">
+          <ProgressBar
+            verticalAlign="middle"
+            minValue={0}
+            value={copies_left}
+            maxValue={num_copies}
+          >
+            {copies_left ? `${copies_left} / ${num_copies}` : 'Empty'}
+          </ProgressBar>
+        </LabeledList.Item>
+        <LabeledList.Item label="Blank" textAlign="center">
+          <b>{selectedBlank ? selectedBlank : 'Not Selected'}</b>
+        </LabeledList.Item>
+      </LabeledList>
+    </Section>
+  );
+};
+
+type ActionsProps = {
+  selectedBlank: string | null;
+};
+
+const Actions = (props: ActionsProps) => {
+  const { act, data } = useBackend<Data>();
+  const { selectedBlank } = props;
+  const {
+    has_item,
+    is_photo,
+    num_copies,
+    max_copies,
+    color_mode,
+    isAI,
+    can_AI_print,
+  } = data;
+
+  return (
+    <Section fill title="Actions">
+      <Stack fill vertical textAlign="center">
+        <Stack.Item>
+          <Stack align="center" textAlign="left">
+            <Stack.Item grow color="label">
+              Copies:
+            </Stack.Item>
+            <Stack.Item grow>
+              <Slider
+                animated
+                minValue={1}
+                value={num_copies}
+                maxValue={max_copies}
+                stepPixelSize={10}
+                onChange={(e, value) =>
+                  act('set_copies', {
+                    num_copies: value,
+                  })
+                }
+              />
+            </Stack.Item>
+          </Stack>
+        </Stack.Item>
+        {!!isAI && (
+          <Stack.Item>
+            <Button
+              fluid
+              icon="images"
+              disabled={!can_AI_print}
+              onClick={() => act('ai_photo', { code: selectedBlank })}
+            >
+              Print photo from database
+            </Button>
+          </Stack.Item>
+        )}
+        <Stack.Item>
+          <Stack>
+            <Stack.Item grow>
+              <Button
+                fluid
+                icon="print"
+                disabled={!selectedBlank}
+                onClick={() => act('print_blank', { code: selectedBlank })}
+              >
+                Print
+              </Button>
+            </Stack.Item>
+            <Stack.Item grow>
+              <Button
+                fluid
+                icon="copy"
+                disabled={!has_item}
+                onClick={() => act('make_copy')}
+              >
+                Copy
+              </Button>
+            </Stack.Item>
+          </Stack>
+        </Stack.Item>
+        {!!has_item && !!is_photo && (
+          <Stack.Item>
+            <Stack>
+              <Stack.Item grow>
+                <Button
+                  fluid
+                  icon="palette"
+                  selected={color_mode === 'Color'}
+                  onClick={() =>
+                    act('color_mode', {
+                      mode: 'Color',
+                    })
+                  }
+                >
+                  Color
+                </Button>
+              </Stack.Item>
+              <Stack.Item grow>
+                <Button
+                  fluid
+                  icon="pen"
+                  selected={color_mode === 'Greyscale'}
+                  onClick={() =>
+                    act('color_mode', {
+                      mode: 'Greyscale',
+                    })
+                  }
+                >
+                  Greyscale
+                </Button>
+              </Stack.Item>
+            </Stack>
+          </Stack.Item>
+        )}
+        <Stack.Item>
+          <Button
+            fluid
+            icon={has_item ? 'eject' : 'times'}
+            disabled={!has_item}
+            onClick={() => act('remove')}
+          >
+            Eject Item
+          </Button>
+        </Stack.Item>
+      </Stack>
+    </Section>
+  );
+};
+
+type CategoriesProps = {
+  selectedCategory: string | null;
+  setSelectedCategory: (category: string) => void;
+};
+
+const Categories = (props: CategoriesProps) => {
+  const { act, data } = useBackend<Data>();
+  const { selectedCategory, setSelectedCategory } = props;
+
+  return (
+    <Section
+      fill
+      scrollable
+      title="Blanks"
+      buttons={
+        <Button
+          icon="times"
+          tooltip="Close selected blank category"
+          disabled={!selectedCategory}
+          onClick={() => {
+            setSelectedCategory('');
+          }}
+        />
+      }
+    >
+      <Stack fill vertical zebra>
+        <Stack.Item>
+          <Button
+            fluid
+            icon="chevron-right"
+            color="transparent"
+            selected={selectedCategory === 'All Blanks'}
+            onClick={() => {
+              setSelectedCategory('All Blanks');
+            }}
+          >
+            All Blanks
+          </Button>
+        </Stack.Item>
+        {data.categories.map((category) => (
+          <Stack.Item mt={0.25} key={category}>
+            <Button
+              fluid
+              icon="chevron-right"
+              color="transparent"
+              selected={selectedCategory === category}
+              onClick={() => {
+                setSelectedCategory(category);
+              }}
+            >
+              {category}
+            </Button>
+          </Stack.Item>
+        ))}
+      </Stack>
+    </Section>
+  );
+};
+
+type BlanksProps = {
+  selectedCategory: string | null;
+  selectedBlank: string | null;
+  setSelectedBlank: (blank: string) => void;
+};
+
+const Blanks = (props: BlanksProps) => {
+  const { act, data } = useBackend<Data>();
+  const { selectedCategory, selectedBlank, setSelectedBlank } = props;
+  const { blanks } = data;
+
+  const [searchText, setSearchText] = useState('');
+  const search = createSearch(searchText, (blank: Blank) => blank.name);
+  const sortedBlanks = blanks.sort((a, b) => (a.name > b.name ? 1 : -1));
+  const visibleBlanks = searchText
+    ? sortedBlanks.filter(search)
+    : selectedCategory === 'All Blanks'
+      ? sortedBlanks
+      : sortedBlanks.filter((blank) => blank.category === selectedCategory);
+
+  return (
+    <Section
+      fill
+      scrollable
+      title={selectedCategory}
+      buttons={
+        <Input
+          width={8.75}
+          value={searchText}
+          placeholder="Search blank..."
+          onInput={(e, value) => setSearchText(value)}
+        />
+      }
+    >
+      <Stack fill vertical zebra>
+        {visibleBlanks.map((blank) => (
+          <Stack.Item key={blank.code} mt={0.5}>
+            <Button
+              fluid
+              ellipsis
+              color="transparent"
+              selected={blank.code === selectedBlank}
+              onClick={() => setSelectedBlank(blank.code)}
+            >
+              {blank.name}
+            </Button>
+          </Stack.Item>
+        ))}
+      </Stack>
+    </Section>
+  );
+};
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
index b9dca01bf6afe..2170ac97d5a53 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/MainPage.tsx
@@ -669,7 +669,7 @@ export const MainPage = (props: { openSpecies: () => void }) => {
                         } // check if existing chars more than one
                         onClick={() => setDeleteCharacterPopupOpen(true)}
                       >
-                        Delete Character
+                        Удалить персонажа
                       </Button>
                     </Box>
                   </PreferenceList>
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/antagonists/antagonists/voidwalker.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/antagonists/antagonists/voidwalker.ts
new file mode 100644
index 0000000000000..2a8d22a1f678f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/antagonists/antagonists/voidwalker.ts
@@ -0,0 +1,15 @@
+import { Antagonist, Category } from '../base';
+
+const Voidwalker: Antagonist = {
+  key: 'voidwalker',
+  name: 'Voidwalker',
+  description: [
+    `
+      Move through space and pull people into the void.
+      Declare solars an independent nation.
+    `,
+  ],
+  category: Category.Midround,
+};
+
+export default Voidwalker;
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
index 7246812481b73..9ab050b659831 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
@@ -108,3 +108,11 @@ export const sound_achievement: FeatureChoiced = {
   `,
   component: FeatureDropdownInput,
 };
+
+export const sound_radio_noise: FeatureToggle = {
+  name: 'Enable radio noise',
+  category: 'SOUND',
+  description:
+    'When enabled, hear sounds of talking and hearing radio chatter.',
+  component: CheckboxInput,
+};
diff --git a/tgui/packages/tgui/interfaces/SmartVend.tsx b/tgui/packages/tgui/interfaces/SmartVend.tsx
index d71877d086cd3..9023afacbc71a 100644
--- a/tgui/packages/tgui/interfaces/SmartVend.tsx
+++ b/tgui/packages/tgui/interfaces/SmartVend.tsx
@@ -1,84 +1,265 @@
 import { BooleanLike } from 'common/react';
+import { createSearch } from 'common/string';
+import { useState } from 'react';
+import { DmIcon, Icon } from 'tgui-core/components';
 
 import { useBackend } from '../backend';
-import { Button, NoticeBox, Section, Table } from '../components';
+import { Box, Button, Input, NoticeBox, Section, Stack } from '../components';
 import { Window } from '../layouts';
 
 type Item = {
+  path: string;
   name: string;
   amount: number;
+  icon: string;
+  icon_state: string;
 };
 
 type Data = {
-  contents: Item[];
+  contents: Record<string, Item>;
   name: string;
   isdryer: BooleanLike;
   drying: BooleanLike;
+  default_list_view: BooleanLike;
 };
 
+enum MODE {
+  tile,
+  list,
+}
+
 export const SmartVend = (props) => {
   const { act, data } = useBackend<Data>();
-  const { contents = [] } = data;
+  const [searchText, setSearchText] = useState('');
+  const [displayMode, setDisplayMode] = useState(
+    data.default_list_view ? MODE.list : MODE.tile,
+  );
+  const search = createSearch(searchText, (item: Item) => item.name);
+  const contents =
+    searchText.length > 0
+      ? Object.values(data.contents).filter(search)
+      : Object.values(data.contents);
   return (
-    <Window width={440} height={550}>
-      <Window.Content scrollable>
+    <Window width={498} height={550}>
+      <Window.Content>
         <Section
+          fill
+          scrollable
           title="Storage"
           buttons={
-            !!data.isdryer && (
+            data.isdryer ? (
               <Button
                 icon={data.drying ? 'stop' : 'tint'}
                 onClick={() => act('Dry')}
               >
                 {data.drying ? 'Stop drying' : 'Dry'}
               </Button>
+            ) : (
+              <>
+                <Input
+                  autoFocus
+                  placeholder={'Search...'}
+                  value={searchText}
+                  onInput={(e, value) => setSearchText(value)}
+                />
+                <Button
+                  icon={displayMode === MODE.tile ? 'list' : 'border-all'}
+                  tooltip={
+                    displayMode === MODE.tile
+                      ? 'Display as a list'
+                      : 'Display as a grid'
+                  }
+                  tooltipPosition="bottom"
+                  onClick={() =>
+                    setDisplayMode(
+                      displayMode === MODE.tile ? MODE.list : MODE.tile,
+                    )
+                  }
+                />
+              </>
             )
           }
         >
-          {contents.length === 0 ? (
-            <NoticeBox>Unfortunately, this {data.name} is empty.</NoticeBox>
+          {!contents.length ? (
+            <NoticeBox>Nothing found.</NoticeBox>
           ) : (
-            <Table>
-              <Table.Row header>
-                <Table.Cell>Item</Table.Cell>
-                <Table.Cell collapsing />
-                <Table.Cell collapsing textAlign="center">
-                  {data.isdryer ? 'Take' : 'Dispense'}
-                </Table.Cell>
-              </Table.Row>
-              {Object.values(contents).map((value, key) => (
-                <Table.Row key={key}>
-                  <Table.Cell>{value.name}</Table.Cell>
-                  <Table.Cell collapsing textAlign="right">
-                    {value.amount}
-                  </Table.Cell>
-                  <Table.Cell collapsing>
-                    <Button
-                      content="One"
-                      disabled={value.amount < 1}
-                      onClick={() =>
-                        act('Release', {
-                          name: value.name,
-                          amount: 1,
-                        })
-                      }
-                    />
-                    <Button
-                      content="Many"
-                      disabled={value.amount <= 1}
-                      onClick={() =>
-                        act('Release', {
-                          name: value.name,
-                        })
-                      }
-                    />
-                  </Table.Cell>
-                </Table.Row>
-              ))}
-            </Table>
+            contents.map((item) =>
+              displayMode === MODE.tile ? (
+                <ItemTile key={item.path} item={item} />
+              ) : (
+                <ItemList key={item.path} item={item} />
+              ),
+            )
           )}
         </Section>
       </Window.Content>
     </Window>
   );
 };
+
+const ItemTile = ({ item }) => {
+  const { act } = useBackend<Data>();
+  const fallback = (
+    <Icon name="spinner" lineHeight="64px" size={3} spin color="gray" />
+  );
+  return (
+    <Box m={1} p={0} inline width="64px">
+      <Button
+        p={0}
+        height="64px"
+        width="64px"
+        tooltip={item.name}
+        tooltipPosition="bottom"
+        textAlign="right"
+        disabled={item.amount < 1}
+        onClick={() =>
+          act('Release', {
+            path: item.path,
+            amount: 1,
+          })
+        }
+      >
+        <DmIcon
+          fallback={fallback}
+          icon={item.icon}
+          icon_state={item.icon_state}
+          height="64px"
+          width="64px"
+        />
+        {item.amount > 1 && (
+          <Button
+            color="transparent"
+            minWidth="24px"
+            height="24px"
+            lineHeight="24px"
+            textAlign="center"
+            position="absolute"
+            left="0"
+            bottom="0"
+            fontWeight="bold"
+            fontSize="14px"
+            onClick={(e) => {
+              act('Release', {
+                path: item.path,
+                amount: item.amount,
+              });
+              e.stopPropagation();
+            }}
+          >
+            {item.amount}
+          </Button>
+        )}
+      </Button>
+      <Box
+        style={{
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
+          textOverflow: 'ellipsis',
+          textAlign: 'center',
+        }}
+      >
+        {item.name}
+      </Box>
+    </Box>
+  ) as any;
+};
+
+const ItemList = ({ item }) => {
+  const { act } = useBackend<Data>();
+  const fallback = (
+    <Icon name="spinner" lineHeight="32px" size={3} spin color="gray" />
+  );
+  return (
+    <Stack>
+      <Stack.Item>
+        <Button
+          p={0}
+          m={0}
+          color="transparent"
+          width="32px"
+          height="32px"
+          onClick={() =>
+            act('Release', {
+              path: item.path,
+              amount: 1,
+            })
+          }
+        >
+          <DmIcon
+            fallback={fallback}
+            icon={item.icon}
+            icon_state={item.icon_state}
+          />
+        </Button>
+      </Stack.Item>
+      <Stack.Item
+        style={{
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
+          textOverflow: 'ellipsis',
+          lineHeight: '32px',
+        }}
+      >
+        {item.name}
+      </Stack.Item>
+      <Stack.Item
+        grow
+        style={{
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
+          textOverflow: 'ellipsis',
+          lineHeight: '32px',
+        }}
+      >
+        <Box
+          style={{
+            marginTop: '20px',
+            borderBottom: '1px dotted gray',
+          }}
+        />
+      </Stack.Item>
+      {item.amount > 1 && (
+        <Stack.Item
+          style={{
+            lineHeight: '32px',
+          }}
+        >
+          {`x${item.amount}`}
+        </Stack.Item>
+      )}
+      <Stack.Item>
+        <Button
+          py="4px"
+          mt="4px"
+          height="24px"
+          lineHeight="16px"
+          onClick={() =>
+            act('Release', {
+              path: item.path,
+              amount: 1,
+            })
+          }
+        >
+          Vend
+        </Button>
+      </Stack.Item>
+      <Stack.Item>
+        <Button
+          py="4px"
+          mt="4px"
+          height="24px"
+          lineHeight="16px"
+          disabled={item.amount <= 1}
+          onClick={(e) => {
+            act('Release', {
+              path: item.path,
+              amount: item.amount,
+            });
+          }}
+        >
+          Amount
+        </Button>
+      </Stack.Item>
+    </Stack>
+  ) as any;
+};
diff --git a/tgui/packages/tgui/interfaces/Spellbook.tsx b/tgui/packages/tgui/interfaces/Spellbook.tsx
index debf0bc8502a8..ed4e4a96b7c50 100644
--- a/tgui/packages/tgui/interfaces/Spellbook.tsx
+++ b/tgui/packages/tgui/interfaces/Spellbook.tsx
@@ -22,6 +22,7 @@ enum SpellCategory {
   Mobility = 'Мобильность',
   Assistance = 'Поддержка',
   Rituals = 'Ритуалы',
+  Perks = 'Перки',
 }
 
 type byondRef = string;
@@ -124,6 +125,16 @@ const TAB2NAME: TabType[] = [
       'Если вам не понравились предложенные варианты снаряжения, вы можете принять хаос. Не рекомендуется для начинающих волшебников.',
     component: () => <Randomize />,
   },
+  {
+    title: 'Перки',
+    blurb:
+      'Perks are useful (and not so useful) improvements to the soul and body collected from all corners of the universe.',
+    scrollable: true,
+  },
+  {
+    title: 'Table of Contents',
+    component: () => <TableOfContents />,
+  },
 ];
 
 enum Buywords {
@@ -158,7 +169,7 @@ const EnscribedName = (props) => {
   );
 };
 
-const lineHeightToc = '34.6px';
+const lineHeightToc = '30.6px';
 
 const TableOfContents = (props) => {
   const [tabIndex, setTabIndex] = useLocalState('tab-index', 1);
@@ -238,6 +249,14 @@ const TableOfContents = (props) => {
         content="Магический рандомайзер"
         onClick={() => setTabIndex(9)}
       />
+      <Divider />
+      <Button
+        lineHeight={lineHeightToc}
+        fluid
+        icon="cog"
+        content="Перки"
+        onClick={() => setTabIndex(11)}
+      />
     </Box>
   );
 };
@@ -734,7 +753,7 @@ export const Spellbook = (props) => {
                           <Button
                             mr={0}
                             icon="arrow-right"
-                            disabled={tabIndex === 9}
+                            disabled={tabIndex === 11}
                             content="Следующая страница"
                             onClick={() => setTabIndex(tabIndex + 2)}
                           />
diff --git a/tgui/packages/tgui/interfaces/Techweb.jsx b/tgui/packages/tgui/interfaces/Techweb.jsx
index a92adcb1a185a..fed4b8bb74f56 100644
--- a/tgui/packages/tgui/interfaces/Techweb.jsx
+++ b/tgui/packages/tgui/interfaces/Techweb.jsx
@@ -10,6 +10,7 @@ import {
   Flex,
   Icon,
   Input,
+  LabeledList,
   Modal,
   ProgressBar,
   Section,
@@ -147,6 +148,8 @@ export const TechwebContent = (props) => {
     t_disk,
     d_disk,
     locked,
+    queue_nodes = [],
+    node_cache,
   } = data;
   const [techwebRoute, setTechwebRoute] = useLocalState('techwebRoute', null);
   const [lastPoints, setLastPoints] = useState({});
@@ -156,27 +159,35 @@ export const TechwebContent = (props) => {
       <Flex.Item className="Techweb__HeaderSection">
         <Flex className="Techweb__HeaderContent">
           <Flex.Item>
-            <Box>
-              Доступные очки:
-              <ul className="Techweb__PointSummary">
-                {Object.keys(points).map((k) => (
-                  <li key={k}>
-                    <b>{k}</b>: {points[k]}
-                    {!!points_last_tick[k] && ` (+${points_last_tick[k]}/sec)`}
-                  </li>
-                ))}
-              </ul>
-            </Box>
-            <Box>
-              Протоколы защиты:
-              <span
-                className={`Techweb__SecProtocol ${
-                  !!sec_protocols && 'engaged'
-                }`}
-              >
-                {sec_protocols ? 'включены' : 'отключены'}
-              </span>
-            </Box>
+            <LabeledList>
+              <LabeledList.Item label="Защита">
+                <span
+                  className={`Techweb__SecProtocol ${
+                    !!sec_protocols && 'engaged'
+                  }`}
+                >
+                  {sec_protocols ? 'Включена' : 'Отключена'}
+                </span>
+              </LabeledList.Item>
+              {Object.keys(points).map((k) => (
+                <LabeledList.Item key={k} label="Очки">
+                  <b>{points[k]}</b>
+                  {!!points_last_tick[k] && ` (+${points_last_tick[k]}/сек)`}
+                </LabeledList.Item>
+              ))}
+              <LabeledList.Item label="Очередь">
+                {queue_nodes.length !== 0
+                  ? Object.keys(queue_nodes).map((node_id) => (
+                      <Button
+                        key={node_id}
+                        tooltip={`Добавлено: ${queue_nodes[node_id]}`}
+                      >
+                        {node_cache[node_id].name}
+                      </Button>
+                    ))
+                  : 'Пусто'}
+              </LabeledList.Item>
+            </LabeledList>
           </Flex.Item>
           <Flex.Item grow={1} />
           <Flex.Item>
@@ -277,28 +288,28 @@ const TechwebOverview = (props) => {
                 selected={!searching && tabIndex === 0}
                 onClick={() => switchTab(0)}
               >
-                Изученные
+                Изучено
               </Tabs.Tab>
               <Tabs.Tab
                 selected={!searching && tabIndex === 1}
                 onClick={() => switchTab(1)}
               >
-                Доступные
+                Доступно
               </Tabs.Tab>
               <Tabs.Tab
                 selected={!searching && tabIndex === 2}
                 onClick={() => switchTab(2)}
               >
-                Будущие
+                В будущем
               </Tabs.Tab>
-              {!!searching && <Tabs.Tab selected>Search Results</Tabs.Tab>}
+              {!!searching && <Tabs.Tab selected>Поиск</Tabs.Tab>}
             </Tabs>
           </Flex.Item>
           <Flex.Item align={'center'}>
             <Input
               value={searchText}
               onInput={(e, value) => setSearchText(value)}
-              placeholder={'Search...'}
+              placeholder={'Поиск...'}
             />
           </Flex.Item>
         </Flex>
@@ -493,9 +504,17 @@ const TechNode = (props) => {
     points = [],
     nodes,
     point_types_abbreviations = [],
+    queue_nodes = [],
   } = data;
   const { node, nodetails, nocontrols } = props;
-  const { id, can_unlock, tier } = node;
+  const {
+    id,
+    can_unlock,
+    have_experiments_done,
+    tier,
+    enqueued_by_user,
+    is_free,
+  } = node;
   const {
     name,
     description,
@@ -555,6 +574,40 @@ const TechNode = (props) => {
       buttons={
         !nocontrols && (
           <>
+            {tier > 0 &&
+              (!!can_unlock && (is_free || queue_nodes.length === 0) ? (
+                <Button
+                  icon="lightbulb"
+                  disabled={!can_unlock || tier > 1 || queue_nodes.length > 0}
+                  onClick={() => act('researchNode', { node_id: id })}
+                >
+                  Изучить
+                </Button>
+              ) : enqueued_by_user ? (
+                <Button
+                  icon="trash"
+                  color="bad"
+                  onClick={() => act('dequeueNode', { node_id: id })}
+                >
+                  Убрать из очереди
+                </Button>
+              ) : id in queue_nodes && !enqueued_by_user ? (
+                <Button icon="check" color="good">
+                  В очереди
+                </Button>
+              ) : (
+                <Button
+                  icon="lightbulb"
+                  disabled={
+                    !have_experiments_done ||
+                    id in queue_nodes ||
+                    techcompl < prereq_ids.length
+                  }
+                  onClick={() => act('enqueueNode', { node_id: id })}
+                >
+                  Добавить в очередь
+                </Button>
+              ))}
             {!nodetails && (
               <Button
                 icon="tasks"
@@ -566,15 +619,6 @@ const TechNode = (props) => {
                 Детали
               </Button>
             )}
-            {tier > 0 && (
-              <Button
-                icon="lightbulb"
-                disabled={!can_unlock || tier > 1}
-                onClick={() => act('researchNode', { node_id: id })}
-              >
-                Изучить
-              </Button>
-            )}
           </>
         )
       }
diff --git a/tgui/packages/tgui/interfaces/Vending.tsx b/tgui/packages/tgui/interfaces/Vending.tsx
index 28c7a788fa6a2..64b62c86c62e4 100644
--- a/tgui/packages/tgui/interfaces/Vending.tsx
+++ b/tgui/packages/tgui/interfaces/Vending.tsx
@@ -14,7 +14,7 @@ import {
 
 import { createSearch } from '../../common/string';
 import { useBackend } from '../backend';
-import { Input } from '../components';
+import { DmIcon, Input } from '../components';
 import { Window } from '../layouts';
 
 type VendingData = {
@@ -45,6 +45,8 @@ type ProductRecord = {
   max_amount: number;
   ref: string;
   category: string;
+  icon?: string;
+  icon_state?: string;
 };
 
 type CoinRecord = ProductRecord & {
@@ -288,20 +290,22 @@ const VendingRow = (props) => {
       (discount ? redPrice : product.price) > user?.cash);
 
   return (
-    <Table.Row>
-      <Table.Cell collapsing>
+    <Table.Row height="32px">
+      <Table.Cell collapsing width="36px">
         <ProductImage product={product} />
       </Table.Cell>
-      <Table.Cell bold>{capitalizeAll(product.name)}</Table.Cell>
-      <Table.Cell>
+      <Table.Cell verticalAlign="middle" bold>
+        {capitalizeAll(product.name)}
+      </Table.Cell>
+      <Table.Cell verticalAlign="middle">
         {!!productStock?.colorable && (
           <ProductColorSelect disabled={disabled} product={product} />
         )}
       </Table.Cell>
-      <Table.Cell collapsing textAlign="right">
+      <Table.Cell collapsing textAlign="right" verticalAlign="middle">
         <ProductStock custom={custom} product={product} remaining={remaining} />
       </Table.Cell>
-      <Table.Cell collapsing textAlign="center">
+      <Table.Cell collapsing textAlign="center" verticalAlign="middle">
         <ProductButton
           custom={custom}
           disabled={disabled}
@@ -319,20 +323,30 @@ const VendingRow = (props) => {
 const ProductImage = (props) => {
   const { product } = props;
 
-  return product.img ? (
-    <img
-      src={`data:image/jpeg;base64,${product.img}`}
-      style={{
-        verticalAlign: 'middle',
-      }}
-    />
-  ) : (
-    <span
-      className={classes(['vending32x32', product.path])}
-      style={{
-        verticalAlign: 'middle',
-      }}
-    />
+  return (
+    <Box width="32px" height="32px">
+      {product.img ? (
+        <img
+          src={`data:image/jpeg;base64,${product.img}`}
+          style={{
+            verticalAlign: 'middle',
+          }}
+        />
+      ) : product.icon && product.icon_state ? (
+        <DmIcon
+          icon={product.icon}
+          icon_state={product.icon_state}
+          fallback={<Icon name="spinner" size={2} spin />}
+        />
+      ) : (
+        <span
+          className={classes(['vending32x32', product.path])}
+          style={{
+            verticalAlign: 'middle',
+          }}
+        />
+      )}
+    </Box>
   );
 };
 
@@ -347,6 +361,7 @@ const ProductColorSelect = (props) => {
     <Button
       icon="palette"
       tooltip="Change color"
+      width="24px"
       disabled={disabled}
       onClick={() => act('select_colors', { ref: product.ref })}
     />
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index bca4c18bd6318..7f7688ac6c797 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -6,9 +6,11 @@
     "@popperjs/core": "^2.11.8",
     "@types/marked": "4.3.2",
     "@types/react": "^18.2.74",
+    "blob-polyfill": "^9.0.20240710",
     "common": "workspace:*",
     "dateformat": "^4.6.3",
     "dompurify": "^2.4.9",
+    "file-extension-icon-js": "^1.1.6",
     "highlight.js": "^11.9.0",
     "jest": "^29.7.0",
     "js-yaml": "^4.1.0",
diff --git a/tgui/packages/tgui/styles/atomic/links.scss b/tgui/packages/tgui/styles/atomic/links.scss
index 8754c3bc2e18b..8f9dcea833c80 100644
--- a/tgui/packages/tgui/styles/atomic/links.scss
+++ b/tgui/packages/tgui/styles/atomic/links.scss
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2021 Celotajs (https://github.com/celotajstg)
+ * SPDX-License-Identifier: MIT
+ */
+
 @use '../colors.scss';
 
 a {
diff --git a/tgui/packages/tgui/styles/components/Button.scss b/tgui/packages/tgui/styles/components/Button.scss
index 381cc44177310..fe777e9d3ef52 100644
--- a/tgui/packages/tgui/styles/components/Button.scss
+++ b/tgui/packages/tgui/styles/components/Button.scss
@@ -93,6 +93,7 @@ $bg-map: colors.$bg-map !default;
 }
 
 .Button--ellipsis {
+  display: block;
   text-overflow: ellipsis;
   overflow: hidden;
 }
diff --git a/tgui/packages/tgui/styles/interfaces/Orbit.scss b/tgui/packages/tgui/styles/interfaces/Orbit.scss
index 892dac500d8f4..feeca232dbbb5 100644
--- a/tgui/packages/tgui/styles/interfaces/Orbit.scss
+++ b/tgui/packages/tgui/styles/interfaces/Orbit.scss
@@ -1,8 +1,8 @@
 .JobIcon {
   background: black;
   height: 20px;
-  overflow: clip;
   padding: 1px 1px 0 1px;
+  overflow: hidden;
   width: 20px;
 }
 
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index e718afd672bf9..c7ce18ba85c68 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -12,6 +12,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@adobe/css-tools@npm:^4.0.1":
+  version: 4.3.3
+  resolution: "@adobe/css-tools@npm:4.3.3"
+  checksum: 10c0/e76e712df713964b87cdf2aca1f0477f19bebd845484d5fcba726d3ec7782366e2f26ec8cb2dcfaf47081a5c891987d8a9f5c3f30d11e1eb3c1848adc27fcb24
+  languageName: node
+  linkType: hard
+
 "@ampproject/remapping@npm:^2.2.0":
   version: 2.3.0
   resolution: "@ampproject/remapping@npm:2.3.0"
@@ -22,7 +29,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2":
+"@babel/code-frame@npm:7.10.4":
+  version: 7.10.4
+  resolution: "@babel/code-frame@npm:7.10.4"
+  dependencies:
+    "@babel/highlight": "npm:^7.10.4"
+  checksum: 10c0/69e0f52986a1f40231d891224f420436629b6678711b68c088e97b7bdba1607aeb5eb9cfb070275c433f0bf43c37c134845db80d1cdbf5ac88a69b0bdcce9402
+  languageName: node
+  linkType: hard
+
+"@babel/code-frame@npm:7.12.11":
+  version: 7.12.11
+  resolution: "@babel/code-frame@npm:7.12.11"
+  dependencies:
+    "@babel/highlight": "npm:^7.10.4"
+  checksum: 10c0/836ffd155506768e991d6dd8c51db37cad5958ed1c8e0a2329ccd9527165d5c752e943d66a5c3c92ffd45f343419f0742e7636629a529f4fbd5303e3637746b9
+  languageName: node
+  linkType: hard
+
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.5.5":
   version: 7.24.2
   resolution: "@babel/code-frame@npm:7.24.2"
   dependencies:
@@ -32,6 +57,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/compat-data@npm:7.24.4"
+  checksum: 10c0/9cd8a9cd28a5ca6db5d0e27417d609f95a8762b655e8c9c97fd2de08997043ae99f0139007083c5e607601c6122e8432c85fe391731b19bf26ad458fa0c60dd3
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.23.5":
   version: 7.24.1
   resolution: "@babel/compat-data@npm:7.24.1"
@@ -39,6 +71,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:7.12.3":
+  version: 7.12.3
+  resolution: "@babel/core@npm:7.12.3"
+  dependencies:
+    "@babel/code-frame": "npm:^7.10.4"
+    "@babel/generator": "npm:^7.12.1"
+    "@babel/helper-module-transforms": "npm:^7.12.1"
+    "@babel/helpers": "npm:^7.12.1"
+    "@babel/parser": "npm:^7.12.3"
+    "@babel/template": "npm:^7.10.4"
+    "@babel/traverse": "npm:^7.12.1"
+    "@babel/types": "npm:^7.12.1"
+    convert-source-map: "npm:^1.7.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.1"
+    json5: "npm:^2.1.2"
+    lodash: "npm:^4.17.19"
+    resolve: "npm:^1.3.2"
+    semver: "npm:^5.4.1"
+    source-map: "npm:^0.5.0"
+  checksum: 10c0/439b0d5c33c1f6f0da2dd6b2cccc1fc92cb1923b8b259e21a4decc13a7edae5ec59bc8a52e343a822404ac416b27e1b200a62715af11a91c1748b428762fd878
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.16.0, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.4":
+  version: 7.24.5
+  resolution: "@babel/core@npm:7.24.5"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-module-transforms": "npm:^7.24.5"
+    "@babel/helpers": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10c0/e26ba810a77bc8e21579a12fc36c79a0a60554404dc9447f2d64eb1f26d181c48d3b97d39d9f158e9911ec7162a8280acfaf2b4b210e975f0dd4bd4dbb1ee159
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.23.9":
   version: 7.24.3
   resolution: "@babel/core@npm:7.24.3"
@@ -62,6 +141,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/generator@npm:7.24.5"
+  dependencies:
+    "@babel/types": "npm:^7.24.5"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^2.5.1"
+  checksum: 10c0/0d64f880150e7dfb92ceff2b4ac865f36aa1e295120920246492ffd0146562dabf79ba8699af1c8833f8a7954818d4d146b7b02f808df4d6024fb99f98b2f78d
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.7.2":
   version: 7.24.1
   resolution: "@babel/generator@npm:7.24.1"
@@ -74,7 +165,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.23.6":
+"@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+  dependencies:
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45
+  languageName: node
+  linkType: hard
+
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+  dependencies:
+    "@babel/types": "npm:^7.22.15"
+  checksum: 10c0/2535e3824ca6337f65786bbac98e562f71699f25532cecd196f027d7698b4967a96953d64e36567956658ad1a05ccbdc62d1ba79ee751c79f4f1d2d3ecc2e01c
+  languageName: node
+  linkType: hard
+
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
   version: 7.23.6
   resolution: "@babel/helper-compilation-targets@npm:7.23.6"
   dependencies:
@@ -87,6 +196,53 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.5"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-member-expression-to-functions": "npm:^7.24.5"
+    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/afc72e8075a249663f8024ef1760de4c0b9252bdde16419ac955fa7e15b8d4096ca1e01f796df4fa8cfdb056708886f60b631ad492242a8e47307974fc305920
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    regexpu-core: "npm:^5.3.1"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/8eba4c1b7b94a83e7a82df5c3e504584ff0ba6ab8710a67ecc2c434a7fb841a29c2f5c94d2de51f25446119a1df538fa90b37bd570db22ddd5e7147fe98277c6
+  languageName: node
+  linkType: hard
+
+"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2"
+  dependencies:
+    "@babel/helper-compilation-targets": "npm:^7.22.6"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    debug: "npm:^4.1.1"
+    lodash.debounce: "npm:^4.0.8"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10c0/f777fe0ee1e467fdaaac059c39ed203bdc94ef2465fb873316e9e1acfc511a276263724b061e3b0af2f6d7ad3ff174f2bb368fde236a860e0f650fda43d7e022
+  languageName: node
+  linkType: hard
+
 "@babel/helper-environment-visitor@npm:^7.22.20":
   version: 7.22.20
   resolution: "@babel/helper-environment-visitor@npm:7.22.20"
@@ -113,7 +269,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.22.15":
+"@babel/helper-member-expression-to-functions@npm:^7.23.0, @babel/helper-member-expression-to-functions@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.5"
+  dependencies:
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/a3c0276a1ede8648a0e6fd86ad846cd57421d05eddfa29446b8b5a013db650462022b9ec1e65ea32c747d0542d729c80866830697f94fb12d603e87c51f080a5
+  languageName: node
+  linkType: hard
+
+"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
   version: 7.24.3
   resolution: "@babel/helper-module-imports@npm:7.24.3"
   dependencies:
@@ -122,6 +287,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-module-transforms@npm:7.24.5"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-simple-access": "npm:^7.24.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/6e77d72f62b7e87abaea800ea0bccd4d54cde26485750969f5f493c032eb63251eb50c3522cace557781565d51c1d0c4bcc866407d24becfb109c18fb92c978d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/helper-module-transforms@npm:7.23.3"
@@ -137,6 +317,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-optimise-call-expression@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+  dependencies:
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10c0/31b41a764fc3c585196cf5b776b70cf4705c132e4ce9723f39871f215f2ddbfb2e28a62f9917610f67c8216c1080482b9b05f65dd195dae2a52cef461f2ac7b8
+  languageName: node
+  linkType: hard
+
 "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0":
   version: 7.24.0
   resolution: "@babel/helper-plugin-utils@npm:7.24.0"
@@ -144,6 +333,39 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.5, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.5
+  resolution: "@babel/helper-plugin-utils@npm:7.24.5"
+  checksum: 10c0/4ae40094e6a2f183281213344f4df60c66b16b19a2bc38d2bb11810a6dc0a0e7ec638957d0e433ff8b615775b8f3cd1b7edbf59440d1b50e73c389fc22913377
+  languageName: node
+  linkType: hard
+
+"@babel/helper-remap-async-to-generator@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-wrap-function": "npm:^7.22.20"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/aa93aa74250b636d477e8d863fbe59d4071f8c2654841b7ac608909e480c1cf3ff7d7af5a4038568829ad09d810bb681668cbe497d9c89ba5c352793dc9edf1e
+  languageName: node
+  linkType: hard
+
+"@babel/helper-replace-supers@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/helper-replace-supers@npm:7.24.1"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-member-expression-to-functions": "npm:^7.23.0"
+    "@babel/helper-optimise-call-expression": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/d39a3df7892b7c3c0e307fb229646168a9bd35e26a72080c2530729322600e8cff5f738f44a14860a2358faffa741b6a6a0d6749f113387b03ddbfa0ec10e1a0
+  languageName: node
+  linkType: hard
+
 "@babel/helper-simple-access@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-simple-access@npm:7.22.5"
@@ -153,6 +375,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-simple-access@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-simple-access@npm:7.24.5"
+  dependencies:
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d96a0ab790a400f6c2dcbd9457b9ca74b9ba6d0f67ff9cd5bcc73792c8fbbd0847322a0dddbd8987dd98610ee1637c680938c7d83d3ffce7d06d7519d823d996
+  languageName: node
+  linkType: hard
+
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0, @babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+  dependencies:
+    "@babel/types": "npm:^7.22.5"
+  checksum: 10c0/ab7fa2aa709ab49bb8cd86515a1e715a3108c4bb9a616965ba76b43dc346dee66d1004ccf4d222b596b6224e43e04cbc5c3a34459501b388451f8c589fbc3691
+  languageName: node
+  linkType: hard
+
 "@babel/helper-split-export-declaration@npm:^7.22.6":
   version: 7.22.6
   resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
@@ -162,7 +402,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.23.4":
+"@babel/helper-split-export-declaration@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.5"
+  dependencies:
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/d7a812d67d031a348f3fb0e6263ce2dbe6038f81536ba7fb16db385383bcd6542b71833194303bf6d3d0e4f7b6b584c9c8fae8772122e2ce68fc9bdf07f4135d
+  languageName: node
+  linkType: hard
+
+"@babel/helper-string-parser@npm:^7.23.4, @babel/helper-string-parser@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/helper-string-parser@npm:7.24.1"
   checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2
@@ -176,6 +425,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helper-validator-identifier@npm:7.24.5"
+  checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/helper-validator-option@npm:7.23.5"
@@ -183,6 +439,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-wrap-function@npm:^7.22.20":
+  version: 7.24.5
+  resolution: "@babel/helper-wrap-function@npm:7.24.5"
+  dependencies:
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/template": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/242fcd32d59d26463fd8d989707b88691deec871ac2bf15e03ab2f1b185d1d4f3db2c6a8dd3c10c89d4ff63da238df1c4d318cfc3dcd8e1c1fabdcf27f28d858
+  languageName: node
+  linkType: hard
+
+"@babel/helpers@npm:^7.12.1, @babel/helpers@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/helpers@npm:7.24.5"
+  dependencies:
+    "@babel/template": "npm:^7.24.0"
+    "@babel/traverse": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+  checksum: 10c0/0630b0223c3a9a34027ddc05b3bac54d68d5957f84e92d2d4814b00448a76e12f9188f9c85cfce2011696d82a8ffcbd8189da097c0af0181d32eb27eca34185e
+  languageName: node
+  linkType: hard
+
 "@babel/helpers@npm:^7.24.1":
   version: 7.24.1
   resolution: "@babel/helpers@npm:7.24.1"
@@ -194,6 +472,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.10.4":
+  version: 7.24.5
+  resolution: "@babel/highlight@npm:7.24.5"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    chalk: "npm:^2.4.2"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/e98047d3ad24608bfa596d000c861a2cc875af897427f2833b91a4e0d4cead07301a7ec15fa26093dcd61e036e2eed2db338ae54f93016fe0dc785fadc4159db
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.24.2":
   version: 7.24.2
   resolution: "@babel/highlight@npm:7.24.2"
@@ -215,6767 +505,15214 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-async-generators@npm:^7.8.4":
-  version: 7.8.4
-  resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
+"@babel/parser@npm:^7.12.3, @babel/parser@npm:^7.24.5, @babel/parser@npm:^7.7.0":
+  version: 7.24.5
+  resolution: "@babel/parser@npm:7.24.5"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/8333a6ad5328bad34fa0e12bcee147c3345ea9a438c0909e7c68c6cfbea43c464834ffd7eabd1cbc1c62df0a558e22ffade9f5b29440833ba7b33d96a71f88c0
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.5"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.8.0"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10c0/d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
+    "@babel/core": ^7.0.0
+  checksum: 10c0/b471972dcc4a3ba32821329a57725e2b563421e975d7ffec7fcabd70af0fced6a50bcc9ed2a8cbd4a9ac7c09cfbf43c7116e82f3b9064b33a22309500b632108
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-bigint@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-bigint@npm:7.8.3"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.8.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10c0/686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
+    "@babel/core": ^7.0.0
+  checksum: 10c0/d4e592e6fc4878654243d2e7b51ea86471b868a8cb09de29e73b65d2b64159990c6c198fd7c9c2af2e38b1cddf70206243792853c47384a84f829dada152f605
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-class-properties@npm:^7.8.3":
-  version: 7.12.13
-  resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.12.13"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.1"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
+    "@babel/core": ^7.13.0
+  checksum: 10c0/351c36e45795a7890d610ab9041a52f4078a59429f6e74c281984aa44149a10d43e82b3a8172c703c0d5679471e165d1c02b6d2e45a677958ee301b89403f202
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-meta@npm:^7.8.3":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.10.4"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
+    "@babel/core": ^7.0.0
+  checksum: 10c0/d7dd5a59a54635a3152895dcaa68f3370bb09d1f9906c1e72232ff759159e6be48de4a598a993c986997280a2dc29922a48aaa98020f16439f3f57ad72788354
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-json-strings@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
+"@babel/plugin-proposal-class-properties@npm:^7.16.0":
+  version: 7.18.6
+  resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.8.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
+  checksum: 10c0/d5172ac6c9948cdfc387e94f3493ad86cb04035cf7433f86b5d358270b1b9752dc25e176db0c5d65892a246aca7bdb4636672e15626d7a7de4bc0bd0040168d9
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.7.2":
+"@babel/plugin-proposal-decorators@npm:^7.16.4":
   version: 7.24.1
-  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
+  resolution: "@babel/plugin-proposal-decorators@npm:7.24.1"
   dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
     "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-decorators": "npm:^7.24.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/6cec76fbfe6ca81c9345c2904d8d9a8a0df222f9269f0962ed6eb2eb8f3f10c2f15e993d1ef09dbaf97726bf1792b5851cf5bd9a769f966a19448df6be95d19a
+  checksum: 10c0/ffe49522ada6581f1c760b777dbd913afcd204e11e6907c4f2c293ce6d30961449ac19d9960250d8743a1f60e21cb667e51a3af15992dfe7627105e039c46a9b
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.0":
+  version: 7.18.6
+  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.10.4"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
+  checksum: 10c0/f6629158196ee9f16295d16db75825092ef543f8b98f4dfdd516e642a0430c7b1d69319ee676d35485d9b86a53ade6de0b883490d44de6d4336d38cdeccbe0bf
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
+"@babel/plugin-proposal-numeric-separator@npm:^7.16.0":
+  version: 7.18.6
+  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.8.0"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
+  checksum: 10c0/a83a65c6ec0d2293d830e9db61406d246f22d8ea03583d68460cb1b6330c6699320acce1b45f66ba3c357830720e49267e3d99f95088be457c66e6450fbfe3fa
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-numeric-separator@npm:^7.8.3":
-  version: 7.10.4
-  resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
+"@babel/plugin-proposal-optional-chaining@npm:^7.16.0":
+  version: 7.21.0
+  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.10.4"
+    "@babel/helper-plugin-utils": "npm:^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.20.0"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
+  checksum: 10c0/b524a61b1de3f3ad287cd1e98c2a7f662178d21cd02205b0d615512e475f0159fa1b569fa7e34c8ed67baef689c0136fa20ba7d1bf058d186d30736a581a723f
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
+"@babel/plugin-proposal-private-methods@npm:^7.16.0":
+  version: 7.18.6
+  resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.8.0"
+    "@babel/helper-create-class-features-plugin": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
+  checksum: 10c0/1c273d0ec3d49d0fe80bd754ec0191016e5b3ab4fb1e162ac0c014e9d3c1517a5d973afbf8b6dc9f9c98a8605c79e5f9e8b5ee158a4313fa68d1ff7b02084b6a
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
-  version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
+"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
+  version: 7.21.0-placeholder-for-preset-env.2
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/e605e0070da087f6c35579499e65801179a521b6842c15181a1e305c04fded2393f11c1efd09b087be7f8b083d1b75e8f3efcbc1292b4f60d3369e14812cff63
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-proposal-private-property-in-object@npm:^7.16.7":
+  version: 7.21.11
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.11"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.18.6"
+    "@babel/helper-create-class-features-plugin": "npm:^7.21.0"
+    "@babel/helper-plugin-utils": "npm:^7.20.2"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/3c8c9ea175101b1cbb2b0e8fee20fcbdd03eb0700d3581aa826ac3573c9b002f39b1512c2af9fd1903ff921bcc864da95ad3cdeba53c9fbcfb3dc23916eacf47
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-async-generators@npm:^7.8.4":
+  version: 7.8.4
+  resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
+  checksum: 10c0/d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
+"@babel/plugin-syntax-bigint@npm:^7.8.3":
   version: 7.8.3
-  resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
+  resolution: "@babel/plugin-syntax-bigint@npm:7.8.3"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.8.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
+  checksum: 10c0/686891b81af2bc74c39013655da368a480f17dd237bf9fbc32048e5865cb706d5a8f65438030da535b332b1d6b22feba336da8fa931f663b6b34e13147d12dde
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3":
+  version: 7.12.13
+  resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.12.13"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-top-level-await@npm:^7.8.3":
+"@babel/plugin-syntax-class-static-block@npm:^7.14.5":
   version: 7.14.5
-  resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
+  resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.14.5"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
+  checksum: 10c0/4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.7.2":
+"@babel/plugin-syntax-decorators@npm:^7.24.1":
   version: 7.24.1
-  resolution: "@babel/plugin-syntax-typescript@npm:7.24.1"
+  resolution: "@babel/plugin-syntax-decorators@npm:7.24.1"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.24.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/7a81e277dcfe3138847e8e5944e02a42ff3c2e864aea6f33fd9b70d1556d12b0e70f0d56cc1985d353c91bcbf8fe163e6cc17418da21129b7f7f1d8b9ac00c93
+  checksum: 10c0/14028a746f86efbdd47e4961456bb53d656e9e3461890f66b1b01032151d15fda5ba99fcaa60232a229a33aa9e73b11c2597b706d5074c520155757e372cd17b
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
-  version: 7.24.0
-  resolution: "@babel/template@npm:7.24.0"
+"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
   dependencies:
-    "@babel/code-frame": "npm:^7.23.5"
-    "@babel/parser": "npm:^7.24.0"
-    "@babel/types": "npm:^7.24.0"
-  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
-  languageName: node
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
+  languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/traverse@npm:7.24.1"
+"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
   dependencies:
-    "@babel/code-frame": "npm:^7.24.1"
-    "@babel/generator": "npm:^7.24.1"
-    "@babel/helper-environment-visitor": "npm:^7.22.20"
-    "@babel/helper-function-name": "npm:^7.23.0"
-    "@babel/helper-hoist-variables": "npm:^7.22.5"
-    "@babel/helper-split-export-declaration": "npm:^7.22.6"
-    "@babel/parser": "npm:^7.24.1"
-    "@babel/types": "npm:^7.24.0"
-    debug: "npm:^4.3.1"
-    globals: "npm:^11.1.0"
-  checksum: 10c0/c087b918f6823776537ba246136c70e7ce0719fc05361ebcbfd16f4e6f2f6f1f8f4f9167f1d9b675f27d12074839605189cc9d689de20b89a85e7c140f23daab
+    "@babel/helper-plugin-utils": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
-  version: 7.24.0
-  resolution: "@babel/types@npm:7.24.0"
+"@babel/plugin-syntax-flow@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-flow@npm:7.24.1"
   dependencies:
-    "@babel/helper-string-parser": "npm:^7.23.4"
-    "@babel/helper-validator-identifier": "npm:^7.22.20"
-    to-fast-properties: "npm:^2.0.0"
-  checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/618de04360a96111408abdaafaba2efbaef0d90faad029d50e0281eaad5d7c7bd2ce4420bbac0ee27ad84c2b7bbc3e48f782064f81ed5bc40c398637991004c7
   languageName: node
   linkType: hard
 
-"@bcoe/v8-coverage@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@bcoe/v8-coverage@npm:0.2.3"
-  checksum: 10c0/6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
+"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/72f0340d73e037f0702c61670054e0af66ece7282c5c2f4ba8de059390fee502de282defdf15959cd9f71aa18dc5c5e4e7a0fde317799a0600c6c4e0a656d82b
   languageName: node
   linkType: hard
 
-"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0":
-  version: 0.5.7
-  resolution: "@discoveryjs/json-ext@npm:0.5.7"
-  checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
+"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/309634e3335777aee902552b2cf244c4a8050213cc878b3fb9d70ad8cbbff325dc46ac5e5791836ff477ea373b27832238205f6ceaff81f7ea7c4c7e8fbb13bb
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
-  conditions: os=aix & cpu=ppc64
+"@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-arm64@npm:0.20.2"
-  conditions: os=android & cpu=arm64
+"@babel/plugin-syntax-json-strings@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-arm@npm:0.20.2"
-  conditions: os=android & cpu=arm
+"@babel/plugin-syntax-jsx@npm:^7.23.3, @babel/plugin-syntax-jsx@npm:^7.24.1, @babel/plugin-syntax-jsx@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-jsx@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/6cec76fbfe6ca81c9345c2904d8d9a8a0df222f9269f0962ed6eb2eb8f3f10c2f15e993d1ef09dbaf97726bf1792b5851cf5bd9a769f966a19448df6be95d19a
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-x64@npm:0.20.2"
-  conditions: os=android & cpu=x64
+"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
-  conditions: os=darwin & cpu=arm64
+"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/darwin-x64@npm:0.20.2"
-  conditions: os=darwin & cpu=x64
+"@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3":
+  version: 7.10.4
+  resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
-  conditions: os=freebsd & cpu=arm64
+"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
-  conditions: os=freebsd & cpu=x64
+"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-arm64@npm:0.20.2"
-  conditions: os=linux & cpu=arm64
+"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
+  version: 7.8.3
+  resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.8.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-arm@npm:0.20.2"
-  conditions: os=linux & cpu=arm
+"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
+  version: 7.14.5
+  resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-ia32@npm:0.20.2"
-  conditions: os=linux & cpu=ia32
+"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3":
+  version: 7.14.5
+  resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-loong64@npm:0.20.2"
-  conditions: os=linux & cpu=loong64
+"@babel/plugin-syntax-typescript@npm:^7.24.1, @babel/plugin-syntax-typescript@npm:^7.7.2":
+  version: 7.24.1
+  resolution: "@babel/plugin-syntax-typescript@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/7a81e277dcfe3138847e8e5944e02a42ff3c2e864aea6f33fd9b70d1556d12b0e70f0d56cc1985d353c91bcbf8fe163e6cc17418da21129b7f7f1d8b9ac00c93
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
-  conditions: os=linux & cpu=mips64el
+"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
+  version: 7.18.6
+  resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.18.6"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/9144e5b02a211a4fb9a0ce91063f94fbe1004e80bde3485a0910c9f14897cf83fabd8c21267907cff25db8e224858178df0517f14333cfcf3380ad9a4139cb50
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
-  conditions: os=linux & cpu=ppc64
+"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/f44bfacf087dc21b422bab99f4e9344ee7b695b05c947dacae66de05c723ab9d91800be7edc1fa016185e8c819f3aca2b4a5f66d8a4d1e47d9bad80b8fa55b8e
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
-  conditions: os=linux & cpu=riscv64
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/55ceed059f819dcccbfe69600bfa1c055ada466bd54eda117cfdd2cf773dd85799e2f6556e4a559b076e93b9704abcca2aef9d72aad7dc8a5d3d17886052f1d3
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-s390x@npm:0.20.2"
-  conditions: os=linux & cpu=s390x
+"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
+  dependencies:
+    "@babel/helper-module-imports": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-remap-async-to-generator": "npm:^7.22.20"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/3731ba8e83cbea1ab22905031f25b3aeb0b97c6467360a2cc685352f16e7c786417d8883bc747f5a0beff32266bdb12a05b6292e7b8b75967087200a7bc012c4
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-x64@npm:0.20.2"
-  conditions: os=linux & cpu=x64
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/6fbaa85f5204f34845dfc0bebf62fdd3ac5a286241c85651e59d426001e7a1785ac501f154e093e0b8ee49e1f51e3f8b06575a5ae8d4a9406d43e4816bf18c37
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
-  conditions: os=netbsd & cpu=x64
+"@babel/plugin-transform-block-scoping@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.5"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/85997fc8179b7d26e8af30865aeb91789f3bc1f0cd5643ed25f25891ff9c071460ec1220599b19070b424a3b902422f682e9b02e515872540173eae2e25f760c
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
-  conditions: os=openbsd & cpu=x64
+"@babel/plugin-transform-class-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/00dff042ac9df4ae67b5ef98b1137cc72e0a24e6d911dc200540a8cb1f00b4cff367a922aeb22da17da662079f0abcd46ee1c5f4cdf37ceebf6ff1639bb9af27
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/sunos-x64@npm:0.20.2"
-  conditions: os=sunos & cpu=x64
+"@babel/plugin-transform-class-static-block@npm:^7.24.4":
+  version: 7.24.4
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
+  dependencies:
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.4"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.12.0
+  checksum: 10c0/19dfeaf4a2ac03695034f7211a8b5ad89103b224608ac3e91791055107c5fe4d7ebe5d9fbb31b4a91265694af78762260642eb270f4b239c175984ee4b253f80
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-arm64@npm:0.20.2"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-ia32@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-ia32@npm:0.20.2"
-  conditions: os=win32 & cpu=ia32
+"@babel/plugin-transform-classes@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-classes@npm:7.24.5"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    globals: "npm:^11.1.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/4affcbb7cb01fa4764c7a4b534c30fd24a4b68e680a2d6e242dd7ca8726490f0f1426c44797deff84a38a162e0629718900c68d28daffe2b12adf5b4194156a7
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-x64@npm:0.20.2"
-  conditions: os=win32 & cpu=x64
+"@babel/plugin-transform-computed-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/template": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/8292c508b656b7722e2c2ca0f6f31339852e3ed2b9b80f6e068a4010e961b431ca109ecd467fc906283f4b1574c1e7b1cb68d35a4dea12079d386c15ff7e0eac
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+"@babel/plugin-transform-destructuring@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.5"
   dependencies:
-    eslint-visitor-keys: "npm:^3.3.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/6a37953a95f04b335bf3e2118fb93f50dd9593c658d1b2f8918a380a2ee30f1b420139eccf7ec3873c86a8208527895fcf6b7e21c0e734a6ad6e5d5042eace4d
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.6.1":
-  version: 4.10.0
-  resolution: "@eslint-community/regexpp@npm:4.10.0"
-  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
+"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/758def705ec5a87ef910280dc2df5d2fda59dc5d4771c1725c7aed0988ae5b79e29aeb48109120301a3e1c6c03dfac84700469de06f38ca92c96834e09eadf5d
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.1.4":
-  version: 2.1.4
-  resolution: "@eslint/eslintrc@npm:2.1.4"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
   dependencies:
-    ajv: "npm:^6.12.4"
-    debug: "npm:^4.3.2"
-    espree: "npm:^9.6.0"
-    globals: "npm:^13.19.0"
-    ignore: "npm:^5.2.0"
-    import-fresh: "npm:^3.2.1"
-    js-yaml: "npm:^4.1.0"
-    minimatch: "npm:^3.1.2"
-    strip-json-comments: "npm:^3.1.1"
-  checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/41072f57f83a6c2b15f3ee0b6779cdca105ff3d98061efe92ac02d6c7b90fdb6e7e293b8a4d5b9c690d9ae5d3ae73e6bde4596dc4d8c66526a0e5e1abc73c88c
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.57.0":
-  version: 8.57.0
-  resolution: "@eslint/js@npm:8.57.0"
-  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
+"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/7e2834780e9b5251ef341854043a89c91473b83c335358620ca721554877e64e416aeb3288a35f03e825c4958e07d5d00ead08c4490fadc276a21fe151d812f1
   languageName: node
   linkType: hard
 
-"@fastify/accept-negotiator@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@fastify/accept-negotiator@npm:1.1.0"
-  checksum: 10c0/1cb9a298c992b812869158ddc6093557a877b30e5f77618a7afea985a0667c50bc7113593bf0f7f9dc9b82b94c16e8ab127a0afc3efde6677fd645539f6d08e5
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/f0fc4c5a9add25fd6bf23dabe6752e9b7c0a2b2554933dddfd16601245a2ba332b647951079c782bf3b94c6330e3638b9b4e0227f469a7c1c707446ba0eba6c7
   languageName: node
   linkType: hard
 
-"@fastify/ajv-compiler@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@fastify/ajv-compiler@npm:1.1.0"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
   dependencies:
-    ajv: "npm:^6.12.6"
-  checksum: 10c0/e8c4c468f74db2d5d14ce3e765e8317e302413960f63474e6ef18039b1d711e2712e87808035f3e075b9fdf8f47af1b481979eb1ca8d82e0773ff6a9fd49d903
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/510bb23b2423d5fbffef69b356e4050929c21a7627e8194b1506dd935c7d9cbbd696c9ae9d7c3bcd7e6e7b69561b0b290c2d72d446327b40fc20ce40bbca6712
   languageName: node
   linkType: hard
 
-"@fastify/error@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@fastify/error@npm:2.0.0"
-  checksum: 10c0/32b98cb663e462e3d60a31a46306481f7b84657cfdd301dcd7fa9f77389f180e51c641dc4c6900d423daa264e70172bf23493fae031b6af4844b6cc7f17fe77d
+"@babel/plugin-transform-flow-strip-types@npm:^7.16.0":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-flow-strip-types@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-flow": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/e6aa9cbad0441867598d390d4df65bc8c6b797574673e4eedbdae0cc528e81e00f4b2cd38f7d138b0f04bcdd2540384a9812d5d76af5abfa06aee1c7fc20ca58
   languageName: node
   linkType: hard
 
-"@fastify/send@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "@fastify/send@npm:2.1.0"
+"@babel/plugin-transform-for-of@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
   dependencies:
-    "@lukeed/ms": "npm:^2.0.1"
-    escape-html: "npm:~1.0.3"
-    fast-decode-uri-component: "npm:^1.0.1"
-    http-errors: "npm:2.0.0"
-    mime: "npm:^3.0.0"
-  checksum: 10c0/0e1c10022660fa1f1959b7c414d1be2c47ab42be1da8e21cd72a4df3104c516fdf7b590ee67f897037dd4c85b716fac63929e894d7699623549646604f6db14b
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/e4bc92b1f334246e62d4bde079938df940794db564742034f6597f2e38bd426e11ae8c5670448e15dd6e45c462f2a9ab3fa87259bddf7c08553ffd9457fc2b2c
   languageName: node
   linkType: hard
 
-"@fastify/static@npm:^6.12.0":
-  version: 6.12.0
-  resolution: "@fastify/static@npm:6.12.0"
+"@babel/plugin-transform-function-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
   dependencies:
-    "@fastify/accept-negotiator": "npm:^1.0.0"
-    "@fastify/send": "npm:^2.0.0"
-    content-disposition: "npm:^0.5.3"
-    fastify-plugin: "npm:^4.0.0"
-    glob: "npm:^8.0.1"
-    p-limit: "npm:^3.1.0"
-  checksum: 10c0/9248c9851c4bb24965e88eb2f0825fda2b2b08ddb83aa5f08e529b8a522cf20978f81e8e4837e2cb550b39ea433790b0fd82db4b2f0673133325e265c9099fff
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/65c1735ec3b5e43db9b5aebf3c16171c04b3050c92396b9e22dda0d2aaf51f43fdcf147f70a40678fd9a4ee2272a5acec4826e9c21bcf968762f4c184897ad75
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
+"@babel/plugin-transform-json-strings@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/13d9b6a3c31ab4be853b3d49d8d1171f9bd8198562fd75da8f31e7de31398e1cfa6eb1d073bed93c9746e4f9c47a53b20f8f4c255ece3f88c90852ad3181dc2d
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.14":
-  version: 0.11.14
-  resolution: "@humanwhocodes/config-array@npm:0.11.14"
+"@babel/plugin-transform-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
   dependencies:
-    "@humanwhocodes/object-schema": "npm:^2.0.2"
-    debug: "npm:^4.3.1"
-    minimatch: "npm:^3.0.5"
-  checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/a27cc7d565ee57b5a2bf136fa889c5c2f5988545ae7b3b2c83a7afe5dd37dfac80dca88b1c633c65851ce6af7d2095c04c01228657ce0198f918e64b5ccd01fa
   languageName: node
   linkType: hard
 
-"@humanwhocodes/module-importer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
-  checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/98a2e0843ddfe51443c1bfcf08ba40ad8856fd4f8e397b392a5390a54f257c8c1b9a99d8ffc0fc7e8c55cce45e2cd9c2795a4450303f48f501bcbd662de44554
   languageName: node
   linkType: hard
 
-"@humanwhocodes/object-schema@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "@humanwhocodes/object-schema@npm:2.0.3"
-  checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/2af731d02aa4c757ef80c46df42264128cbe45bfd15e1812d1a595265b690a44ad036041c406a73411733540e1c4256d8174705ae6b8cfaf757fc175613993fd
   languageName: node
   linkType: hard
 
-"@isaacs/cliui@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "@isaacs/cliui@npm:8.0.2"
+"@babel/plugin-transform-modules-amd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
   dependencies:
-    string-width: "npm:^5.1.2"
-    string-width-cjs: "npm:string-width@^4.2.0"
-    strip-ansi: "npm:^7.0.1"
-    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
-    wrap-ansi: "npm:^8.1.0"
-    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
-  checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/71fd04e5e7026e6e52701214b1e9f7508ba371b757e5075fbb938a79235ed66a54ce65f89bb92b59159e9f03f01b392e6c4de6d255b948bec975a90cfd6809ef
   languageName: node
   linkType: hard
 
-"@istanbuljs/load-nyc-config@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
+"@babel/plugin-transform-modules-commonjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
   dependencies:
-    camelcase: "npm:^5.3.1"
-    find-up: "npm:^4.1.0"
-    get-package-type: "npm:^0.1.0"
-    js-yaml: "npm:^3.13.1"
-    resolve-from: "npm:^5.0.0"
-  checksum: 10c0/dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-simple-access": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/efb3ea2047604a7eb44a9289311ebb29842fe6510ff8b66a77a60440448c65e1312a60dc48191ed98246bdbd163b5b6f3348a0669bcc0e3809e69c7c776b20fa
   languageName: node
   linkType: hard
 
-"@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "@istanbuljs/schema@npm:0.1.3"
-  checksum: 10c0/61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
+  dependencies:
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/38145f8abe8a4ce2b41adabe5d65eb7bd54a139dc58e2885fec975eb5cf247bd938c1dd9f09145c46dbe57d25dd0ef7f00a020e5eb0cbe8195b2065d51e2d93d
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/console@npm:29.7.0"
+"@babel/plugin-transform-modules-umd@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-  checksum: 10c0/7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/14c90c58562b54e17fe4a8ded3f627f9a993648f8378ef00cb2f6c34532032b83290d2ad54c7fff4f0c2cd49091bda780f8cc28926ec4b77a6c2141105a2e699
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/core@npm:29.7.0"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
   dependencies:
-    "@jest/console": "npm:^29.7.0"
-    "@jest/reporters": "npm:^29.7.0"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/transform": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    ansi-escapes: "npm:^4.2.1"
-    chalk: "npm:^4.0.0"
-    ci-info: "npm:^3.2.0"
-    exit: "npm:^0.1.2"
-    graceful-fs: "npm:^4.2.9"
-    jest-changed-files: "npm:^29.7.0"
-    jest-config: "npm:^29.7.0"
-    jest-haste-map: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-regex-util: "npm:^29.6.3"
-    jest-resolve: "npm:^29.7.0"
-    jest-resolve-dependencies: "npm:^29.7.0"
-    jest-runner: "npm:^29.7.0"
-    jest-runtime: "npm:^29.7.0"
-    jest-snapshot: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jest-validate: "npm:^29.7.0"
-    jest-watcher: "npm:^29.7.0"
-    micromatch: "npm:^4.0.4"
-    pretty-format: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-    strip-ansi: "npm:^6.0.0"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
   peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  checksum: 10c0/934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
+    "@babel/core": ^7.0.0
+  checksum: 10c0/b0b072bef303670b5a98307bc37d1ac326cb7ad40ea162b89a03c2ffc465451be7ef05be95cb81ed28bfeb29670dc98fe911f793a67bceab18b4cb4c81ef48f3
   languageName: node
   linkType: hard
 
-"@jest/create-cache-key-function@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/create-cache-key-function@npm:29.7.0"
+"@babel/plugin-transform-new-target@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-  checksum: 10c0/5c47ef62205264adf77b1ff26b969ce9fe84920b8275c3c5e83f4236859d6ae5e4e7027af99eef04a8e334c4e424d44af3e167972083406070aca733ac2a2795
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/c4cabe628163855f175a8799eb73d692b6f1dc347aae5022af0c253f80c92edb962e48ddccc98b691eff3d5d8e53c9a8f10894c33ba4cebc2e2f8f8fe554fb7a
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/environment@npm:29.7.0"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
   dependencies:
-    "@jest/fake-timers": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    jest-mock: "npm:^29.7.0"
-  checksum: 10c0/c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/c8532951506fb031287280cebeef10aa714f8a7cea2b62a13c805f0e0af945ba77a7c87e4bbbe4c37fe973e0e5d5e649cfac7f0374f57efc54cdf9656362a392
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/expect-utils@npm:29.7.0"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
   dependencies:
-    jest-get-type: "npm:^29.6.3"
-  checksum: 10c0/60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/15e2b83292e586fb4f5b4b4021d4821a806ca6de2b77d5ad6c4e07aa7afa23704e31b4d683dac041afc69ac51b2461b96e8c98e46311cc1faba54c73f235044f
   languageName: node
   linkType: hard
 
-"@jest/expect@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/expect@npm:29.7.0"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.5"
   dependencies:
-    expect: "npm:^29.7.0"
-    jest-snapshot: "npm:^29.7.0"
-  checksum: 10c0/b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/91d7303af9b5744b8f569c1b8e45c9c9322ded05e7ee94e71b9ff2327f0d2c7b5aa87e040697a6baacc2dcb5c5e5e00913087c36f24c006bdaa4f958fd5bfd2d
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/fake-timers@npm:29.7.0"
+"@babel/plugin-transform-object-super@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    "@sinonjs/fake-timers": "npm:^10.0.2"
-    "@types/node": "npm:*"
-    jest-message-util: "npm:^29.7.0"
-    jest-mock: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-  checksum: 10c0/cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-replace-supers": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/d30e6b9e59a707efd7ed524fc0a8deeea046011a6990250f2e9280516683138e2d13d9c52daf41d78407bdab0378aef7478326f2a15305b773d851cb6e106157
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/globals@npm:29.7.0"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
   dependencies:
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/expect": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    jest-mock: "npm:^29.7.0"
-  checksum: 10c0/a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/68408b9ef772d9aa5dccf166c86dc4d2505990ce93e03dcfc65c73fb95c2511248e009ba9ccf5b96405fb85de1c16ad8291016b1cc5689ee4becb1e3050e0ae7
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/reporters@npm:29.7.0"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.1, @babel/plugin-transform-optional-chaining@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.5"
   dependencies:
-    "@bcoe/v8-coverage": "npm:^0.2.3"
-    "@jest/console": "npm:^29.7.0"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/transform": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@jridgewell/trace-mapping": "npm:^0.3.18"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    collect-v8-coverage: "npm:^1.0.0"
-    exit: "npm:^0.1.2"
-    glob: "npm:^7.1.3"
-    graceful-fs: "npm:^4.2.9"
-    istanbul-lib-coverage: "npm:^3.0.0"
-    istanbul-lib-instrument: "npm:^6.0.0"
-    istanbul-lib-report: "npm:^3.0.0"
-    istanbul-lib-source-maps: "npm:^4.0.0"
-    istanbul-reports: "npm:^3.1.3"
-    jest-message-util: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jest-worker: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-    string-length: "npm:^4.0.1"
-    strip-ansi: "npm:^6.0.0"
-    v8-to-istanbul: "npm:^9.0.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
   peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  checksum: 10c0/a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/f4e9446ec69f58f40b7843ce7603cfc50332976e6e794d4ddbe6b24670cd50ebc7766c4e3cbaecf0fbb744e98cbfbb54146f4e966314b1d58511b8bbf3d2722b
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/schemas@npm:29.6.3"
+"@babel/plugin-transform-parameters@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.5"
   dependencies:
-    "@sinclair/typebox": "npm:^0.27.8"
-  checksum: 10c0/b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/e08b8c46a24b1b21dde7783cb0aeb56ffe9ef6d6f1795649ce76273657158d3bfa5370c6594200ed7d371983b599c8e194b76108dffed9ab5746fe630ef2e8f5
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/source-map@npm:29.6.3"
+"@babel/plugin-transform-private-methods@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
   dependencies:
-    "@jridgewell/trace-mapping": "npm:^0.3.18"
-    callsites: "npm:^3.0.0"
-    graceful-fs: "npm:^4.2.9"
-  checksum: 10c0/a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.1"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/d8e18587d2a8b71a795da5e8841b0e64f1525a99ad73ea8b9caa331bc271d69646e2e1e749fd634321f3df9d126070208ddac22a27ccf070566b2efb74fecd99
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/test-result@npm:29.7.0"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.5"
   dependencies:
-    "@jest/console": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/istanbul-lib-coverage": "npm:^2.0.0"
-    collect-v8-coverage: "npm:^1.0.0"
-  checksum: 10c0/7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/de7182bfde298e56c08a5d7ee1156f83c9af8c856bbe2248438848846a4ce544e050666bd0482e16a6006195e8be4923abd14650bef51fa0edd7f82014c2efcd
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/test-sequencer@npm:29.7.0"
+"@babel/plugin-transform-property-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
   dependencies:
-    "@jest/test-result": "npm:^29.7.0"
-    graceful-fs: "npm:^4.2.9"
-    jest-haste-map: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-  checksum: 10c0/593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/3bf3e01f7bb8215a8b6d0081b6f86fea23e3a4543b619e059a264ede028bc58cdfb0acb2c43271271915a74917effa547bc280ac636a9901fa9f2fb45623f87e
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "@jest/transform@npm:29.7.0"
+"@babel/plugin-transform-react-constant-elements@npm:^7.12.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-constant-elements@npm:7.24.1"
   dependencies:
-    "@babel/core": "npm:^7.11.6"
-    "@jest/types": "npm:^29.6.3"
-    "@jridgewell/trace-mapping": "npm:^0.3.18"
-    babel-plugin-istanbul: "npm:^6.1.1"
-    chalk: "npm:^4.0.0"
-    convert-source-map: "npm:^2.0.0"
-    fast-json-stable-stringify: "npm:^2.1.0"
-    graceful-fs: "npm:^4.2.9"
-    jest-haste-map: "npm:^29.7.0"
-    jest-regex-util: "npm:^29.6.3"
-    jest-util: "npm:^29.7.0"
-    micromatch: "npm:^4.0.4"
-    pirates: "npm:^4.0.4"
-    slash: "npm:^3.0.0"
-    write-file-atomic: "npm:^4.0.2"
-  checksum: 10c0/7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/3d1af987605ffb79f6b349862680f28bb3f09300234abe58cf20cd9f1cd3e578de0af3306244c6430126668fdf04ebbe780ac4be2c0b20e84160c57151c6519d
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "@jest/types@npm:29.6.3"
+"@babel/plugin-transform-react-display-name@npm:^7.16.0, @babel/plugin-transform-react-display-name@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.24.1"
   dependencies:
-    "@jest/schemas": "npm:^29.6.3"
-    "@types/istanbul-lib-coverage": "npm:^2.0.0"
-    "@types/istanbul-reports": "npm:^3.0.0"
-    "@types/node": "npm:*"
-    "@types/yargs": "npm:^17.0.8"
-    chalk: "npm:^4.0.0"
-  checksum: 10c0/ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/adf1a3cb0df8134533a558a9072a67e34127fd489dfe431c3348a86dd41f3e74861d5d5134bbb68f61a9cdb3f7e79b2acea1346be94ce4d3328a64e5a9e09be1
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.5":
-  version: 0.3.5
-  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.2.1"
-    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
-    "@jridgewell/trace-mapping": "npm:^0.3.24"
-  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
+    "@babel/plugin-transform-react-jsx": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/4d2e9e68383238feb873f6111df972df4a2ebf6256d6f787a8772241867efa975b3980f7d75ab7d750e7eaad4bd454e8cc6e106301fd7572dd389e553f5f69d2
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:^3.1.0":
-  version: 3.1.2
-  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
-  checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e
+"@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
+  version: 7.23.4
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.22.5"
+    "@babel/plugin-syntax-jsx": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.4"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/8851b3adc515cd91bdb06ff3a23a0f81f0069cfef79dfb3fa744da4b7a82e3555ccb6324c4fa71ecf22508db13b9ff6a0ed96675f95fc87903b9fc6afb699580
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@jridgewell/set-array@npm:1.2.1"
-  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
+"@babel/plugin-transform-react-pure-annotations@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.1"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/9eb3056fcaadd63d404fd5652b2a3f693bc4758ba753fee5b5c580c7a64346eeeb94e5a4f77a99c76f3cf06d1f1ad6c227647cd0b1219efe3d00cafa5a6e7b2a
   languageName: node
   linkType: hard
 
-"@jridgewell/source-map@npm:^0.3.3":
-  version: 0.3.6
-  resolution: "@jridgewell/source-map@npm:0.3.6"
+"@babel/plugin-transform-regenerator@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.5"
-    "@jridgewell/trace-mapping": "npm:^0.3.25"
-  checksum: 10c0/6a4ecc713ed246ff8e5bdcc1ef7c49aaa93f7463d948ba5054dda18b02dcc6a055e2828c577bcceee058f302ce1fc95595713d44f5c45e43d459f88d267f2f04
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    regenerator-transform: "npm:^0.15.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/0a333585d7c0b38d31cc549d0f3cf7c396d1d50b6588a307dc58325505ddd4f5446188bc536c4779431b396251801b3f32d6d8e87db8274bc84e8c41950737f7
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
+"@babel/plugin-transform-reserved-words@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/936d6e73cafb2cbb495f6817c6f8463288dbc9ab3c44684b931ebc1ece24f0d55dfabc1a75ba1de5b48843d0fef448dcfdbecb8485e4014f8f41d0d1440c536f
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
-  version: 0.3.25
-  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+"@babel/plugin-transform-runtime@npm:^7.16.4":
+  version: 7.24.3
+  resolution: "@babel/plugin-transform-runtime@npm:7.24.3"
   dependencies:
-    "@jridgewell/resolve-uri": "npm:^3.1.0"
-    "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
+    "@babel/helper-module-imports": "npm:^7.24.3"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.1"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/ee01967bf405d84bd95ca4089166a18fb23fe9851a6da53dcf712a7f8ba003319996f21f320d568ec76126e18adfaee978206ccda86eef7652d47cc9a052e75e
   languageName: node
   linkType: hard
 
-"@lukeed/ms@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "@lukeed/ms@npm:2.0.2"
-  checksum: 10c0/843b922717313bcde4943f478145d8bc13115b9b91d83bbaed53739b5644122984412310aed574792f4e6b492f2cbda178175f601856d310f67e14834c3f17a0
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/8273347621183aada3cf1f3019d8d5f29467ba13a75b72cb405bc7f23b7e05fd85f4edb1e4d9f0103153dddb61826a42dc24d466480d707f8932c1923a4c25fa
   languageName: node
   linkType: hard
 
-"@nodelib/fs.scandir@npm:2.1.5":
-  version: 2.1.5
-  resolution: "@nodelib/fs.scandir@npm:2.1.5"
+"@babel/plugin-transform-spread@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
   dependencies:
-    "@nodelib/fs.stat": "npm:2.0.5"
-    run-parallel: "npm:^1.1.9"
-  checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/50a0302e344546d57e5c9f4dea575f88e084352eeac4e9a3e238c41739eef2df1daf4a7ebbb3ccb7acd3447f6a5ce9938405f98bf5f5583deceb8257f5a673c9
   languageName: node
   linkType: hard
 
-"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
-  version: 2.0.5
-  resolution: "@nodelib/fs.stat@npm:2.0.5"
-  checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
+"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/786fe2ae11ef9046b9fa95677935abe495031eebf1274ad03f2054a20adea7b9dbd00336ac0b143f7924bc562e5e09793f6e8613607674b97e067d4838ccc4a0
   languageName: node
   linkType: hard
 
-"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "@nodelib/fs.walk@npm:1.2.8"
+"@babel/plugin-transform-template-literals@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
   dependencies:
-    "@nodelib/fs.scandir": "npm:2.1.5"
-    fastq: "npm:^1.6.0"
-  checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/f73bcda5488eb81c6e7a876498d9e6b72be32fca5a4d9db9053491a2d1300cd27b889b463fd2558f3cd5826a85ed00f61d81b234aa55cb5a0abf1b6fa1bd5026
   languageName: node
   linkType: hard
 
-"@npmcli/agent@npm:^2.0.0":
-  version: 2.2.2
-  resolution: "@npmcli/agent@npm:2.2.2"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.5":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.5"
   dependencies:
-    agent-base: "npm:^7.1.0"
-    http-proxy-agent: "npm:^7.0.0"
-    https-proxy-agent: "npm:^7.0.1"
-    lru-cache: "npm:^10.0.1"
-    socks-proxy-agent: "npm:^8.0.3"
-  checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/5f0b5e33a86b84d89673829ffa2b5f175e102d3d0f45917cda121bc2b3650e1e5bb7a653f8cc1059c5b3a7b2e91e1aafd6623028b96ae752715cc5c2171c96e5
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
+"@babel/plugin-transform-typescript@npm:^7.24.1":
+  version: 7.24.5
+  resolution: "@babel/plugin-transform-typescript@npm:7.24.5"
   dependencies:
-    "@gar/promisify": "npm:^1.1.3"
-    semver: "npm:^7.3.5"
-  checksum: 10c0/c50d087733d0d8df23be24f700f104b19922a28677aa66fdbe06ff6af6431cc4a5bb1e27683cbc661a5dafa9bafdc603e6a0378121506dfcd394b2b6dd76a187
+    "@babel/helper-annotate-as-pure": "npm:^7.22.5"
+    "@babel/helper-create-class-features-plugin": "npm:^7.24.5"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/plugin-syntax-typescript": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/9c1b1234215c08b1d2a7b27a8e598dfd07fbb07fd7308ef9c184f42b41bf5a119073feef5cdedca3d649e9625a340984baf5d538bc01fafedcec561de316572b
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@npmcli/fs@npm:3.1.0"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
   dependencies:
-    semver: "npm:^7.3.5"
-  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/67a72a1ed99639de6a93aead35b1993cb3f0eb178a8991fcef48732c38c9f0279c85bbe1e2e2477b85afea873e738ff0955a35057635ce67bc149038e2d8a28e
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
   dependencies:
-    mkdirp: "npm:^1.0.4"
-    rimraf: "npm:^3.0.2"
-  checksum: 10c0/11b2151e6d1de6f6eb23128de5aa8a429fd9097d839a5190cb77aa47a6b627022c42d50fa7c47a00f1c9f8f0c1560092b09b061855d293fa0741a2a94cfb174d
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/d9d9752df7d51bf9357c0bf3762fe16b8c841fca9ecf4409a16f15ccc34be06e8e71abfaee1251b7d451227e70e6b873b36f86b090efdb20f6f7de5fdb6c7a05
   languageName: node
   linkType: hard
 
-"@pkgjs/parseargs@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "@pkgjs/parseargs@npm:0.11.0"
-  checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
+"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/6046ab38e5d14ed97dbb921bd79ac1d7ad9d3286da44a48930e980b16896db2df21e093563ec3c916a630dc346639bf47c5924a33902a06fe3bbb5cdc7ef5f2f
   languageName: node
   linkType: hard
 
-"@polka/url@npm:^1.0.0-next.24":
-  version: 1.0.0-next.25
-  resolution: "@polka/url@npm:1.0.0-next.25"
-  checksum: 10c0/ef61f0a0fe94bb6e1143fc5b9d5a12e6ca9dbd2c57843ebf81db432c21b9f1005c09e8a1ef8b6d5ddfa42146ca65b640feb2d353bd0d3546da46ba59e48a5349
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.22.15"
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/b6c1f6b90afeeddf97e5713f72575787fcb7179be7b4c961869bfbc66915f66540dc49da93e4369da15596bd44b896d1eb8a50f5e1fd907abd7a1a625901006b
   languageName: node
   linkType: hard
 
-"@popperjs/core@npm:^2.11.8":
-  version: 2.11.8
-  resolution: "@popperjs/core@npm:2.11.8"
-  checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
+"@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.16.4, @babel/preset-env@npm:^7.8.4":
+  version: 7.24.5
+  resolution: "@babel/preset-env@npm:7.24.5"
+  dependencies:
+    "@babel/compat-data": "npm:^7.24.4"
+    "@babel/helper-compilation-targets": "npm:^7.23.6"
+    "@babel/helper-plugin-utils": "npm:^7.24.5"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1"
+    "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
+    "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
+    "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.24.1"
+    "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
+    "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.24.5"
+    "@babel/plugin-transform-class-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-class-static-block": "npm:^7.24.4"
+    "@babel/plugin-transform-classes": "npm:^7.24.5"
+    "@babel/plugin-transform-computed-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.24.5"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.24.1"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.24.1"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.24.1"
+    "@babel/plugin-transform-for-of": "npm:^7.24.1"
+    "@babel/plugin-transform-function-name": "npm:^7.24.1"
+    "@babel/plugin-transform-json-strings": "npm:^7.24.1"
+    "@babel/plugin-transform-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.24.1"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-amd": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-umd": "npm:^7.24.1"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5"
+    "@babel/plugin-transform-new-target": "npm:^7.24.1"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.24.1"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.24.1"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.24.5"
+    "@babel/plugin-transform-object-super": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.24.1"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.24.5"
+    "@babel/plugin-transform-parameters": "npm:^7.24.5"
+    "@babel/plugin-transform-private-methods": "npm:^7.24.1"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.24.5"
+    "@babel/plugin-transform-property-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.24.1"
+    "@babel/plugin-transform-reserved-words": "npm:^7.24.1"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.24.1"
+    "@babel/plugin-transform-spread": "npm:^7.24.1"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-template-literals": "npm:^7.24.1"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.24.5"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.24.1"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.24.1"
+    "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
+    babel-plugin-polyfill-corejs3: "npm:^0.10.4"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
+    core-js-compat: "npm:^3.31.0"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/2cc0edae09205d6409a75d02e53aaa1c590e89adbb7b389019c7b75e4c47b6b63eeb1a816df5c42b672ce410747e7ddc23b6747e8e41a6c95d6fa00c665509e2
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.27.8":
-  version: 0.27.8
-  resolution: "@sinclair/typebox@npm:0.27.8"
-  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
+"@babel/preset-modules@npm:0.1.6-no-external-plugins":
+  version: 0.1.6-no-external-plugins
+  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.0.0"
+    "@babel/types": "npm:^7.4.4"
+    esutils: "npm:^2.0.2"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+  checksum: 10c0/9d02f70d7052446c5f3a4fb39e6b632695fb6801e46d31d7f7c5001f7c18d31d1ea8369212331ca7ad4e7877b73231f470b0d559162624128f1b80fe591409e6
   languageName: node
   linkType: hard
 
-"@sinonjs/commons@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@sinonjs/commons@npm:3.0.1"
+"@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.16.0":
+  version: 7.24.1
+  resolution: "@babel/preset-react@npm:7.24.1"
   dependencies:
-    type-detect: "npm:4.0.8"
-  checksum: 10c0/1227a7b5bd6c6f9584274db996d7f8cee2c8c350534b9d0141fc662eaf1f292ea0ae3ed19e5e5271c8fd390d27e492ca2803acd31a1978be2cdc6be0da711403
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-transform-react-display-name": "npm:^7.24.1"
+    "@babel/plugin-transform-react-jsx": "npm:^7.23.4"
+    "@babel/plugin-transform-react-jsx-development": "npm:^7.22.5"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/a842abc5a024ed68a0ce4c1244607d40165cb6f8cf1817ebda282e470f20302d81c6a61cb41c1a31aa6c4e99ce93df4dd9e998a8ded1417c25d7480f0e14103a
   languageName: node
   linkType: hard
 
-"@sinonjs/fake-timers@npm:^10.0.2":
-  version: 10.3.0
-  resolution: "@sinonjs/fake-timers@npm:10.3.0"
+"@babel/preset-typescript@npm:^7.16.0":
+  version: 7.24.1
+  resolution: "@babel/preset-typescript@npm:7.24.1"
   dependencies:
-    "@sinonjs/commons": "npm:^3.0.0"
-  checksum: 10c0/2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
+    "@babel/helper-plugin-utils": "npm:^7.24.0"
+    "@babel/helper-validator-option": "npm:^7.23.5"
+    "@babel/plugin-syntax-jsx": "npm:^7.24.1"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.24.1"
+    "@babel/plugin-transform-typescript": "npm:^7.24.1"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/0033dc6fbc898ed0d8017c83a2dd5e095c82909e2f83e48cf9f305e3e9287148758c179ad90f27912cf98ca68bfec3643c57c70c0ca34d3a6c50dc8243aef406
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-darwin-arm64@npm:1.4.11"
-  conditions: os=darwin & cpu=arm64
+"@babel/regjsgen@npm:^0.8.0":
+  version: 0.8.0
+  resolution: "@babel/regjsgen@npm:0.8.0"
+  checksum: 10c0/4f3ddd8c7c96d447e05c8304c1d5ba3a83fcabd8a716bc1091c2f31595cdd43a3a055fff7cb5d3042b8cb7d402d78820fcb4e05d896c605a7d8bcf30f2424c4a
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-darwin-x64@npm:1.4.11"
-  conditions: os=darwin & cpu=x64
+"@babel/runtime-corejs3@npm:^7.10.2":
+  version: 7.24.5
+  resolution: "@babel/runtime-corejs3@npm:7.24.5"
+  dependencies:
+    core-js-pure: "npm:^3.30.2"
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10c0/61a16b8031d312752676527746d6a70c759d578cadfdee8c7bea976e848793aa08361ba14602a9ebb3ed60af225bbdff316500b4961df91cb246f2055764f208
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.4.11"
-  conditions: os=linux & cpu=arm
+"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+  version: 7.24.5
+  resolution: "@babel/runtime@npm:7.24.5"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10c0/05730e43e8ba6550eae9fd4fb5e7d9d3cb91140379425abcb2a1ff9cebad518a280d82c4c4b0f57ada26a863106ac54a748d90c775790c0e2cd0ddd85ccdf346
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.4.11"
-  conditions: os=linux & cpu=arm64 & libc=glibc
+"@babel/template@npm:^7.10.4, @babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
+  version: 7.24.0
+  resolution: "@babel/template@npm:7.24.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.23.5"
+    "@babel/parser": "npm:^7.24.0"
+    "@babel/types": "npm:^7.24.0"
+  checksum: 10c0/9d3dd8d22fe1c36bc3bdef6118af1f4b030aaf6d7d2619f5da203efa818a2185d717523486c111de8d99a8649ddf4bbf6b2a7a64962d8411cf6a8fa89f010e54
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-linux-arm64-musl@npm:1.4.11"
-  conditions: os=linux & cpu=arm64 & libc=musl
+"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.12.1, @babel/traverse@npm:^7.24.5, @babel/traverse@npm:^7.7.0":
+  version: 7.24.5
+  resolution: "@babel/traverse@npm:7.24.5"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.2"
+    "@babel/generator": "npm:^7.24.5"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.24.5"
+    "@babel/parser": "npm:^7.24.5"
+    "@babel/types": "npm:^7.24.5"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10c0/3f22534bc2b2ed9208e55ef48af3b32939032b23cb9dc4037447cb108640df70bbb0b9fea86e9c58648949fdc2cb14e89aa79ffa3c62a5dd43459a52fe8c01d1
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-linux-x64-gnu@npm:1.4.11"
-  conditions: os=linux & cpu=x64 & libc=glibc
+"@babel/traverse@npm:^7.24.1":
+  version: 7.24.1
+  resolution: "@babel/traverse@npm:7.24.1"
+  dependencies:
+    "@babel/code-frame": "npm:^7.24.1"
+    "@babel/generator": "npm:^7.24.1"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/parser": "npm:^7.24.1"
+    "@babel/types": "npm:^7.24.0"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10c0/c087b918f6823776537ba246136c70e7ce0719fc05361ebcbfd16f4e6f2f6f1f8f4f9167f1d9b675f27d12074839605189cc9d689de20b89a85e7c140f23daab
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-linux-x64-musl@npm:1.4.11"
-  conditions: os=linux & cpu=x64 & libc=musl
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
+  version: 7.24.0
+  resolution: "@babel/types@npm:7.24.0"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.23.4"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/777a0bb5dbe038ca4c905fdafb1cdb6bdd10fe9d63ce13eca0bd91909363cbad554a53dc1f902004b78c1dcbc742056f877f2c99eeedff647333b1fadf51235d
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.4.11"
-  conditions: os=win32 & cpu=arm64
+"@babel/types@npm:^7.12.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.22.15, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.5, @babel/types@npm:^7.4.4, @babel/types@npm:^7.7.0":
+  version: 7.24.5
+  resolution: "@babel/types@npm:7.24.5"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.24.1"
+    "@babel/helper-validator-identifier": "npm:^7.24.5"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.4.11"
-  conditions: os=win32 & cpu=ia32
+"@bcoe/v8-coverage@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "@bcoe/v8-coverage@npm:0.2.3"
+  checksum: 10c0/6b80ae4cb3db53f486da2dc63b6e190a74c8c3cca16bb2733f234a0b6a9382b09b146488ae08e2b22cf00f6c83e20f3e040a2f7894f05c045c946d6a090b1d52
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core-win32-x64-msvc@npm:1.4.11"
-  conditions: os=win32 & cpu=x64
+"@cnakazawa/watch@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "@cnakazawa/watch@npm:1.0.4"
+  dependencies:
+    exec-sh: "npm:^0.3.2"
+    minimist: "npm:^1.2.0"
+  bin:
+    watch: cli.js
+  checksum: 10c0/8678b6f582bdc5ffe59c0d45c2ad21f4ea1d162ec7ddb32e85078fca481c26958f27bcdef6007b8e9a066da090ccf9d31e1753f8de1e5f32466a04227d70dc31
   languageName: node
   linkType: hard
 
-"@swc/core@npm:^1.4.11":
-  version: 1.4.11
-  resolution: "@swc/core@npm:1.4.11"
-  dependencies:
-    "@swc/core-darwin-arm64": "npm:1.4.11"
-    "@swc/core-darwin-x64": "npm:1.4.11"
-    "@swc/core-linux-arm-gnueabihf": "npm:1.4.11"
-    "@swc/core-linux-arm64-gnu": "npm:1.4.11"
-    "@swc/core-linux-arm64-musl": "npm:1.4.11"
-    "@swc/core-linux-x64-gnu": "npm:1.4.11"
-    "@swc/core-linux-x64-musl": "npm:1.4.11"
-    "@swc/core-win32-arm64-msvc": "npm:1.4.11"
-    "@swc/core-win32-ia32-msvc": "npm:1.4.11"
-    "@swc/core-win32-x64-msvc": "npm:1.4.11"
-    "@swc/counter": "npm:^0.1.2"
-    "@swc/types": "npm:^0.1.5"
-  peerDependencies:
-    "@swc/helpers": ^0.5.0
-  dependenciesMeta:
-    "@swc/core-darwin-arm64":
-      optional: true
-    "@swc/core-darwin-x64":
-      optional: true
-    "@swc/core-linux-arm-gnueabihf":
-      optional: true
-    "@swc/core-linux-arm64-gnu":
-      optional: true
-    "@swc/core-linux-arm64-musl":
-      optional: true
-    "@swc/core-linux-x64-gnu":
-      optional: true
-    "@swc/core-linux-x64-musl":
-      optional: true
-    "@swc/core-win32-arm64-msvc":
-      optional: true
-    "@swc/core-win32-ia32-msvc":
-      optional: true
-    "@swc/core-win32-x64-msvc":
-      optional: true
-  peerDependenciesMeta:
-    "@swc/helpers":
-      optional: true
-  checksum: 10c0/7860541ba95fc15e6abe1993eb87fdfe05aad3418862b3f790f26cf1de1284e387300020ac60a8487404fd4364af2cc7f9e8a3c4dba49a8683c5d08cd4cb95c4
+"@csstools/convert-colors@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@csstools/convert-colors@npm:1.4.0"
+  checksum: 10c0/6a6c222f773e5fca9b17fb4a27b070e2762aae62d267c0ec764e14bf27ff9e1e54627866f07073f31fdb74cdb1f5f9ddf2bbcbd0f8195df1f6fc3b0639553550
   languageName: node
   linkType: hard
 
-"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3":
-  version: 0.1.3
-  resolution: "@swc/counter@npm:0.1.3"
-  checksum: 10c0/8424f60f6bf8694cfd2a9bca45845bce29f26105cda8cf19cdb9fd3e78dc6338699e4db77a89ae449260bafa1cc6bec307e81e7fb96dbf7dcfce0eea55151356
+"@csstools/normalize.css@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "@csstools/normalize.css@npm:10.1.0"
+  checksum: 10c0/baf1fd65022a32eb02a14c6e602a3a5920db7318627bdd4b8f5247e9971f469ff97653996624d7a3570e40aee4bd304b7a5656d847cee3b435e9631d8d569e24
   languageName: node
   linkType: hard
 
-"@swc/jest@npm:^0.2.36":
-  version: 0.2.36
-  resolution: "@swc/jest@npm:0.2.36"
-  dependencies:
-    "@jest/create-cache-key-function": "npm:^29.7.0"
-    "@swc/counter": "npm:^0.1.3"
-    jsonc-parser: "npm:^3.2.0"
-  peerDependencies:
-    "@swc/core": "*"
-  checksum: 10c0/7f1993f9201420bb499c92ab28797352bcbf9e3a6c7b5a1806fdc34c9c3b46ea9e5b2f070c0e13fcf7f3c3fadbbc38777840baabb178f589bf1f67543763adb6
+"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0":
+  version: 0.5.7
+  resolution: "@discoveryjs/json-ext@npm:0.5.7"
+  checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.5":
-  version: 0.1.6
-  resolution: "@swc/types@npm:0.1.6"
-  dependencies:
-    "@swc/counter": "npm:^0.1.3"
-  checksum: 10c0/043a0e56d69db8733827ad69db55d0ffbd6976fd24ef629a488e57040067ac84d057a57e08bc5a3db545d44b01d6aa43c22df1152c637af450d366e57cde6e22
+"@esbuild/aix-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@tootallnate/once@npm:2":
-  version: 2.0.0
-  resolution: "@tootallnate/once@npm:2.0.0"
-  checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
+"@esbuild/android-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm64@npm:0.20.2"
+  conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.1.14":
-  version: 7.20.5
-  resolution: "@types/babel__core@npm:7.20.5"
-  dependencies:
-    "@babel/parser": "npm:^7.20.7"
-    "@babel/types": "npm:^7.20.7"
-    "@types/babel__generator": "npm:*"
-    "@types/babel__template": "npm:*"
-    "@types/babel__traverse": "npm:*"
-  checksum: 10c0/bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
+"@esbuild/android-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-arm@npm:0.20.2"
+  conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@types/babel__generator@npm:*":
-  version: 7.6.8
-  resolution: "@types/babel__generator@npm:7.6.8"
-  dependencies:
-    "@babel/types": "npm:^7.0.0"
-  checksum: 10c0/f0ba105e7d2296bf367d6e055bb22996886c114261e2cb70bf9359556d0076c7a57239d019dee42bb063f565bade5ccb46009bce2044b2952d964bf9a454d6d2
+"@esbuild/android-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/android-x64@npm:0.20.2"
+  conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/babel__template@npm:*":
-  version: 7.4.4
-  resolution: "@types/babel__template@npm:7.4.4"
-  dependencies:
-    "@babel/parser": "npm:^7.1.0"
-    "@babel/types": "npm:^7.0.0"
-  checksum: 10c0/cc84f6c6ab1eab1427e90dd2b76ccee65ce940b778a9a67be2c8c39e1994e6f5bbc8efa309f6cea8dc6754994524cd4d2896558df76d92e7a1f46ecffee7112b
+"@esbuild/darwin-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
-  version: 7.20.5
-  resolution: "@types/babel__traverse@npm:7.20.5"
-  dependencies:
-    "@babel/types": "npm:^7.20.7"
-  checksum: 10c0/033abcb2f4c084ad33e30c3efaad82161240f351e3c71b6154ed289946b33b363696c0fbd42502b68e4582a87413c418321f40eb1ea863e34fe525641345e05b
+"@esbuild/darwin-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/darwin-x64@npm:0.20.2"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.7
-  resolution: "@types/eslint-scope@npm:3.7.7"
-  dependencies:
-    "@types/eslint": "npm:*"
-    "@types/estree": "npm:*"
-  checksum: 10c0/a0ecbdf2f03912679440550817ff77ef39a30fa8bfdacaf6372b88b1f931828aec392f52283240f0d648cf3055c5ddc564544a626bcf245f3d09fcb099ebe3cc
+"@esbuild/freebsd-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+  conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:*":
-  version: 8.56.7
-  resolution: "@types/eslint@npm:8.56.7"
-  dependencies:
-    "@types/estree": "npm:*"
-    "@types/json-schema": "npm:*"
-  checksum: 10c0/159bb5ae2f78d905b9263240c75d07b60c26e1bcaecee8c775a7bb0cf7362f5dcdd286259ba6289ab62f989b87048090b2420619f7170a0abbd83cb68b5e0699
+"@esbuild/freebsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+  conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "@types/estree@npm:1.0.5"
-  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
+"@esbuild/linux-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm64@npm:0.20.2"
+  conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@types/graceful-fs@npm:^4.1.3":
-  version: 4.1.9
-  resolution: "@types/graceful-fs@npm:4.1.9"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10c0/235d2fc69741448e853333b7c3d1180a966dd2b8972c8cbcd6b2a0c6cd7f8d582ab2b8e58219dbc62cce8f1b40aa317ff78ea2201cdd8249da5025adebed6f0b
+"@esbuild/linux-arm@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-arm@npm:0.20.2"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
-  version: 2.0.6
-  resolution: "@types/istanbul-lib-coverage@npm:2.0.6"
-  checksum: 10c0/3948088654f3eeb45363f1db158354fb013b362dba2a5c2c18c559484d5eb9f6fd85b23d66c0a7c2fcfab7308d0a585b14dadaca6cc8bf89ebfdc7f8f5102fb7
+"@esbuild/linux-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ia32@npm:0.20.2"
+  conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
-"@types/istanbul-lib-report@npm:*":
-  version: 3.0.3
-  resolution: "@types/istanbul-lib-report@npm:3.0.3"
-  dependencies:
-    "@types/istanbul-lib-coverage": "npm:*"
-  checksum: 10c0/247e477bbc1a77248f3c6de5dadaae85ff86ac2d76c5fc6ab1776f54512a745ff2a5f791d22b942e3990ddbd40f3ef5289317c4fca5741bedfaa4f01df89051c
+"@esbuild/linux-loong64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-loong64@npm:0.20.2"
+  conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
-"@types/istanbul-reports@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/istanbul-reports@npm:3.0.4"
-  dependencies:
-    "@types/istanbul-lib-report": "npm:*"
-  checksum: 10c0/1647fd402aced5b6edac87274af14ebd6b3a85447ef9ad11853a70fd92a98d35f81a5d3ea9fcb5dbb5834e800c6e35b64475e33fcae6bfa9acc70d61497c54ee
+"@esbuild/linux-mips64el@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+  conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.12":
-  version: 29.5.12
-  resolution: "@types/jest@npm:29.5.12"
-  dependencies:
-    expect: "npm:^29.0.0"
-    pretty-format: "npm:^29.0.0"
-  checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
+"@esbuild/linux-ppc64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+  conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@types/jsdom@npm:^20.0.0":
-  version: 20.0.1
-  resolution: "@types/jsdom@npm:20.0.1"
-  dependencies:
-    "@types/node": "npm:*"
-    "@types/tough-cookie": "npm:*"
-    parse5: "npm:^7.0.0"
-  checksum: 10c0/3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
+"@esbuild/linux-riscv64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+  conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.15
-  resolution: "@types/json-schema@npm:7.0.15"
-  checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
+"@esbuild/linux-s390x@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-s390x@npm:0.20.2"
+  conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
-"@types/marked@npm:4.3.2":
-  version: 4.3.2
-  resolution: "@types/marked@npm:4.3.2"
-  checksum: 10c0/6f44d28da5c940a719d6c6aca41e33f49c5fe957f7972939cc1cbb47d045951f4d969f382d655345d0463e47db1994635d2862018716fcef2fa85ceeceb116e7
+"@esbuild/linux-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/linux-x64@npm:0.20.2"
+  conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:^20.12.3":
-  version: 20.12.3
-  resolution: "@types/node@npm:20.12.3"
-  dependencies:
-    undici-types: "npm:~5.26.4"
-  checksum: 10c0/45c8485a0e55276b42c26ba1df6c480e4e1a3a3abbf4ea0ff6b4e2823c4f77e32b7e166d4263d464f207cfea5bd4de8879b8df2c7132a727b0346a30191d6bea
+"@esbuild/netbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+  conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/prop-types@npm:*":
-  version: 15.7.12
-  resolution: "@types/prop-types@npm:15.7.12"
-  checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
+"@esbuild/openbsd-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+  conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:^18.2.24":
-  version: 18.2.24
-  resolution: "@types/react-dom@npm:18.2.24"
-  dependencies:
-    "@types/react": "npm:*"
-  checksum: 10c0/9ec38e5ab4727c56ef17bd8e938ead88748ba19db314b8d9807714a5cae430f5b799514667b221b4f2dc8d9b4ca17dd1c3da8c41c083c2de9eddcc31bec6b8ff
+"@esbuild/sunos-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/sunos-x64@npm:0.20.2"
+  conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:^18.2.74":
-  version: 18.2.74
-  resolution: "@types/react@npm:18.2.74"
-  dependencies:
-    "@types/prop-types": "npm:*"
-    csstype: "npm:^3.0.2"
-  checksum: 10c0/347e38b4c5dc20d50ff71bf04b7caaef490e5ff695e74a0088a13fbb2a0c5d125a5ecfd142adfa30f0176da0e2734942c91ba61d95ce269c43b3265bd7379361
+"@esbuild/win32-arm64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-arm64@npm:0.20.2"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.5.0":
-  version: 7.5.8
-  resolution: "@types/semver@npm:7.5.8"
-  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
+"@esbuild/win32-ia32@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+  conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@types/stack-utils@npm:^2.0.0":
-  version: 2.0.3
-  resolution: "@types/stack-utils@npm:2.0.3"
-  checksum: 10c0/1f4658385ae936330581bcb8aa3a066df03867d90281cdf89cc356d404bd6579be0f11902304e1f775d92df22c6dd761d4451c804b0a4fba973e06211e9bd77c
+"@esbuild/win32-x64@npm:0.20.2":
+  version: 0.20.2
+  resolution: "@esbuild/win32-x64@npm:0.20.2"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@types/tough-cookie@npm:*":
-  version: 4.0.5
-  resolution: "@types/tough-cookie@npm:4.0.5"
-  checksum: 10c0/68c6921721a3dcb40451543db2174a145ef915bc8bcbe7ad4e59194a0238e776e782b896c7a59f4b93ac6acefca9161fccb31d1ce3b3445cb6faa467297fb473
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
+  dependencies:
+    eslint-visitor-keys: "npm:^3.3.0"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e
   languageName: node
   linkType: hard
 
-"@types/webpack-env@npm:^1.18.4":
-  version: 1.18.4
-  resolution: "@types/webpack-env@npm:1.18.4"
-  checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0
+"@eslint-community/regexpp@npm:^4.6.1":
+  version: 4.10.0
+  resolution: "@eslint-community/regexpp@npm:4.10.0"
+  checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4
   languageName: node
   linkType: hard
 
-"@types/yargs-parser@npm:*":
-  version: 21.0.3
-  resolution: "@types/yargs-parser@npm:21.0.3"
-  checksum: 10c0/e71c3bd9d0b73ca82e10bee2064c384ab70f61034bbfb78e74f5206283fc16a6d85267b606b5c22cb2a3338373586786fed595b2009825d6a9115afba36560a0
-  languageName: node
-  linkType: hard
-
-"@types/yargs@npm:^17.0.8":
-  version: 17.0.32
-  resolution: "@types/yargs@npm:17.0.32"
+"@eslint/eslintrc@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@eslint/eslintrc@npm:0.4.3"
   dependencies:
-    "@types/yargs-parser": "npm:*"
-  checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
+    ajv: "npm:^6.12.4"
+    debug: "npm:^4.1.1"
+    espree: "npm:^7.3.0"
+    globals: "npm:^13.9.0"
+    ignore: "npm:^4.0.6"
+    import-fresh: "npm:^3.2.1"
+    js-yaml: "npm:^3.13.1"
+    minimatch: "npm:^3.0.4"
+    strip-json-comments: "npm:^3.1.1"
+  checksum: 10c0/0eed93369f72ef044686d07824742121f9b95153ff34f4614e4e69d64332ee68c84eb70da851a9005bb76b3d1d64ad76c2e6293a808edc0f7dfb883689ca136d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/parser@npm:7.5.0"
+"@eslint/eslintrc@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@eslint/eslintrc@npm:2.1.4"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:7.5.0"
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/typescript-estree": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
-    debug: "npm:^4.3.4"
-  peerDependencies:
-    eslint: ^8.56.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda
+    ajv: "npm:^6.12.4"
+    debug: "npm:^4.3.2"
+    espree: "npm:^9.6.0"
+    globals: "npm:^13.19.0"
+    ignore: "npm:^5.2.0"
+    import-fresh: "npm:^3.2.1"
+    js-yaml: "npm:^4.1.0"
+    minimatch: "npm:^3.1.2"
+    strip-json-comments: "npm:^3.1.1"
+  checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.5.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
-  checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd
+"@eslint/js@npm:8.57.0":
+  version: 8.57.0
+  resolution: "@eslint/js@npm:8.57.0"
+  checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/types@npm:7.5.0"
-  checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3
+"@fastify/accept-negotiator@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "@fastify/accept-negotiator@npm:1.1.0"
+  checksum: 10c0/1cb9a298c992b812869158ddc6093557a877b30e5f77618a7afea985a0667c50bc7113593bf0f7f9dc9b82b94c16e8ab127a0afc3efde6677fd645539f6d08e5
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.5.0"
+"@fastify/ajv-compiler@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "@fastify/ajv-compiler@npm:1.1.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/visitor-keys": "npm:7.5.0"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:9.0.3"
-    semver: "npm:^7.5.4"
-    ts-api-utils: "npm:^1.0.1"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd
+    ajv: "npm:^6.12.6"
+  checksum: 10c0/e8c4c468f74db2d5d14ce3e765e8317e302413960f63474e6ef18039b1d711e2712e87808035f3e075b9fdf8f47af1b481979eb1ca8d82e0773ff6a9fd49d903
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:^7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/utils@npm:7.5.0"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.12"
-    "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:7.5.0"
-    "@typescript-eslint/types": "npm:7.5.0"
-    "@typescript-eslint/typescript-estree": "npm:7.5.0"
-    semver: "npm:^7.5.4"
-  peerDependencies:
-    eslint: ^8.56.0
-  checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24
+"@fastify/error@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@fastify/error@npm:2.0.0"
+  checksum: 10c0/32b98cb663e462e3d60a31a46306481f7b84657cfdd301dcd7fa9f77389f180e51c641dc4c6900d423daa264e70172bf23493fae031b6af4844b6cc7f17fe77d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.5.0":
-  version: 7.5.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.5.0"
+"@fastify/send@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "@fastify/send@npm:2.1.0"
   dependencies:
-    "@typescript-eslint/types": "npm:7.5.0"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317
-  languageName: node
-  linkType: hard
-
-"@ungap/structured-clone@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
+    "@lukeed/ms": "npm:^2.0.1"
+    escape-html: "npm:~1.0.3"
+    fast-decode-uri-component: "npm:^1.0.1"
+    http-errors: "npm:2.0.0"
+    mime: "npm:^3.0.0"
+  checksum: 10c0/0e1c10022660fa1f1959b7c414d1be2c47ab42be1da8e21cd72a4df3104c516fdf7b590ee67f897037dd4c85b716fac63929e894d7699623549646604f6db14b
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/ast@npm:1.12.1"
+"@fastify/static@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "@fastify/static@npm:6.12.0"
   dependencies:
-    "@webassemblyjs/helper-numbers": "npm:1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-  checksum: 10c0/ba7f2b96c6e67e249df6156d02c69eb5f1bd18d5005303cdc42accb053bebbbde673826e54db0437c9748e97abd218366a1d13fa46859b23cde611b6b409998c
+    "@fastify/accept-negotiator": "npm:^1.0.0"
+    "@fastify/send": "npm:^2.0.0"
+    content-disposition: "npm:^0.5.3"
+    fastify-plugin: "npm:^4.0.0"
+    glob: "npm:^8.0.1"
+    p-limit: "npm:^3.1.0"
+  checksum: 10c0/9248c9851c4bb24965e88eb2f0825fda2b2b08ddb83aa5f08e529b8a522cf20978f81e8e4837e2cb550b39ea433790b0fd82db4b2f0673133325e265c9099fff
   languageName: node
   linkType: hard
 
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
-  checksum: 10c0/37fe26f89e18e4ca0e7d89cfe3b9f17cfa327d7daf906ae01400416dbb2e33c8a125b4dc55ad7ff405e5fcfb6cf0d764074c9bc532b9a31a71e762be57d2ea0a
+"@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@gar/promisify@npm:1.1.3"
+  checksum: 10c0/0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-api-error@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
-  checksum: 10c0/a681ed51863e4ff18cf38d223429f414894e5f7496856854d9a886eeddcee32d7c9f66290f2919c9bb6d2fc2b2fae3f989b6a1e02a81e829359738ea0c4d371a
+"@hapi/address@npm:2.x.x":
+  version: 2.1.4
+  resolution: "@hapi/address@npm:2.1.4"
+  checksum: 10c0/d43068dd090fa1cb9324232b8cbe3235cd9106d5b8f5280262bddff27e95f383bee887bd30931f7765e10b111169681b92ff6ae46cc608686e65a17315f5c4bb
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-buffer@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/helper-buffer@npm:1.12.1"
-  checksum: 10c0/0270724afb4601237410f7fd845ab58ccda1d5456a8783aadfb16eaaf3f2c9610c28e4a5bcb6ad880cde5183c82f7f116d5ccfc2310502439d33f14b6888b48a
+"@hapi/bourne@npm:1.x.x":
+  version: 1.3.2
+  resolution: "@hapi/bourne@npm:1.3.2"
+  checksum: 10c0/c0f22d8577e36a86b12de7fd2356cb373a509c859ccdca3e73b017ade85fa7510235c2da46e32a530bee241ee056f7dac5af3f764585148694315d0847a20a8a
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-numbers@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser": "npm:1.11.6"
-    "@webassemblyjs/helper-api-error": "npm:1.11.6"
-    "@xtuc/long": "npm:4.2.2"
-  checksum: 10c0/c7d5afc0ff3bd748339b466d8d2f27b908208bf3ff26b2e8e72c39814479d486e0dca6f3d4d776fd9027c1efe05b5c0716c57a23041eb34473892b2731c33af3
+"@hapi/hoek@npm:8.x.x, @hapi/hoek@npm:^8.3.0":
+  version: 8.5.1
+  resolution: "@hapi/hoek@npm:8.5.1"
+  checksum: 10c0/3279747618d3be88e384af2be9aff8366dd0cbdba61d37f162d896fe4432f90b3986f96f0e5815429a72e7b6b7293429a4aaff42c234e42ee6a66bb1f9fb14dd
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
-  checksum: 10c0/79d2bebdd11383d142745efa32781249745213af8e022651847382685ca76709f83e1d97adc5f0d3c2b8546bf02864f8b43a531fdf5ca0748cb9e4e0ef2acaa5
+"@hapi/joi@npm:^15.1.0":
+  version: 15.1.1
+  resolution: "@hapi/joi@npm:15.1.1"
+  dependencies:
+    "@hapi/address": "npm:2.x.x"
+    "@hapi/bourne": "npm:1.x.x"
+    "@hapi/hoek": "npm:8.x.x"
+    "@hapi/topo": "npm:3.x.x"
+  checksum: 10c0/85170aa4a7d014d66b9db5a403d0790153756edfae52e0c6012309991b1ca10ed43700b28e68aa0b438704e0f7377b20bc212be01ac7cf64028a2fc8debb4da8
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1"
+"@hapi/topo@npm:3.x.x":
+  version: 3.1.6
+  resolution: "@hapi/topo@npm:3.1.6"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@webassemblyjs/helper-buffer": "npm:1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/wasm-gen": "npm:1.12.1"
-  checksum: 10c0/0546350724d285ae3c26e6fc444be4c3b5fb824f3be0ec8ceb474179dc3f4430336dd2e36a44b3e3a1a6815960e5eec98cd9b3a8ec66dc53d86daedd3296a6a2
+    "@hapi/hoek": "npm:^8.3.0"
+  checksum: 10c0/9948100dc6a3081bf29e88c7c2657a1612e46fe701d6f0cf5a5d3d656344c9cc6199d5489c563f231b65213288293673dec7d32845c59882a0f26c07dc461980
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
+"@humanwhocodes/config-array@npm:^0.11.14":
+  version: 0.11.14
+  resolution: "@humanwhocodes/config-array@npm:0.11.14"
   dependencies:
-    "@xtuc/ieee754": "npm:^1.2.0"
-  checksum: 10c0/59de0365da450322c958deadade5ec2d300c70f75e17ae55de3c9ce564deff5b429e757d107c7ec69bd0ba169c6b6cc2ff66293ab7264a7053c829b50ffa732f
+    "@humanwhocodes/object-schema": "npm:^2.0.2"
+    debug: "npm:^4.3.1"
+    minimatch: "npm:^3.0.5"
+  checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/leb128@npm:1.11.6"
+"@humanwhocodes/config-array@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@humanwhocodes/config-array@npm:0.5.0"
   dependencies:
-    "@xtuc/long": "npm:4.2.2"
-  checksum: 10c0/cb344fc04f1968209804de4da018679c5d4708a03b472a33e0fa75657bb024978f570d3ccf9263b7f341f77ecaa75d0e051b9cd4b7bb17a339032cfd1c37f96e
+    "@humanwhocodes/object-schema": "npm:^1.2.0"
+    debug: "npm:^4.1.1"
+    minimatch: "npm:^3.0.4"
+  checksum: 10c0/217fac9e03492361825a2bf761d4bb7ec6d10002a10f7314142245eb13ac9d123523d24d5619c3c4159af215c7b3e583ed386108e227014bef4efbf9caca8ccc
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.11.6":
-  version: 1.11.6
-  resolution: "@webassemblyjs/utf8@npm:1.11.6"
-  checksum: 10c0/14d6c24751a89ad9d801180b0d770f30a853c39f035a15fbc96266d6ac46355227abd27a3fd2eeaa97b4294ced2440a6b012750ae17bafe1a7633029a87b6bee
+"@humanwhocodes/module-importer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@humanwhocodes/module-importer@npm:1.0.1"
+  checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-edit@npm:^1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/wasm-edit@npm:1.12.1"
-  dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@webassemblyjs/helper-buffer": "npm:1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/helper-wasm-section": "npm:1.12.1"
-    "@webassemblyjs/wasm-gen": "npm:1.12.1"
-    "@webassemblyjs/wasm-opt": "npm:1.12.1"
-    "@webassemblyjs/wasm-parser": "npm:1.12.1"
-    "@webassemblyjs/wast-printer": "npm:1.12.1"
-  checksum: 10c0/972f5e6c522890743999e0ed45260aae728098801c6128856b310dd21f1ee63435fc7b518e30e0ba1cdafd0d1e38275829c1e4451c3536a1d9e726e07a5bba0b
+"@humanwhocodes/object-schema@npm:^1.2.0":
+  version: 1.2.1
+  resolution: "@humanwhocodes/object-schema@npm:1.2.1"
+  checksum: 10c0/c3c35fdb70c04a569278351c75553e293ae339684ed75895edc79facc7276e351115786946658d78133130c0cca80e57e2203bc07f8fa7fe7980300e8deef7db
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/wasm-gen@npm:1.12.1"
-  dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/ieee754": "npm:1.11.6"
-    "@webassemblyjs/leb128": "npm:1.11.6"
-    "@webassemblyjs/utf8": "npm:1.11.6"
-  checksum: 10c0/1e257288177af9fa34c69cab94f4d9036ebed611f77f3897c988874e75182eeeec759c79b89a7a49dd24624fc2d3d48d5580b62b67c4a1c9bfbdcd266b281c16
+"@humanwhocodes/object-schema@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "@humanwhocodes/object-schema@npm:2.0.3"
+  checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/wasm-opt@npm:1.12.1"
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@webassemblyjs/helper-buffer": "npm:1.12.1"
-    "@webassemblyjs/wasm-gen": "npm:1.12.1"
-    "@webassemblyjs/wasm-parser": "npm:1.12.1"
-  checksum: 10c0/992a45e1f1871033c36987459436ab4e6430642ca49328e6e32a13de9106fe69ae6c0ac27d7050efd76851e502d11cd1ac0e06b55655dfa889ad82f11a2712fb
+    string-width: "npm:^5.1.2"
+    string-width-cjs: "npm:string-width@^4.2.0"
+    strip-ansi: "npm:^7.0.1"
+    strip-ansi-cjs: "npm:strip-ansi@^6.0.1"
+    wrap-ansi: "npm:^8.1.0"
+    wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0"
+  checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/wasm-parser@npm:1.12.1"
+"@istanbuljs/load-nyc-config@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@webassemblyjs/helper-api-error": "npm:1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
-    "@webassemblyjs/ieee754": "npm:1.11.6"
-    "@webassemblyjs/leb128": "npm:1.11.6"
-    "@webassemblyjs/utf8": "npm:1.11.6"
-  checksum: 10c0/e85cec1acad07e5eb65b92d37c8e6ca09c6ca50d7ca58803a1532b452c7321050a0328c49810c337cc2dfd100c5326a54d5ebd1aa5c339ebe6ef10c250323a0e
+    camelcase: "npm:^5.3.1"
+    find-up: "npm:^4.1.0"
+    get-package-type: "npm:^0.1.0"
+    js-yaml: "npm:^3.13.1"
+    resolve-from: "npm:^5.0.0"
+  checksum: 10c0/dd2a8b094887da5a1a2339543a4933d06db2e63cbbc2e288eb6431bd832065df0c099d091b6a67436e71b7d6bf85f01ce7c15f9253b4cbebcc3b9a496165ba42
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.12.1":
-  version: 1.12.1
-  resolution: "@webassemblyjs/wast-printer@npm:1.12.1"
+"@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@istanbuljs/schema@npm:0.1.3"
+  checksum: 10c0/61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a
+  languageName: node
+  linkType: hard
+
+"@jest/console@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/console@npm:26.6.2"
   dependencies:
-    "@webassemblyjs/ast": "npm:1.12.1"
-    "@xtuc/long": "npm:4.2.2"
-  checksum: 10c0/39bf746eb7a79aa69953f194943bbc43bebae98bd7cadd4d8bc8c0df470ca6bf9d2b789effaa180e900fab4e2691983c1f7d41571458bd2a26267f2f0c73705a
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    jest-message-util: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/e85a68b1ef49e5ecadb0055812c2493a92592b5206c26e78ce6b21869aff2847e4c808beae1dd353738c24fd51fa9d5bf135ced62931844a5d57f9ff4f40743a
   languageName: node
   linkType: hard
 
-"@webpack-cli/configtest@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@webpack-cli/configtest@npm:2.1.1"
-  peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
-  checksum: 10c0/a8da1f15702cb289807da99235ed95326ed7dabeb1a36ca59bd3a5dbe6adcc946a9a2767936050fc4d5ed14efab0e5b5a641dfe8e3d862c36caa5791ac12759d
+"@jest/console@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/console@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/7be408781d0a6f657e969cbec13b540c329671819c2f57acfad0dae9dbfe2c9be859f38fe99b35dba9ff1536937dc6ddc69fdcd2794812fa3c647a1619797f6c
   languageName: node
   linkType: hard
 
-"@webpack-cli/info@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@webpack-cli/info@npm:2.0.2"
-  peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
-  checksum: 10c0/ca88a35604dc9aedac7c26e8f6793c5039dc1eea2b12a85fbfd669a5f21ecf9cf169d7fd157ea366a62666e3fa05b776306a96742ac61a9868f44fdce6b40f7d
+"@jest/core@npm:^26.6.0, @jest/core@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "@jest/core@npm:26.6.3"
+  dependencies:
+    "@jest/console": "npm:^26.6.2"
+    "@jest/reporters": "npm:^26.6.2"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/transform": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.4"
+    jest-changed-files: "npm:^26.6.2"
+    jest-config: "npm:^26.6.3"
+    jest-haste-map: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-regex-util: "npm:^26.0.0"
+    jest-resolve: "npm:^26.6.2"
+    jest-resolve-dependencies: "npm:^26.6.3"
+    jest-runner: "npm:^26.6.3"
+    jest-runtime: "npm:^26.6.3"
+    jest-snapshot: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jest-validate: "npm:^26.6.2"
+    jest-watcher: "npm:^26.6.2"
+    micromatch: "npm:^4.0.2"
+    p-each-series: "npm:^2.1.0"
+    rimraf: "npm:^3.0.0"
+    slash: "npm:^3.0.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10c0/3a4816997f1e206e0dfc6ad236f53b8a554a9b705aa78a62bc754697b8adf8314187a5ac8cfbd31ee6a38feec1412dc17c85cefe39e6d9e21f5e7e2697452e7e
   languageName: node
   linkType: hard
 
-"@webpack-cli/serve@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "@webpack-cli/serve@npm:2.0.5"
+"@jest/core@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/core@npm:29.7.0"
+  dependencies:
+    "@jest/console": "npm:^29.7.0"
+    "@jest/reporters": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-changed-files: "npm:^29.7.0"
+    jest-config: "npm:^29.7.0"
+    jest-haste-map: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-resolve-dependencies: "npm:^29.7.0"
+    jest-runner: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    jest-watcher: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-ansi: "npm:^6.0.0"
   peerDependencies:
-    webpack: 5.x.x
-    webpack-cli: 5.x.x
+    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
-    webpack-dev-server:
+    node-notifier:
       optional: true
-  checksum: 10c0/36079d34971ff99a58b66b13f4184dcdd8617853c48cccdbc3f9ab7ea9e5d4fcf504e873c298ea7aa15e0b51ad2c4aee4d7a70bd7d9364e60f57b0eb93ca15fc
-  languageName: node
-  linkType: hard
-
-"@xmldom/xmldom@npm:^0.7.2":
-  version: 0.7.13
-  resolution: "@xmldom/xmldom@npm:0.7.13"
-  checksum: 10c0/cb02e4e8d986acf18578a5f25d1bce5e18d08718f40d8a0cdd922a4c112c8e00daf94de4e43f9556ed147c696b135f2ab81fa9a2a8a0416f60af15d156b60e40
-  languageName: node
-  linkType: hard
-
-"@xtuc/ieee754@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@xtuc/ieee754@npm:1.2.0"
-  checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
-  languageName: node
-  linkType: hard
-
-"@xtuc/long@npm:4.2.2":
-  version: 4.2.2
-  resolution: "@xtuc/long@npm:4.2.2"
-  checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
-  languageName: node
-  linkType: hard
-
-"abab@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "abab@npm:2.0.6"
-  checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
-  languageName: node
-  linkType: hard
-
-"abbrev@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "abbrev@npm:1.1.1"
-  checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6
+  checksum: 10c0/934f7bf73190f029ac0f96662c85cd276ec460d407baf6b0dbaec2872e157db4d55a7ee0b1c43b18874602f662b37cb973dda469a4e6d88b4e4845b521adeeb2
   languageName: node
   linkType: hard
 
-"abbrev@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "abbrev@npm:2.0.0"
-  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+"@jest/create-cache-key-function@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/create-cache-key-function@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+  checksum: 10c0/5c47ef62205264adf77b1ff26b969ce9fe84920b8275c3c5e83f4236859d6ae5e4e7027af99eef04a8e334c4e424d44af3e167972083406070aca733ac2a2795
   languageName: node
   linkType: hard
 
-"abstract-logging@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "abstract-logging@npm:2.0.1"
-  checksum: 10c0/304879d9babcf6772260e5ddde632e6428e1f42f7a7a116d4689e97ad813a20e0ec2dd1e0a122f3617557f40091b9ca85735de4b48c17a2041268cb47b3f8ef1
+"@jest/environment@npm:^26.6.0, @jest/environment@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/environment@npm:26.6.2"
+  dependencies:
+    "@jest/fake-timers": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^26.6.2"
+  checksum: 10c0/b489afb2fa9bbde360f222bc905abd9abd77ae5802b16ca7a34d018405ad7df57a506c01efae8ff8b566c211314ec74b3f37a1cb850623e15eb1e6d020582197
   languageName: node
   linkType: hard
 
-"acorn-globals@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "acorn-globals@npm:7.0.1"
+"@jest/environment@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/environment@npm:29.7.0"
   dependencies:
-    acorn: "npm:^8.1.0"
-    acorn-walk: "npm:^8.0.2"
-  checksum: 10c0/7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+  checksum: 10c0/c7b1b40c618f8baf4d00609022d2afa086d9c6acc706f303a70bb4b67275868f620ad2e1a9efc5edd418906157337cce50589a627a6400bbdf117d351b91ef86
   languageName: node
   linkType: hard
 
-"acorn-import-assertions@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "acorn-import-assertions@npm:1.9.0"
-  peerDependencies:
-    acorn: ^8
-  checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe
+"@jest/expect-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect-utils@npm:29.7.0"
+  dependencies:
+    jest-get-type: "npm:^29.6.3"
+  checksum: 10c0/60b79d23a5358dc50d9510d726443316253ecda3a7fb8072e1526b3e0d3b14f066ee112db95699b7a43ad3f0b61b750c72e28a5a1cac361d7a2bb34747fa938a
   languageName: node
   linkType: hard
 
-"acorn-jsx@npm:^5.3.2":
-  version: 5.3.2
-  resolution: "acorn-jsx@npm:5.3.2"
-  peerDependencies:
-    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
+"@jest/expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect@npm:29.7.0"
+  dependencies:
+    expect: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+  checksum: 10c0/b41f193fb697d3ced134349250aed6ccea075e48c4f803159db102b826a4e473397c68c31118259868fd69a5cba70e97e1c26d2c2ff716ca39dc73a2ccec037e
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2":
-  version: 8.3.2
-  resolution: "acorn-walk@npm:8.3.2"
-  checksum: 10c0/7e2a8dad5480df7f872569b9dccff2f3da7e65f5353686b1d6032ab9f4ddf6e3a2cb83a9b52cf50b1497fd522154dda92f0abf7153290cc79cd14721ff121e52
+"@jest/fake-timers@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/fake-timers@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    "@sinonjs/fake-timers": "npm:^6.0.1"
+    "@types/node": "npm:*"
+    jest-message-util: "npm:^26.6.2"
+    jest-mock: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+  checksum: 10c0/861b033ead8c749f0fecffb84cbe88603291d9db66129494d0059dee101616a2aa646fc32c8cab468826eeb32647d2b0b4f72869f048163cb3406ddd2902ece0
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
-  bin:
-    acorn: bin/acorn
-  checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299
+"@jest/fake-timers@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/fake-timers@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    "@sinonjs/fake-timers": "npm:^10.0.2"
+    "@types/node": "npm:*"
+    jest-message-util: "npm:^29.7.0"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10c0/cf0a8bcda801b28dc2e2b2ba36302200ee8104a45ad7a21e6c234148932f826cb3bc57c8df3b7b815aeea0861d7b6ca6f0d4778f93b9219398ef28749e03595c
   languageName: node
   linkType: hard
 
-"agent-base@npm:6, agent-base@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "agent-base@npm:6.0.2"
+"@jest/globals@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/globals@npm:26.6.2"
   dependencies:
-    debug: "npm:4"
-  checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    expect: "npm:^26.6.2"
+  checksum: 10c0/6516baa19339a62c8f5eeb2ef3871bfa5bd5645016f1eb87dbe52a37658e7b33b836a1325ba40db250df5d06c08dd1cb1532fbfac5712f4041561525b59bb03f
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
-  version: 7.1.1
-  resolution: "agent-base@npm:7.1.1"
+"@jest/globals@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/globals@npm:29.7.0"
   dependencies:
-    debug: "npm:^4.3.4"
-  checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/expect": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    jest-mock: "npm:^29.7.0"
+  checksum: 10c0/a385c99396878fe6e4460c43bd7bb0a5cc52befb462cc6e7f2a3810f9e7bcce7cdeb51908fd530391ee452dc856c98baa2c5f5fa8a5b30b071d31ef7f6955cea
   languageName: node
   linkType: hard
 
-"agentkeepalive@npm:^4.2.1":
-  version: 4.5.0
-  resolution: "agentkeepalive@npm:4.5.0"
+"@jest/reporters@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/reporters@npm:26.6.2"
   dependencies:
-    humanize-ms: "npm:^1.2.1"
-  checksum: 10c0/394ea19f9710f230722996e156607f48fdf3a345133b0b1823244b7989426c16019a428b56c82d3eabef616e938812981d9009f4792ecc66bd6a59e991c62612
+    "@bcoe/v8-coverage": "npm:^0.2.3"
+    "@jest/console": "npm:^26.6.2"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/transform": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    chalk: "npm:^4.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    exit: "npm:^0.1.2"
+    glob: "npm:^7.1.2"
+    graceful-fs: "npm:^4.2.4"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    istanbul-lib-instrument: "npm:^4.0.3"
+    istanbul-lib-report: "npm:^3.0.0"
+    istanbul-lib-source-maps: "npm:^4.0.0"
+    istanbul-reports: "npm:^3.0.2"
+    jest-haste-map: "npm:^26.6.2"
+    jest-resolve: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jest-worker: "npm:^26.6.2"
+    node-notifier: "npm:^8.0.0"
+    slash: "npm:^3.0.0"
+    source-map: "npm:^0.6.0"
+    string-length: "npm:^4.0.1"
+    terminal-link: "npm:^2.0.0"
+    v8-to-istanbul: "npm:^7.0.0"
+  dependenciesMeta:
+    node-notifier:
+      optional: true
+  checksum: 10c0/311f8c467fc2e810ca884cd9ef032c6c58a88c4c54b41a7c85ae6da5a27b3d4c7042938f62611cf19a336a0d487976b348b8f3414cced2802b815d81bf7c1d5f
   languageName: node
   linkType: hard
 
-"aggregate-error@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "aggregate-error@npm:3.1.0"
-  dependencies:
-    clean-stack: "npm:^2.0.0"
-    indent-string: "npm:^4.0.0"
-  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
-  languageName: node
-  linkType: hard
-
-"ajv-formats@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "ajv-formats@npm:2.1.1"
+"@jest/reporters@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/reporters@npm:29.7.0"
   dependencies:
-    ajv: "npm:^8.0.0"
+    "@bcoe/v8-coverage": "npm:^0.2.3"
+    "@jest/console": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    exit: "npm:^0.1.2"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    istanbul-lib-instrument: "npm:^6.0.0"
+    istanbul-lib-report: "npm:^3.0.0"
+    istanbul-lib-source-maps: "npm:^4.0.0"
+    istanbul-reports: "npm:^3.1.3"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    string-length: "npm:^4.0.1"
+    strip-ansi: "npm:^6.0.0"
+    v8-to-istanbul: "npm:^9.0.1"
   peerDependencies:
-    ajv: ^8.0.0
+    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
-    ajv:
+    node-notifier:
       optional: true
-  checksum: 10c0/e43ba22e91b6a48d96224b83d260d3a3a561b42d391f8d3c6d2c1559f9aa5b253bfb306bc94bbeca1d967c014e15a6efe9a207309e95b3eaae07fcbcdc2af662
+  checksum: 10c0/a754402a799541c6e5aff2c8160562525e2a47e7d568f01ebfc4da66522de39cbb809bbb0a841c7052e4270d79214e70aec3c169e4eae42a03bc1a8a20cb9fa2
   languageName: node
   linkType: hard
 
-"ajv-keywords@npm:^3.5.2":
-  version: 3.5.2
-  resolution: "ajv-keywords@npm:3.5.2"
-  peerDependencies:
-    ajv: ^6.9.1
-  checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
+  dependencies:
+    "@sinclair/typebox": "npm:^0.27.8"
+  checksum: 10c0/b329e89cd5f20b9278ae1233df74016ebf7b385e0d14b9f4c1ad18d096c4c19d1e687aa113a9c976b16ec07f021ae53dea811fb8c1248a50ac34fbe009fdf6be
   languageName: node
   linkType: hard
 
-"ajv-keywords@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "ajv-keywords@npm:5.1.0"
+"@jest/source-map@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/source-map@npm:26.6.2"
   dependencies:
-    fast-deep-equal: "npm:^3.1.3"
-  peerDependencies:
-    ajv: ^8.8.2
-  checksum: 10c0/18bec51f0171b83123ba1d8883c126e60c6f420cef885250898bf77a8d3e65e3bfb9e8564f497e30bdbe762a83e0d144a36931328616a973ee669dc74d4a9590
+    callsites: "npm:^3.0.0"
+    graceful-fs: "npm:^4.2.4"
+    source-map: "npm:^0.6.0"
+  checksum: 10c0/fad0b35abf71b9e35b63d4ea7ddafb227a176fa44b84b8efc749ec3911991203f4a58019dd403af8380de4de752f0d40c9fe4c69f76a0866d266e964a02042cb
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.11.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6":
-  version: 6.12.6
-  resolution: "ajv@npm:6.12.6"
+"@jest/source-map@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/source-map@npm:29.6.3"
   dependencies:
-    fast-deep-equal: "npm:^3.1.1"
-    fast-json-stable-stringify: "npm:^2.0.0"
-    json-schema-traverse: "npm:^0.4.1"
-    uri-js: "npm:^4.2.2"
-  checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    callsites: "npm:^3.0.0"
+    graceful-fs: "npm:^4.2.9"
+  checksum: 10c0/a2f177081830a2e8ad3f2e29e20b63bd40bade294880b595acf2fc09ec74b6a9dd98f126a2baa2bf4941acd89b13a4ade5351b3885c224107083a0059b60a219
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.1.0, ajv@npm:^8.9.0":
-  version: 8.12.0
-  resolution: "ajv@npm:8.12.0"
+"@jest/test-result@npm:^26.6.0, @jest/test-result@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/test-result@npm:26.6.2"
   dependencies:
-    fast-deep-equal: "npm:^3.1.1"
-    json-schema-traverse: "npm:^1.0.0"
-    require-from-string: "npm:^2.0.2"
-    uri-js: "npm:^4.2.2"
-  checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
+    "@jest/console": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+  checksum: 10c0/4b6f480ebf917f2f6beb5ebefc1c6dedaa768030706f184be9a545e3ad457bde802bae78c50e06f68310084921fb048e030a8eca2adfd7df9f46a6663abb0b98
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.2.1":
-  version: 4.3.2
-  resolution: "ansi-escapes@npm:4.3.2"
+"@jest/test-result@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-result@npm:29.7.0"
   dependencies:
-    type-fest: "npm:^0.21.3"
-  checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
+    "@jest/console": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+  checksum: 10c0/7de54090e54a674ca173470b55dc1afdee994f2d70d185c80236003efd3fa2b753fff51ffcdda8e2890244c411fd2267529d42c4a50a8303755041ee493e6a04
   languageName: node
   linkType: hard
 
-"ansi-regex@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "ansi-regex@npm:5.0.1"
-  checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
+"@jest/test-sequencer@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "@jest/test-sequencer@npm:26.6.3"
+  dependencies:
+    "@jest/test-result": "npm:^26.6.2"
+    graceful-fs: "npm:^4.2.4"
+    jest-haste-map: "npm:^26.6.2"
+    jest-runner: "npm:^26.6.3"
+    jest-runtime: "npm:^26.6.3"
+  checksum: 10c0/670cf1161a22716f8396baf2a2d9d1741ad169f8a0115f6b0c4f88f2cfc29fec9179bbcfd87f579a46a69b38af47abd5656fb7ded5face06c3960d8e1cdbbdae
   languageName: node
   linkType: hard
 
-"ansi-regex@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "ansi-regex@npm:6.0.1"
-  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+"@jest/test-sequencer@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-sequencer@npm:29.7.0"
+  dependencies:
+    "@jest/test-result": "npm:^29.7.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/593a8c4272797bb5628984486080cbf57aed09c7cfdc0a634e8c06c38c6bef329c46c0016e84555ee55d1cd1f381518cf1890990ff845524c1123720c8c1481b
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "ansi-styles@npm:3.2.1"
+"@jest/transform@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/transform@npm:26.6.2"
   dependencies:
-    color-convert: "npm:^1.9.0"
-  checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
+    "@babel/core": "npm:^7.1.0"
+    "@jest/types": "npm:^26.6.2"
+    babel-plugin-istanbul: "npm:^6.0.0"
+    chalk: "npm:^4.0.0"
+    convert-source-map: "npm:^1.4.0"
+    fast-json-stable-stringify: "npm:^2.0.0"
+    graceful-fs: "npm:^4.2.4"
+    jest-haste-map: "npm:^26.6.2"
+    jest-regex-util: "npm:^26.0.0"
+    jest-util: "npm:^26.6.2"
+    micromatch: "npm:^4.0.2"
+    pirates: "npm:^4.0.1"
+    slash: "npm:^3.0.0"
+    source-map: "npm:^0.6.1"
+    write-file-atomic: "npm:^3.0.0"
+  checksum: 10c0/1a1d636528d9b122b87b870633763c67f131533fce61e5db536dfbbea0bbfe8fe130daededb686ccc230389473a2b8ece5d0e1eaf380066d8902bde48579de31
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "ansi-styles@npm:4.3.0"
+"@jest/transform@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/transform@npm:29.7.0"
   dependencies:
-    color-convert: "npm:^2.0.1"
-  checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
+    "@babel/core": "npm:^7.11.6"
+    "@jest/types": "npm:^29.6.3"
+    "@jridgewell/trace-mapping": "npm:^0.3.18"
+    babel-plugin-istanbul: "npm:^6.1.1"
+    chalk: "npm:^4.0.0"
+    convert-source-map: "npm:^2.0.0"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    pirates: "npm:^4.0.4"
+    slash: "npm:^3.0.0"
+    write-file-atomic: "npm:^4.0.2"
+  checksum: 10c0/7f4a7f73dcf45dfdf280c7aa283cbac7b6e5a904813c3a93ead7e55873761fc20d5c4f0191d2019004fac6f55f061c82eb3249c2901164ad80e362e7a7ede5a6
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "ansi-styles@npm:5.2.0"
-  checksum: 10c0/9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
+"@jest/types@npm:^26.6.0, @jest/types@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "@jest/types@npm:26.6.2"
+  dependencies:
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    "@types/istanbul-reports": "npm:^3.0.0"
+    "@types/node": "npm:*"
+    "@types/yargs": "npm:^15.0.0"
+    chalk: "npm:^4.0.0"
+  checksum: 10c0/5b9b957f38a002895eb04bbb8c3dda6fccce8e2551f3f44b02f1f43063a78e8bedce73cd4330b53ede00ae005de5cd805982fbb2ec6ab9feacf96344240d5db2
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^6.1.0":
-  version: 6.2.1
-  resolution: "ansi-styles@npm:6.2.1"
-  checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
+"@jest/types@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/types@npm:29.6.3"
+  dependencies:
+    "@jest/schemas": "npm:^29.6.3"
+    "@types/istanbul-lib-coverage": "npm:^2.0.0"
+    "@types/istanbul-reports": "npm:^3.0.0"
+    "@types/node": "npm:*"
+    "@types/yargs": "npm:^17.0.8"
+    chalk: "npm:^4.0.0"
+  checksum: 10c0/ea4e493dd3fb47933b8ccab201ae573dcc451f951dc44ed2a86123cd8541b82aa9d2b1031caf9b1080d6673c517e2dcc25a44b2dc4f3fbc37bfc965d444888c0
   languageName: node
   linkType: hard
 
-"anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
-  version: 3.1.3
-  resolution: "anymatch@npm:3.1.3"
+"@jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
-    normalize-path: "npm:^3.0.0"
-    picomatch: "npm:^2.0.4"
-  checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
+    "@jridgewell/set-array": "npm:^1.2.1"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0":
-  version: 2.0.0
-  resolution: "aproba@npm:2.0.0"
-  checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5
+"@jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.2
+  resolution: "@jridgewell/resolve-uri@npm:3.1.2"
+  checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e
   languageName: node
   linkType: hard
 
-"archy@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "archy@npm:1.0.0"
-  checksum: 10c0/200c849dd1c304ea9914827b0555e7e1e90982302d574153e28637db1a663c53de62bad96df42d50e8ce7fc18d05e3437d9aa8c4b383803763755f0956c7d308
+"@jridgewell/set-array@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@jridgewell/set-array@npm:1.2.1"
+  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
   languageName: node
   linkType: hard
 
-"are-we-there-yet@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "are-we-there-yet@npm:3.0.1"
+"@jridgewell/source-map@npm:^0.3.3":
+  version: 0.3.6
+  resolution: "@jridgewell/source-map@npm:0.3.6"
   dependencies:
-    delegates: "npm:^1.0.0"
-    readable-stream: "npm:^3.6.0"
-  checksum: 10c0/8373f289ba42e4b5ec713bb585acdac14b5702c75f2a458dc985b9e4fa5762bc5b46b40a21b72418a3ed0cfb5e35bdc317ef1ae132f3035f633d581dd03168c3
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+  checksum: 10c0/6a4ecc713ed246ff8e5bdcc1ef7c49aaa93f7463d948ba5054dda18b02dcc6a055e2828c577bcceee058f302ce1fc95595713d44f5c45e43d459f88d267f2f04
   languageName: node
   linkType: hard
 
-"argparse@npm:^1.0.6, argparse@npm:^1.0.7":
-  version: 1.0.10
-  resolution: "argparse@npm:1.0.10"
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5
+  languageName: node
+  linkType: hard
+
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+  version: 0.3.25
+  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
-    sprintf-js: "npm:~1.0.2"
-  checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
+    "@jridgewell/resolve-uri": "npm:^3.1.0"
+    "@jridgewell/sourcemap-codec": "npm:^1.4.14"
+  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
   languageName: node
   linkType: hard
 
-"argparse@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "argparse@npm:2.0.1"
-  checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
+"@lukeed/ms@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "@lukeed/ms@npm:2.0.2"
+  checksum: 10c0/843b922717313bcde4943f478145d8bc13115b9b91d83bbaed53739b5644122984412310aed574792f4e6b492f2cbda178175f601856d310f67e14834c3f17a0
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "array-buffer-byte-length@npm:1.0.1"
+"@nodelib/fs.scandir@npm:2.1.5":
+  version: 2.1.5
+  resolution: "@nodelib/fs.scandir@npm:2.1.5"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    is-array-buffer: "npm:^3.0.4"
-  checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917
+    "@nodelib/fs.stat": "npm:2.0.5"
+    run-parallel: "npm:^1.1.9"
+  checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
-  version: 3.1.8
-  resolution: "array-includes@npm:3.1.8"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.2.4"
-    is-string: "npm:^1.0.7"
-  checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370
+"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2":
+  version: 2.0.5
+  resolution: "@nodelib/fs.stat@npm:2.0.5"
+  checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d
   languageName: node
   linkType: hard
 
-"array-union@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "array-union@npm:2.1.0"
-  checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
+"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "@nodelib/fs.walk@npm:1.2.8"
+  dependencies:
+    "@nodelib/fs.scandir": "npm:2.1.5"
+    fastq: "npm:^1.6.0"
+  checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1
   languageName: node
   linkType: hard
 
-"array.prototype.findlast@npm:^1.2.4":
-  version: 1.2.5
-  resolution: "array.prototype.findlast@npm:1.2.5"
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/ddc952b829145ab45411b9d6adcb51a8c17c76bf89c9dd64b52d5dffa65d033da8c076ed2e17091779e83bc892b9848188d7b4b33453c5565e65a92863cb2775
+    agent-base: "npm:^7.1.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.1"
+    lru-cache: "npm:^10.0.1"
+    socks-proxy-agent: "npm:^8.0.3"
+  checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "array.prototype.flat@npm:1.3.2"
+"@npmcli/fs@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "@npmcli/fs@npm:1.1.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+    "@gar/promisify": "npm:^1.0.1"
+    semver: "npm:^7.3.5"
+  checksum: 10c0/4143c317a7542af9054018b71601e3c3392e6704e884561229695f099a71336cbd580df9a9ffb965d0024bf0ed593189ab58900fd1714baef1c9ee59c738c3e2
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "array.prototype.flatmap@npm:1.3.2"
+"@npmcli/fs@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "@npmcli/fs@npm:2.1.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
+    "@gar/promisify": "npm:^1.1.3"
+    semver: "npm:^7.3.5"
+  checksum: 10c0/c50d087733d0d8df23be24f700f104b19922a28677aa66fdbe06ff6af6431cc4a5bb1e27683cbc661a5dafa9bafdc603e6a0378121506dfcd394b2b6dd76a187
   languageName: node
   linkType: hard
 
-"array.prototype.toreversed@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "array.prototype.toreversed@npm:1.1.2"
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/2b7627ea85eae1e80ecce665a500cc0f3355ac83ee4a1a727562c7c2a1d5f1c0b4dd7b65c468ec6867207e452ba01256910a2c0b41486bfdd11acf875a7a3435
+    semver: "npm:^7.3.5"
+  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "array.prototype.tosorted@npm:1.1.3"
+"@npmcli/move-file@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "@npmcli/move-file@npm:1.1.2"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
-    es-errors: "npm:^1.1.0"
-    es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865
+    mkdirp: "npm:^1.0.4"
+    rimraf: "npm:^3.0.2"
+  checksum: 10c0/02e946f3dafcc6743132fe2e0e2b585a96ca7265653a38df5a3e53fcf26c7c7a57fc0f861d7c689a23fdb6d6836c7eea5050c8086abf3c994feb2208d1514ff0
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+"@npmcli/move-file@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@npmcli/move-file@npm:2.0.1"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.1"
-    call-bind: "npm:^1.0.5"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.22.3"
-    es-errors: "npm:^1.2.1"
-    get-intrinsic: "npm:^1.2.3"
-    is-array-buffer: "npm:^3.0.4"
-    is-shared-array-buffer: "npm:^1.0.2"
-  checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36
+    mkdirp: "npm:^1.0.4"
+    rimraf: "npm:^3.0.2"
+  checksum: 10c0/11b2151e6d1de6f6eb23128de5aa8a429fd9097d839a5190cb77aa47a6b627022c42d50fa7c47a00f1c9f8f0c1560092b09b061855d293fa0741a2a94cfb174d
   languageName: node
   linkType: hard
 
-"asynckit@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "asynckit@npm:0.4.0"
-  checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd
   languageName: node
   linkType: hard
 
-"atomic-sleep@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "atomic-sleep@npm:1.0.0"
-  checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+"@pmmmwh/react-refresh-webpack-plugin@npm:0.4.3":
+  version: 0.4.3
+  resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.4.3"
+  dependencies:
+    ansi-html: "npm:^0.0.7"
+    error-stack-parser: "npm:^2.0.6"
+    html-entities: "npm:^1.2.1"
+    native-url: "npm:^0.2.6"
+    schema-utils: "npm:^2.6.5"
+    source-map: "npm:^0.7.3"
+  peerDependencies:
+    "@types/webpack": 4.x
+    react-refresh: ">=0.8.3 <0.10.0"
+    sockjs-client: ^1.4.0
+    type-fest: ^0.13.1
+    webpack: ">=4.43.0 <6.0.0"
+    webpack-dev-server: 3.x
+    webpack-hot-middleware: 2.x
+    webpack-plugin-serve: 0.x || 1.x
+  peerDependenciesMeta:
+    "@types/webpack":
+      optional: true
+    sockjs-client:
+      optional: true
+    type-fest:
+      optional: true
+    webpack-dev-server:
+      optional: true
+    webpack-hot-middleware:
+      optional: true
+    webpack-plugin-serve:
+      optional: true
+  checksum: 10c0/c59979ebc3c0dbbfdc37eb53e238d050c519ba3c99e50ecc2953c5243fbc3ae4260956d79282aeaca0e33043564d345f8fc140788846d33257e905c2470c5f60
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "available-typed-arrays@npm:1.0.7"
-  dependencies:
-    possible-typed-array-names: "npm:^1.0.0"
-  checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2
+"@polka/url@npm:^1.0.0-next.24":
+  version: 1.0.0-next.25
+  resolution: "@polka/url@npm:1.0.0-next.25"
+  checksum: 10c0/ef61f0a0fe94bb6e1143fc5b9d5a12e6ca9dbd2c57843ebf81db432c21b9f1005c09e8a1ef8b6d5ddfa42146ca65b640feb2d353bd0d3546da46ba59e48a5349
   languageName: node
   linkType: hard
 
-"avvio@npm:^7.1.2":
-  version: 7.2.5
-  resolution: "avvio@npm:7.2.5"
-  dependencies:
-    archy: "npm:^1.0.0"
-    debug: "npm:^4.0.0"
-    fastq: "npm:^1.6.1"
-    queue-microtask: "npm:^1.1.2"
-  checksum: 10c0/20ca0bf216647ff09ebaa9f206cd55dbe768a72b915ad41e517223ed4595ab7ec72eeff99a5da88d47a7ecc53002424d2b4c68b09559e3ab918c296ced5100d8
+"@popperjs/core@npm:^2.11.8":
+  version: 2.11.8
+  resolution: "@popperjs/core@npm:2.11.8"
+  checksum: 10c0/4681e682abc006d25eb380d0cf3efc7557043f53b6aea7a5057d0d1e7df849a00e281cd8ea79c902a35a414d7919621fc2ba293ecec05f413598e0b23d5a1e63
   languageName: node
   linkType: hard
 
-"axios@npm:^1.6.8":
-  version: 1.6.8
-  resolution: "axios@npm:1.6.8"
+"@rollup/plugin-node-resolve@npm:^7.1.1":
+  version: 7.1.3
+  resolution: "@rollup/plugin-node-resolve@npm:7.1.3"
   dependencies:
-    follow-redirects: "npm:^1.15.6"
-    form-data: "npm:^4.0.0"
-    proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
+    "@rollup/pluginutils": "npm:^3.0.8"
+    "@types/resolve": "npm:0.0.8"
+    builtin-modules: "npm:^3.1.0"
+    is-module: "npm:^1.0.0"
+    resolve: "npm:^1.14.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0
+  checksum: 10c0/c0a3f27ef952bd0dca454d952d6a9d7eb8cb05a5eb5407db81db770bfed9e62b698f8406e98be33429f271dbc065eb3abf758896c15ea1185a0b54f97f47c413
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "babel-jest@npm:29.7.0"
+"@rollup/plugin-replace@npm:^2.3.1":
+  version: 2.4.2
+  resolution: "@rollup/plugin-replace@npm:2.4.2"
   dependencies:
-    "@jest/transform": "npm:^29.7.0"
-    "@types/babel__core": "npm:^7.1.14"
-    babel-plugin-istanbul: "npm:^6.1.1"
-    babel-preset-jest: "npm:^29.6.3"
-    chalk: "npm:^4.0.0"
-    graceful-fs: "npm:^4.2.9"
-    slash: "npm:^3.0.0"
+    "@rollup/pluginutils": "npm:^3.1.0"
+    magic-string: "npm:^0.25.7"
   peerDependencies:
-    "@babel/core": ^7.8.0
-  checksum: 10c0/2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
+    rollup: ^1.20.0 || ^2.0.0
+  checksum: 10c0/ea3d27291c791661638b91809d0247dde1ee71be0b16fa7060078c2700db3669eada2c3978ea979b917b29ebe06f3fddc8797feae554da966264a22142b5771a
   languageName: node
   linkType: hard
 
-"babel-plugin-istanbul@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "babel-plugin-istanbul@npm:6.1.1"
+"@rollup/pluginutils@npm:^3.0.8, @rollup/pluginutils@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@rollup/pluginutils@npm:3.1.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.0.0"
-    "@istanbuljs/load-nyc-config": "npm:^1.0.0"
-    "@istanbuljs/schema": "npm:^0.1.2"
-    istanbul-lib-instrument: "npm:^5.0.4"
-    test-exclude: "npm:^6.0.0"
-  checksum: 10c0/1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
+    "@types/estree": "npm:0.0.39"
+    estree-walker: "npm:^1.0.1"
+    picomatch: "npm:^2.2.2"
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0
+  checksum: 10c0/7151753160d15ba2b259461a6c25b3932150994ea52dba8fd3144f634c7647c2e56733d986e2c15de67c4d96a9ee7d6278efa6d2e626a7169898fd64adc0f90c
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "babel-plugin-jest-hoist@npm:29.6.3"
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 10c0/ef6351ae073c45c2ac89494dbb3e1f87cc60a93ce4cde797b782812b6f97da0d620ae81973f104b43c9b7eaa789ad20ba4f6a1359f1cc62f63729a55a7d22d4e
+  languageName: node
+  linkType: hard
+
+"@sinonjs/commons@npm:^1.7.0":
+  version: 1.8.6
+  resolution: "@sinonjs/commons@npm:1.8.6"
   dependencies:
-    "@babel/template": "npm:^7.3.3"
-    "@babel/types": "npm:^7.3.3"
-    "@types/babel__core": "npm:^7.1.14"
-    "@types/babel__traverse": "npm:^7.0.6"
-  checksum: 10c0/7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
+    type-detect: "npm:4.0.8"
+  checksum: 10c0/93b4d4e27e93652b83467869c2fe09cbd8f37cd5582327f0e081fbf9b93899e2d267db7b668c96810c63dc229867614ced825e5512b47db96ca6f87cb3ec0f61
   languageName: node
   linkType: hard
 
-"babel-preset-current-node-syntax@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "babel-preset-current-node-syntax@npm:1.0.1"
+"@sinonjs/commons@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "@sinonjs/commons@npm:3.0.1"
   dependencies:
-    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
-    "@babel/plugin-syntax-bigint": "npm:^7.8.3"
-    "@babel/plugin-syntax-class-properties": "npm:^7.8.3"
-    "@babel/plugin-syntax-import-meta": "npm:^7.8.3"
-    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
-    "@babel/plugin-syntax-numeric-separator": "npm:^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
-    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
-    "@babel/plugin-syntax-top-level-await": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10c0/5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
+    type-detect: "npm:4.0.8"
+  checksum: 10c0/1227a7b5bd6c6f9584274db996d7f8cee2c8c350534b9d0141fc662eaf1f292ea0ae3ed19e5e5271c8fd390d27e492ca2803acd31a1978be2cdc6be0da711403
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "babel-preset-jest@npm:29.6.3"
+"@sinonjs/fake-timers@npm:^10.0.2":
+  version: 10.3.0
+  resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
-    babel-plugin-jest-hoist: "npm:^29.6.3"
-    babel-preset-current-node-syntax: "npm:^1.0.0"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 10c0/ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
+    "@sinonjs/commons": "npm:^3.0.0"
+  checksum: 10c0/2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63
   languageName: node
   linkType: hard
 
-"balanced-match@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "balanced-match@npm:1.0.2"
-  checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
+"@sinonjs/fake-timers@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "@sinonjs/fake-timers@npm:6.0.1"
+  dependencies:
+    "@sinonjs/commons": "npm:^1.7.0"
+  checksum: 10c0/a77bead4d71b40d6f7f9a3ad66a00269aa2c078260f43f594b8aed4676c6c4e7c2b642d4b8e34df314e1c971589455f7b4267ab831bf44ffdccc0bda599850ad
   languageName: node
   linkType: hard
 
-"big.js@npm:^5.2.2":
-  version: 5.2.2
-  resolution: "big.js@npm:5.2.2"
-  checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
+"@surma/rollup-plugin-off-main-thread@npm:^1.1.1":
+  version: 1.4.2
+  resolution: "@surma/rollup-plugin-off-main-thread@npm:1.4.2"
+  dependencies:
+    ejs: "npm:^2.6.1"
+    magic-string: "npm:^0.25.0"
+  checksum: 10c0/2ebee1db0728777b4711a982f553fda47af88e2c1f9d2e81c12ab0e8db31acf187c71e53919f09a0b719befe75910315bc3773d434f3b9ec61a9d229fa1b86c1
   languageName: node
   linkType: hard
 
-"binary-extensions@npm:^2.0.0":
-  version: 2.3.0
-  resolution: "binary-extensions@npm:2.3.0"
-  checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5
+"@svgr/babel-plugin-add-jsx-attribute@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@svgr/babel-plugin-add-jsx-attribute@npm:5.4.0"
+  checksum: 10c0/f7f7681f0353a265c85a9fa0a6682c2c39c2eba35d6c855bbf25ea9739b339bf1fdd826b61fb3875642bf607c77bf41e6a66a97a4f07fb6e84bd521a363749e5
   languageName: node
   linkType: hard
 
-"bindings@npm:^1.5.0":
-  version: 1.5.0
-  resolution: "bindings@npm:1.5.0"
-  dependencies:
-    file-uri-to-path: "npm:1.0.0"
-  checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
+"@svgr/babel-plugin-remove-jsx-attribute@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@svgr/babel-plugin-remove-jsx-attribute@npm:5.4.0"
+  checksum: 10c0/0562c4c1597aecab0248fbd250e45e630de373307468568b7508c78d315a93f29920dffad2f5f54aad8e2aad9da440e16867e54961f3e6402d9855e5fc836948
   languageName: node
   linkType: hard
 
-"brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
-  dependencies:
-    balanced-match: "npm:^1.0.0"
-    concat-map: "npm:0.0.1"
-  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+"@svgr/babel-plugin-remove-jsx-empty-expression@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@svgr/babel-plugin-remove-jsx-empty-expression@npm:5.0.1"
+  checksum: 10c0/80e2d736528ee553f54916acb9a9a0414e4a06730df420fb2a14788446125728abcb5125bfca6b15ce6fd99771397160f02ec95828871777c1a7803fcf258a44
   languageName: node
   linkType: hard
 
-"brace-expansion@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "brace-expansion@npm:2.0.1"
-  dependencies:
-    balanced-match: "npm:^1.0.0"
-  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+"@svgr/babel-plugin-replace-jsx-attribute-value@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@svgr/babel-plugin-replace-jsx-attribute-value@npm:5.0.1"
+  checksum: 10c0/fb9e267ba961a0daf1f37f2954552617e09ad1d8e97f033aefc28d2a7d7824831318a5324e8e873341b53c9bb10a0c266665c7871251fd0dd2a8294fe1546fac
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
-  dependencies:
-    fill-range: "npm:^7.0.1"
-  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+"@svgr/babel-plugin-svg-dynamic-title@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@svgr/babel-plugin-svg-dynamic-title@npm:5.4.0"
+  checksum: 10c0/e6d1a1ef2f4b91473152bf5153a6857585857e7f0e7897df2d18e14d567811814a5590c9d10d80cf3f2964a5b7bd93d3e4cbd15c8d006c5dd83d4e6839646636
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.21.10, browserslist@npm:^4.22.2":
-  version: 4.23.0
-  resolution: "browserslist@npm:4.23.0"
-  dependencies:
-    caniuse-lite: "npm:^1.0.30001587"
-    electron-to-chromium: "npm:^1.4.668"
-    node-releases: "npm:^2.0.14"
-    update-browserslist-db: "npm:^1.0.13"
-  bin:
-    browserslist: cli.js
-  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
+"@svgr/babel-plugin-svg-em-dimensions@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@svgr/babel-plugin-svg-em-dimensions@npm:5.4.0"
+  checksum: 10c0/1dc247f376ed110d1407b96c1c919c0bfa2907cd02b2eaa98d40209f21f1ff3602a46f0eb0528e514826a843dc411c06ed251cf8c691efbc961f0cbe0aaf860d
   languageName: node
   linkType: hard
 
-"bser@npm:2.1.1":
-  version: 2.1.1
-  resolution: "bser@npm:2.1.1"
-  dependencies:
-    node-int64: "npm:^0.4.0"
-  checksum: 10c0/24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
+"@svgr/babel-plugin-transform-react-native-svg@npm:^5.4.0":
+  version: 5.4.0
+  resolution: "@svgr/babel-plugin-transform-react-native-svg@npm:5.4.0"
+  checksum: 10c0/3ad2f074d0e5857d07758492d0c98d1d862f2def9fab48939c69c5a3c4387065d01b0e8ac62c53a402a9ce09ed3de099bdf41cd2a597e7d58ddf47fb3a3b2c3e
   languageName: node
   linkType: hard
 
-"buffer-from@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "buffer-from@npm:1.1.2"
-  checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
+"@svgr/babel-plugin-transform-svg-component@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/babel-plugin-transform-svg-component@npm:5.5.0"
+  checksum: 10c0/73bfb09933d4a85a0ee8ec364684a0915a9ce05e668d024c073369cc36d78dcde41ddcdb493dde6440f5ee5649ed75b95ac8add226eaee32b20dc54894ac2974
   languageName: node
   linkType: hard
 
-"bufferstreams@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "bufferstreams@npm:3.0.0"
+"@svgr/babel-preset@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/babel-preset@npm:5.5.0"
   dependencies:
-    readable-stream: "npm:^3.4.0"
-  checksum: 10c0/9110ed5e0cf0801d5462fdbb48ee3b655b4a3fd01ceace57ecb92cc3c5574b516ec336f69a489296af8b3e9e229b07f929e649c9a3078a5a7f7f072865482feb
+    "@svgr/babel-plugin-add-jsx-attribute": "npm:^5.4.0"
+    "@svgr/babel-plugin-remove-jsx-attribute": "npm:^5.4.0"
+    "@svgr/babel-plugin-remove-jsx-empty-expression": "npm:^5.0.1"
+    "@svgr/babel-plugin-replace-jsx-attribute-value": "npm:^5.0.1"
+    "@svgr/babel-plugin-svg-dynamic-title": "npm:^5.4.0"
+    "@svgr/babel-plugin-svg-em-dimensions": "npm:^5.4.0"
+    "@svgr/babel-plugin-transform-react-native-svg": "npm:^5.4.0"
+    "@svgr/babel-plugin-transform-svg-component": "npm:^5.5.0"
+  checksum: 10c0/a737592044ee3aea22506fa7178464fc0e1e6e6f3005cbc8db12d6963f18b8a097c97a2d4ede93dd1d3309074f84f47272924614cd74d2c7900c649f0356e349
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
+"@svgr/core@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/core@npm:5.5.0"
   dependencies:
-    "@npmcli/fs": "npm:^2.1.0"
-    "@npmcli/move-file": "npm:^2.0.0"
-    chownr: "npm:^2.0.0"
-    fs-minipass: "npm:^2.1.0"
-    glob: "npm:^8.0.1"
-    infer-owner: "npm:^1.0.4"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    mkdirp: "npm:^1.0.4"
-    p-map: "npm:^4.0.0"
-    promise-inflight: "npm:^1.0.1"
-    rimraf: "npm:^3.0.2"
-    ssri: "npm:^9.0.0"
-    tar: "npm:^6.1.11"
-    unique-filename: "npm:^2.0.0"
-  checksum: 10c0/cdf6836e1c457d2a5616abcaf5d8240c0346b1f5bd6fdb8866b9d84b6dff0b54e973226dc11e0d099f35394213d24860d1989c8358d2a41b39eb912b3000e749
+    "@svgr/plugin-jsx": "npm:^5.5.0"
+    camelcase: "npm:^6.2.0"
+    cosmiconfig: "npm:^7.0.0"
+  checksum: 10c0/a8f8ac7f829ea92a6d0305c746afb33feba3b1c7000e6f22d83b8bad13fdcd5aacc3ebde60330368830eebf23ff3090ddd3ef959d41a90d694f4b7914aea6686
   languageName: node
   linkType: hard
 
-"cacache@npm:^18.0.0":
-  version: 18.0.2
-  resolution: "cacache@npm:18.0.2"
+"@svgr/hast-util-to-babel-ast@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/hast-util-to-babel-ast@npm:5.5.0"
   dependencies:
-    "@npmcli/fs": "npm:^3.1.0"
-    fs-minipass: "npm:^3.0.0"
-    glob: "npm:^10.2.2"
-    lru-cache: "npm:^10.0.1"
-    minipass: "npm:^7.0.3"
-    minipass-collect: "npm:^2.0.1"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    p-map: "npm:^4.0.0"
-    ssri: "npm:^10.0.0"
-    tar: "npm:^6.1.11"
-    unique-filename: "npm:^3.0.0"
-  checksum: 10c0/7992665305cc251a984f4fdbab1449d50e88c635bc43bf2785530c61d239c61b349e5734461baa461caaee65f040ab14e2d58e694f479c0810cffd181ba5eabc
+    "@babel/types": "npm:^7.12.6"
+  checksum: 10c0/1758afd99594b094ec3d0966ba0e81e5ca8acea075801b8a93c5e97269b046eca1fd8dac7c7efbc3b5775e2496adb6880530fd1d6ccaaf8792afd567773a4f64
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "call-bind@npm:1.0.7"
+"@svgr/plugin-jsx@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/plugin-jsx@npm:5.5.0"
   dependencies:
-    es-define-property: "npm:^1.0.0"
-    es-errors: "npm:^1.3.0"
-    function-bind: "npm:^1.1.2"
-    get-intrinsic: "npm:^1.2.4"
-    set-function-length: "npm:^1.2.1"
-  checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d
-  languageName: node
-  linkType: hard
-
-"callsites@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "callsites@npm:3.1.0"
-  checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
+    "@babel/core": "npm:^7.12.3"
+    "@svgr/babel-preset": "npm:^5.5.0"
+    "@svgr/hast-util-to-babel-ast": "npm:^5.5.0"
+    svg-parser: "npm:^2.0.2"
+  checksum: 10c0/96f84139dae94cdda7e24896ab23e9d41e699fc8ecbbd11e280604eb7a67dfec55f126ec12ea3c622b8df6b0fccce5eb261d96f6ca8c59366d3963f13e411ec6
   languageName: node
   linkType: hard
 
-"camel-case@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "camel-case@npm:4.1.2"
+"@svgr/plugin-svgo@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/plugin-svgo@npm:5.5.0"
   dependencies:
-    pascal-case: "npm:^3.1.2"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/bf9eefaee1f20edbed2e9a442a226793bc72336e2b99e5e48c6b7252b6f70b080fc46d8246ab91939e2af91c36cdd422e0af35161e58dd089590f302f8f64c8a
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "camelcase@npm:5.3.1"
-  checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
-  languageName: node
-  linkType: hard
-
-"camelcase@npm:^6.2.0":
-  version: 6.3.0
-  resolution: "camelcase@npm:6.3.0"
-  checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001587":
-  version: 1.0.30001605
-  resolution: "caniuse-lite@npm:1.0.30001605"
-  checksum: 10c0/ceb96a0ecfdaee6510c00aebaaa63db20aaeafab03450d4e3b214e009cb632f87385a70c299cdd1ca4c17e1473883d8fa2051c5b2d083a454338c0c779b25cbc
+    cosmiconfig: "npm:^7.0.0"
+    deepmerge: "npm:^4.2.2"
+    svgo: "npm:^1.2.2"
+  checksum: 10c0/7494f7417ac339422f4eb2219489badaa51cdd79de2b5b3ff772c602036c5a38faf92fdefaab47414175f7c83406c4db195c35e619aae88d0573d7b199ec4503
   languageName: node
   linkType: hard
 
-"capital-case@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "capital-case@npm:1.0.4"
+"@svgr/webpack@npm:5.5.0":
+  version: 5.5.0
+  resolution: "@svgr/webpack@npm:5.5.0"
   dependencies:
-    no-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-    upper-case-first: "npm:^2.0.2"
-  checksum: 10c0/6a034af73401f6e55d91ea35c190bbf8bda21714d4ea8bb8f1799311d123410a80f0875db4e3236dc3f97d74231ff4bf1c8783f2be13d7733c7d990c57387281
+    "@babel/core": "npm:^7.12.3"
+    "@babel/plugin-transform-react-constant-elements": "npm:^7.12.1"
+    "@babel/preset-env": "npm:^7.12.1"
+    "@babel/preset-react": "npm:^7.12.5"
+    "@svgr/core": "npm:^5.5.0"
+    "@svgr/plugin-jsx": "npm:^5.5.0"
+    "@svgr/plugin-svgo": "npm:^5.5.0"
+    loader-utils: "npm:^2.0.0"
+  checksum: 10c0/0313712a1892f387d8c425652239dd635269241b18e7e6f9aad6a339cbe887ebec813d146df23407229384ac5e9d6527f3571aa2fc9dcb30e32006c9eb918663
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "chalk@npm:2.4.2"
-  dependencies:
-    ansi-styles: "npm:^3.2.1"
-    escape-string-regexp: "npm:^1.0.5"
-    supports-color: "npm:^5.3.0"
-  checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
+"@swc/core-darwin-arm64@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-darwin-arm64@npm:1.4.11"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: "npm:^4.1.0"
-    supports-color: "npm:^7.1.0"
-  checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
+"@swc/core-darwin-x64@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-darwin-x64@npm:1.4.11"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"change-case@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "change-case@npm:4.1.2"
-  dependencies:
-    camel-case: "npm:^4.1.2"
-    capital-case: "npm:^1.0.4"
-    constant-case: "npm:^3.0.4"
-    dot-case: "npm:^3.0.4"
-    header-case: "npm:^2.0.4"
-    no-case: "npm:^3.0.4"
-    param-case: "npm:^3.0.4"
-    pascal-case: "npm:^3.1.2"
-    path-case: "npm:^3.0.4"
-    sentence-case: "npm:^3.0.4"
-    snake-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/95a6e48563cd393241ce18470c7310a8a050304a64b63addac487560ab039ce42b099673d1d293cc10652324d92060de11b5d918179fe3b5af2ee521fb03ca58
+"@swc/core-linux-arm-gnueabihf@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.4.11"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"char-regex@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "char-regex@npm:1.0.2"
-  checksum: 10c0/57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
+"@swc/core-linux-arm64-gnu@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.4.11"
+  conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"chokidar@npm:>=3.0.0 <4.0.0":
-  version: 3.6.0
-  resolution: "chokidar@npm:3.6.0"
-  dependencies:
-    anymatch: "npm:~3.1.2"
-    braces: "npm:~3.0.2"
-    fsevents: "npm:~2.3.2"
-    glob-parent: "npm:~5.1.2"
-    is-binary-path: "npm:~2.1.0"
-    is-glob: "npm:~4.0.1"
-    normalize-path: "npm:~3.0.0"
-    readdirp: "npm:~3.6.0"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462
+"@swc/core-linux-arm64-musl@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-linux-arm64-musl@npm:1.4.11"
+  conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"chownr@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "chownr@npm:2.0.0"
-  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+"@swc/core-linux-x64-gnu@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-linux-x64-gnu@npm:1.4.11"
+  conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"chrome-trace-event@npm:^1.0.2":
-  version: 1.0.3
-  resolution: "chrome-trace-event@npm:1.0.3"
-  checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
+"@swc/core-linux-x64-musl@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-linux-x64-musl@npm:1.4.11"
+  conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"ci-info@npm:^3.2.0":
-  version: 3.9.0
-  resolution: "ci-info@npm:3.9.0"
-  checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
+"@swc/core-win32-arm64-msvc@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.4.11"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"cjs-module-lexer@npm:^1.0.0":
-  version: 1.2.3
-  resolution: "cjs-module-lexer@npm:1.2.3"
-  checksum: 10c0/0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
+"@swc/core-win32-ia32-msvc@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.4.11"
+  conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"clean-stack@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "clean-stack@npm:2.2.0"
-  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
+"@swc/core-win32-x64-msvc@npm:1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core-win32-x64-msvc@npm:1.4.11"
+  conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"cli-color@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "cli-color@npm:2.0.4"
-  dependencies:
-    d: "npm:^1.0.1"
-    es5-ext: "npm:^0.10.64"
-    es6-iterator: "npm:^2.0.3"
-    memoizee: "npm:^0.4.15"
-    timers-ext: "npm:^0.1.7"
-  checksum: 10c0/49a0078fa3517cdfb3ad919a05ab2fe7352d9c9f0617937c38fc6245a38101632d9a23f40a53b2818773d2694b8ae814ff760801a702a26d76b297990ce8d399
+"@swc/core@npm:^1.4.11":
+  version: 1.4.11
+  resolution: "@swc/core@npm:1.4.11"
+  dependencies:
+    "@swc/core-darwin-arm64": "npm:1.4.11"
+    "@swc/core-darwin-x64": "npm:1.4.11"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.4.11"
+    "@swc/core-linux-arm64-gnu": "npm:1.4.11"
+    "@swc/core-linux-arm64-musl": "npm:1.4.11"
+    "@swc/core-linux-x64-gnu": "npm:1.4.11"
+    "@swc/core-linux-x64-musl": "npm:1.4.11"
+    "@swc/core-win32-arm64-msvc": "npm:1.4.11"
+    "@swc/core-win32-ia32-msvc": "npm:1.4.11"
+    "@swc/core-win32-x64-msvc": "npm:1.4.11"
+    "@swc/counter": "npm:^0.1.2"
+    "@swc/types": "npm:^0.1.5"
+  peerDependencies:
+    "@swc/helpers": ^0.5.0
+  dependenciesMeta:
+    "@swc/core-darwin-arm64":
+      optional: true
+    "@swc/core-darwin-x64":
+      optional: true
+    "@swc/core-linux-arm-gnueabihf":
+      optional: true
+    "@swc/core-linux-arm64-gnu":
+      optional: true
+    "@swc/core-linux-arm64-musl":
+      optional: true
+    "@swc/core-linux-x64-gnu":
+      optional: true
+    "@swc/core-linux-x64-musl":
+      optional: true
+    "@swc/core-win32-arm64-msvc":
+      optional: true
+    "@swc/core-win32-ia32-msvc":
+      optional: true
+    "@swc/core-win32-x64-msvc":
+      optional: true
+  peerDependenciesMeta:
+    "@swc/helpers":
+      optional: true
+  checksum: 10c0/7860541ba95fc15e6abe1993eb87fdfe05aad3418862b3f790f26cf1de1284e387300020ac60a8487404fd4364af2cc7f9e8a3c4dba49a8683c5d08cd4cb95c4
   languageName: node
   linkType: hard
 
-"cliui@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "cliui@npm:8.0.1"
+"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "@swc/counter@npm:0.1.3"
+  checksum: 10c0/8424f60f6bf8694cfd2a9bca45845bce29f26105cda8cf19cdb9fd3e78dc6338699e4db77a89ae449260bafa1cc6bec307e81e7fb96dbf7dcfce0eea55151356
+  languageName: node
+  linkType: hard
+
+"@swc/jest@npm:^0.2.36":
+  version: 0.2.36
+  resolution: "@swc/jest@npm:0.2.36"
   dependencies:
-    string-width: "npm:^4.2.0"
-    strip-ansi: "npm:^6.0.1"
-    wrap-ansi: "npm:^7.0.0"
-  checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
+    "@jest/create-cache-key-function": "npm:^29.7.0"
+    "@swc/counter": "npm:^0.1.3"
+    jsonc-parser: "npm:^3.2.0"
+  peerDependencies:
+    "@swc/core": "*"
+  checksum: 10c0/7f1993f9201420bb499c92ab28797352bcbf9e3a6c7b5a1806fdc34c9c3b46ea9e5b2f070c0e13fcf7f3c3fadbbc38777840baabb178f589bf1f67543763adb6
   languageName: node
   linkType: hard
 
-"clone-deep@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "clone-deep@npm:4.0.1"
+"@swc/types@npm:^0.1.5":
+  version: 0.1.6
+  resolution: "@swc/types@npm:0.1.6"
   dependencies:
-    is-plain-object: "npm:^2.0.4"
-    kind-of: "npm:^6.0.2"
-    shallow-clone: "npm:^3.0.0"
-  checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
+    "@swc/counter": "npm:^0.1.3"
+  checksum: 10c0/043a0e56d69db8733827ad69db55d0ffbd6976fd24ef629a488e57040067ac84d057a57e08bc5a3db545d44b01d6aa43c22df1152c637af450d366e57cde6e22
   languageName: node
   linkType: hard
 
-"co@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "co@npm:4.6.0"
-  checksum: 10c0/c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
+"@testing-library/dom@npm:^7.28.1":
+  version: 7.31.2
+  resolution: "@testing-library/dom@npm:7.31.2"
+  dependencies:
+    "@babel/code-frame": "npm:^7.10.4"
+    "@babel/runtime": "npm:^7.12.5"
+    "@types/aria-query": "npm:^4.2.0"
+    aria-query: "npm:^4.2.2"
+    chalk: "npm:^4.1.0"
+    dom-accessibility-api: "npm:^0.5.6"
+    lz-string: "npm:^1.4.4"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/51498f6552b669a547202f4f508a1e91b5a0c25a64be987e49601ec00f3d0cc514c591400f0ad49d91b7d522e40e29b29a209aecd43f8611e2240b1ba3d4f93d
   languageName: node
   linkType: hard
 
-"collect-v8-coverage@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "collect-v8-coverage@npm:1.0.2"
-  checksum: 10c0/ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
+"@testing-library/jest-dom@npm:^5.11.9":
+  version: 5.17.0
+  resolution: "@testing-library/jest-dom@npm:5.17.0"
+  dependencies:
+    "@adobe/css-tools": "npm:^4.0.1"
+    "@babel/runtime": "npm:^7.9.2"
+    "@types/testing-library__jest-dom": "npm:^5.9.1"
+    aria-query: "npm:^5.0.0"
+    chalk: "npm:^3.0.0"
+    css.escape: "npm:^1.5.1"
+    dom-accessibility-api: "npm:^0.5.6"
+    lodash: "npm:^4.17.15"
+    redent: "npm:^3.0.0"
+  checksum: 10c0/24e09c5779ea44644945ec26f2e4e5f48aecfe57d469decf2317a3253a5db28d865c55ad0ea4818d8d1df7572a6486c45daa06fa09644a833a7dd84563881939
   languageName: node
   linkType: hard
 
-"color-convert@npm:^1.9.0":
-  version: 1.9.3
-  resolution: "color-convert@npm:1.9.3"
+"@testing-library/react@npm:^11.2.5":
+  version: 11.2.7
+  resolution: "@testing-library/react@npm:11.2.7"
   dependencies:
-    color-name: "npm:1.1.3"
-  checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
+    "@babel/runtime": "npm:^7.12.5"
+    "@testing-library/dom": "npm:^7.28.1"
+  peerDependencies:
+    react: "*"
+    react-dom: "*"
+  checksum: 10c0/5c97aa5fb28a867d674e292e9e556b0890385e729972f8e0c3386001903e5975f6798632a038558750101fc1ff20d5faf7a0fb4d382ee3afe28d0118e9bd2f36
   languageName: node
   linkType: hard
 
-"color-convert@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "color-convert@npm:2.0.1"
+"@testing-library/user-event@npm:^12.7.2":
+  version: 12.8.3
+  resolution: "@testing-library/user-event@npm:12.8.3"
   dependencies:
-    color-name: "npm:~1.1.4"
-  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+    "@babel/runtime": "npm:^7.12.5"
+  peerDependencies:
+    "@testing-library/dom": ">=7.21.4"
+  checksum: 10c0/fa84dc30313ba22873c6179c8650c3952db583d253eb317891d75f39369ad72e63e1fef9740b9c755d3cabcb58028e7f896113f2cb97ff40c93b9d608d971dc7
   languageName: node
   linkType: hard
 
-"color-name@npm:1.1.3":
-  version: 1.1.3
-  resolution: "color-name@npm:1.1.3"
-  checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
+"@tootallnate/once@npm:1":
+  version: 1.1.2
+  resolution: "@tootallnate/once@npm:1.1.2"
+  checksum: 10c0/8fe4d006e90422883a4fa9339dd05a83ff626806262e1710cee5758d493e8cbddf2db81c0e4690636dc840b02c9fda62877866ea774ebd07c1777ed5fafbdec6
   languageName: node
   linkType: hard
 
-"color-name@npm:~1.1.4":
-  version: 1.1.4
-  resolution: "color-name@npm:1.1.4"
-  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+"@tootallnate/once@npm:2":
+  version: 2.0.0
+  resolution: "@tootallnate/once@npm:2.0.0"
+  checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858
   languageName: node
   linkType: hard
 
-"color-support@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "color-support@npm:1.1.3"
-  bin:
-    color-support: bin.js
-  checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6
+"@types/aria-query@npm:^4.2.0":
+  version: 4.2.2
+  resolution: "@types/aria-query@npm:4.2.2"
+  checksum: 10c0/6dc0d94890c2c7c2e347148ea32215b73bf480e0f0888a9bbfb7b531285a3daf0b95e600db5be1c03d6e5f825d63cf8c2aabc5db93d8d1fd47ce3211f73e8d66
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.14":
-  version: 2.0.20
-  resolution: "colorette@npm:2.0.20"
-  checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
+"@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7":
+  version: 7.20.5
+  resolution: "@types/babel__core@npm:7.20.5"
+  dependencies:
+    "@babel/parser": "npm:^7.20.7"
+    "@babel/types": "npm:^7.20.7"
+    "@types/babel__generator": "npm:*"
+    "@types/babel__template": "npm:*"
+    "@types/babel__traverse": "npm:*"
+  checksum: 10c0/bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "combined-stream@npm:1.0.8"
+"@types/babel__generator@npm:*":
+  version: 7.6.8
+  resolution: "@types/babel__generator@npm:7.6.8"
   dependencies:
-    delayed-stream: "npm:~1.0.0"
-  checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
+    "@babel/types": "npm:^7.0.0"
+  checksum: 10c0/f0ba105e7d2296bf367d6e055bb22996886c114261e2cb70bf9359556d0076c7a57239d019dee42bb063f565bade5ccb46009bce2044b2952d964bf9a454d6d2
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "commander@npm:10.0.1"
-  checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3
+"@types/babel__template@npm:*":
+  version: 7.4.4
+  resolution: "@types/babel__template@npm:7.4.4"
+  dependencies:
+    "@babel/parser": "npm:^7.1.0"
+    "@babel/types": "npm:^7.0.0"
+  checksum: 10c0/cc84f6c6ab1eab1427e90dd2b76ccee65ce940b778a9a67be2c8c39e1994e6f5bbc8efa309f6cea8dc6754994524cd4d2896558df76d92e7a1f46ecffee7112b
   languageName: node
   linkType: hard
 
-"commander@npm:^2.20.0":
-  version: 2.20.3
-  resolution: "commander@npm:2.20.3"
-  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
+"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.4, @types/babel__traverse@npm:^7.0.6":
+  version: 7.20.5
+  resolution: "@types/babel__traverse@npm:7.20.5"
+  dependencies:
+    "@babel/types": "npm:^7.20.7"
+  checksum: 10c0/033abcb2f4c084ad33e30c3efaad82161240f351e3c71b6154ed289946b33b363696c0fbd42502b68e4582a87413c418321f40eb1ea863e34fe525641345e05b
   languageName: node
   linkType: hard
 
-"commander@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "commander@npm:7.2.0"
-  checksum: 10c0/8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
+"@types/eslint-scope@npm:^3.7.3":
+  version: 3.7.7
+  resolution: "@types/eslint-scope@npm:3.7.7"
+  dependencies:
+    "@types/eslint": "npm:*"
+    "@types/estree": "npm:*"
+  checksum: 10c0/a0ecbdf2f03912679440550817ff77ef39a30fa8bfdacaf6372b88b1f931828aec392f52283240f0d648cf3055c5ddc564544a626bcf245f3d09fcb099ebe3cc
   languageName: node
   linkType: hard
 
-"common@workspace:*, common@workspace:packages/common":
-  version: 0.0.0-use.local
-  resolution: "common@workspace:packages/common"
-  languageName: unknown
-  linkType: soft
+"@types/eslint@npm:*":
+  version: 8.56.7
+  resolution: "@types/eslint@npm:8.56.7"
+  dependencies:
+    "@types/estree": "npm:*"
+    "@types/json-schema": "npm:*"
+  checksum: 10c0/159bb5ae2f78d905b9263240c75d07b60c26e1bcaecee8c775a7bb0cf7362f5dcdd286259ba6289ab62f989b87048090b2420619f7170a0abbd83cb68b5e0699
+  languageName: node
+  linkType: hard
 
-"concat-map@npm:0.0.1":
-  version: 0.0.1
-  resolution: "concat-map@npm:0.0.1"
-  checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
+"@types/eslint@npm:^7.29.0":
+  version: 7.29.0
+  resolution: "@types/eslint@npm:7.29.0"
+  dependencies:
+    "@types/estree": "npm:*"
+    "@types/json-schema": "npm:*"
+  checksum: 10c0/780ea3f4abba77a577a9ca5c4b66f74acc0f5ff5162b9a361ca931763ed65bca062389fc26027b416ed0a54d390e2206412db6c682f565e523d2b82159e6c46f
   languageName: node
   linkType: hard
 
-"console-control-strings@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "console-control-strings@npm:1.1.0"
-  checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50
+"@types/estree@npm:*, @types/estree@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@types/estree@npm:1.0.5"
+  checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d
   languageName: node
   linkType: hard
 
-"constant-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "constant-case@npm:3.0.4"
-  dependencies:
-    no-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-    upper-case: "npm:^2.0.2"
-  checksum: 10c0/91d54f18341fcc491ae66d1086642b0cc564be3e08984d7b7042f8b0a721c8115922f7f11d6a09f13ed96ff326eabae11f9d1eb0335fa9d8b6e39e4df096010e
+"@types/estree@npm:0.0.39":
+  version: 0.0.39
+  resolution: "@types/estree@npm:0.0.39"
+  checksum: 10c0/f0af6c95ac1988c4827964bd9d3b51d24da442e2188943f6dfcb1e1559103d5d024d564b2e9d3f84c53714a02a0a7435c7441138eb63d9af5de4dfc66cdc0d92
   languageName: node
   linkType: hard
 
-"content-disposition@npm:^0.5.3":
-  version: 0.5.4
-  resolution: "content-disposition@npm:0.5.4"
+"@types/glob@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "@types/glob@npm:7.2.0"
   dependencies:
-    safe-buffer: "npm:5.2.1"
-  checksum: 10c0/bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
+    "@types/minimatch": "npm:*"
+    "@types/node": "npm:*"
+  checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98
   languageName: node
   linkType: hard
 
-"convert-source-map@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "convert-source-map@npm:2.0.0"
-  checksum: 10c0/8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
+"@types/graceful-fs@npm:^4.1.2, @types/graceful-fs@npm:^4.1.3":
+  version: 4.1.9
+  resolution: "@types/graceful-fs@npm:4.1.9"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10c0/235d2fc69741448e853333b7c3d1180a966dd2b8972c8cbcd6b2a0c6cd7f8d582ab2b8e58219dbc62cce8f1b40aa317ff78ea2201cdd8249da5025adebed6f0b
   languageName: node
   linkType: hard
 
-"cookie@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+"@types/html-minifier-terser@npm:^5.0.0":
+  version: 5.1.2
+  resolution: "@types/html-minifier-terser@npm:5.1.2"
+  checksum: 10c0/13276ac71fbcc89795627cc7fa0234e95402656285df2bda4df83e3ebaa9b30f29905f52aa7786d158a887cef72748cbd897e12628dc396ba1225ce0d18159b9
   languageName: node
   linkType: hard
 
-"core-js@npm:^3.36.1":
-  version: 3.36.1
-  resolution: "core-js@npm:3.36.1"
-  checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf
+"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
+  version: 2.0.6
+  resolution: "@types/istanbul-lib-coverage@npm:2.0.6"
+  checksum: 10c0/3948088654f3eeb45363f1db158354fb013b362dba2a5c2c18c559484d5eb9f6fd85b23d66c0a7c2fcfab7308d0a585b14dadaca6cc8bf89ebfdc7f8f5102fb7
   languageName: node
   linkType: hard
 
-"core-util-is@npm:~1.0.0":
-  version: 1.0.3
-  resolution: "core-util-is@npm:1.0.3"
-  checksum: 10c0/90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
+"@types/istanbul-lib-report@npm:*":
+  version: 3.0.3
+  resolution: "@types/istanbul-lib-report@npm:3.0.3"
+  dependencies:
+    "@types/istanbul-lib-coverage": "npm:*"
+  checksum: 10c0/247e477bbc1a77248f3c6de5dadaae85ff86ac2d76c5fc6ab1776f54512a745ff2a5f791d22b942e3990ddbd40f3ef5289317c4fca5741bedfaa4f01df89051c
   languageName: node
   linkType: hard
 
-"create-jest@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "create-jest@npm:29.7.0"
+"@types/istanbul-reports@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "@types/istanbul-reports@npm:3.0.4"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    chalk: "npm:^4.0.0"
-    exit: "npm:^0.1.2"
-    graceful-fs: "npm:^4.2.9"
-    jest-config: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    prompts: "npm:^2.0.1"
-  bin:
-    create-jest: bin/create-jest.js
-  checksum: 10c0/e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
+    "@types/istanbul-lib-report": "npm:*"
+  checksum: 10c0/1647fd402aced5b6edac87274af14ebd6b3a85447ef9ad11853a70fd92a98d35f81a5d3ea9fcb5dbb5834e800c6e35b64475e33fcae6bfa9acc70d61497c54ee
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+"@types/jest@npm:*, @types/jest@npm:^29.5.12":
+  version: 29.5.12
+  resolution: "@types/jest@npm:29.5.12"
   dependencies:
-    path-key: "npm:^3.1.0"
-    shebang-command: "npm:^2.0.0"
-    which: "npm:^2.0.1"
-  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+    expect: "npm:^29.0.0"
+    pretty-format: "npm:^29.0.0"
+  checksum: 10c0/25fc8e4c611fa6c4421e631432e9f0a6865a8cb07c9815ec9ac90d630271cad773b2ee5fe08066f7b95bebd18bb967f8ce05d018ee9ab0430f9dfd1d84665b6f
   languageName: node
   linkType: hard
 
-"css-loader@npm:^6.10.0":
-  version: 6.10.0
-  resolution: "css-loader@npm:6.10.0"
+"@types/jsdom@npm:^20.0.0":
+  version: 20.0.1
+  resolution: "@types/jsdom@npm:20.0.1"
   dependencies:
-    icss-utils: "npm:^5.1.0"
-    postcss: "npm:^8.4.33"
-    postcss-modules-extract-imports: "npm:^3.0.0"
-    postcss-modules-local-by-default: "npm:^4.0.4"
-    postcss-modules-scope: "npm:^3.1.1"
-    postcss-modules-values: "npm:^4.0.0"
-    postcss-value-parser: "npm:^4.2.0"
-    semver: "npm:^7.5.4"
-  peerDependencies:
-    "@rspack/core": 0.x || 1.x
-    webpack: ^5.0.0
-  peerDependenciesMeta:
-    "@rspack/core":
-      optional: true
-    webpack:
-      optional: true
-  checksum: 10c0/acadd2a93f505bf8a8d1c6912a476ef953585f195412b6aa1f2581053bcce8563b833f2a6666c1e1521f4b35fb315176563495a38933becc89e3143cfa7dce45
+    "@types/node": "npm:*"
+    "@types/tough-cookie": "npm:*"
+    parse5: "npm:^7.0.0"
+  checksum: 10c0/3d4b2a3eab145674ee6da482607c5e48977869109f0f62560bf91ae1a792c9e847ac7c6aaf243ed2e97333cb3c51aef314ffa54a19ef174b8f9592dfcb836b25
   languageName: node
   linkType: hard
 
-"cssesc@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cssesc@npm:3.0.0"
-  bin:
-    cssesc: bin/cssesc
-  checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.3, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.15
+  resolution: "@types/json-schema@npm:7.0.15"
+  checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db
   languageName: node
   linkType: hard
 
-"cssom@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cssom@npm:0.5.0"
-  checksum: 10c0/8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
+"@types/json5@npm:^0.0.29":
+  version: 0.0.29
+  resolution: "@types/json5@npm:0.0.29"
+  checksum: 10c0/6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac
   languageName: node
   linkType: hard
 
-"cssom@npm:~0.3.6":
-  version: 0.3.8
-  resolution: "cssom@npm:0.3.8"
-  checksum: 10c0/d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
+"@types/marked@npm:4.3.2":
+  version: 4.3.2
+  resolution: "@types/marked@npm:4.3.2"
+  checksum: 10c0/6f44d28da5c940a719d6c6aca41e33f49c5fe957f7972939cc1cbb47d045951f4d969f382d655345d0463e47db1994635d2862018716fcef2fa85ceeceb116e7
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "cssstyle@npm:2.3.0"
-  dependencies:
-    cssom: "npm:~0.3.6"
-  checksum: 10c0/863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
+"@types/minimatch@npm:*":
+  version: 5.1.2
+  resolution: "@types/minimatch@npm:5.1.2"
+  checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "cssstyle@npm:3.0.0"
+"@types/node@npm:*, @types/node@npm:^20.12.3":
+  version: 20.12.3
+  resolution: "@types/node@npm:20.12.3"
   dependencies:
-    rrweb-cssom: "npm:^0.6.0"
-  checksum: 10c0/23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807
+    undici-types: "npm:~5.26.4"
+  checksum: 10c0/45c8485a0e55276b42c26ba1df6c480e4e1a3a3abbf4ea0ff6b4e2823c4f77e32b7e166d4263d464f207cfea5bd4de8879b8df2c7132a727b0346a30191d6bea
   languageName: node
   linkType: hard
 
-"csstype@npm:^3.0.2":
-  version: 3.1.3
-  resolution: "csstype@npm:3.1.3"
-  checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248
+"@types/normalize-package-data@npm:^2.4.0":
+  version: 2.4.4
+  resolution: "@types/normalize-package-data@npm:2.4.4"
+  checksum: 10c0/aef7bb9b015883d6f4119c423dd28c4bdc17b0e8a0ccf112c78b4fe0e91fbc4af7c6204b04bba0e199a57d2f3fbbd5b4a14bf8739bf9d2a39b2a0aad545e0f86
   languageName: node
   linkType: hard
 
-"cubic2quad@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "cubic2quad@npm:1.2.1"
-  checksum: 10c0/6be433131510b5468a940c3ebc5ae74300f7a223cf3e13003c54e1b0648b0c99e585bb159cfc1bca3c26e2f9bdf1bcbcc7b5547ccde45d11180c2364c3dfd0f7
+"@types/parse-json@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "@types/parse-json@npm:4.0.2"
+  checksum: 10c0/b1b863ac34a2c2172fbe0807a1ec4d5cb684e48d422d15ec95980b81475fac4fdb3768a8b13eef39130203a7c04340fc167bae057c7ebcafd7dec9fe6c36aeb1
   languageName: node
   linkType: hard
 
-"d@npm:1, d@npm:^1.0.1, d@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "d@npm:1.0.2"
-  dependencies:
-    es5-ext: "npm:^0.10.64"
-    type: "npm:^2.7.2"
-  checksum: 10c0/3e6ede10cd3b77586c47da48423b62bed161bf1a48bdbcc94d87263522e22f5dfb0e678a6dba5323fdc14c5d8612b7f7eb9e7d9e37b2e2d67a7bf9f116dabe5a
+"@types/prettier@npm:^2.0.0":
+  version: 2.7.3
+  resolution: "@types/prettier@npm:2.7.3"
+  checksum: 10c0/0960b5c1115bb25e979009d0b44c42cf3d792accf24085e4bfce15aef5794ea042e04e70c2139a2c3387f781f18c89b5706f000ddb089e9a4a2ccb7536a2c5f0
   languageName: node
   linkType: hard
 
-"data-urls@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "data-urls@npm:3.0.2"
-  dependencies:
-    abab: "npm:^2.0.6"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^11.0.0"
-  checksum: 10c0/051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
+"@types/prop-types@npm:*":
+  version: 15.7.12
+  resolution: "@types/prop-types@npm:15.7.12"
+  checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8
   languageName: node
   linkType: hard
 
-"data-urls@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "data-urls@npm:4.0.0"
-  dependencies:
-    abab: "npm:^2.0.6"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^12.0.0"
-  checksum: 10c0/928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766
+"@types/q@npm:^1.5.1":
+  version: 1.5.8
+  resolution: "@types/q@npm:1.5.8"
+  checksum: 10c0/6b2903a03f23ce737503b8a4c409a4133f15009a70e125b5efd5d8c315a5426e64b574ee65288c9dd655c631dcc51c69e4b540b59905ad0b1398952ba367d88b
   languageName: node
   linkType: hard
 
-"data-view-buffer@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-buffer@npm:1.0.1"
+"@types/react-dom@npm:^18.2.24":
+  version: 18.2.24
+  resolution: "@types/react-dom@npm:18.2.24"
   dependencies:
-    call-bind: "npm:^1.0.6"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10c0/8984119e59dbed906a11fcfb417d7d861936f16697a0e7216fe2c6c810f6b5e8f4a5281e73f2c28e8e9259027190ac4a33e2a65fdd7fa86ac06b76e838918583
+    "@types/react": "npm:*"
+  checksum: 10c0/9ec38e5ab4727c56ef17bd8e938ead88748ba19db314b8d9807714a5cae430f5b799514667b221b4f2dc8d9b4ca17dd1c3da8c41c083c2de9eddcc31bec6b8ff
   languageName: node
   linkType: hard
 
-"data-view-byte-length@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "data-view-byte-length@npm:1.0.1"
+"@types/react@npm:*, @types/react@npm:^18.2.74":
+  version: 18.2.74
+  resolution: "@types/react@npm:18.2.74"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10c0/b7d9e48a0cf5aefed9ab7d123559917b2d7e0d65531f43b2fd95b9d3a6b46042dd3fca597c42bba384e66b70d7ad66ff23932f8367b241f53d93af42cfe04ec2
+    "@types/prop-types": "npm:*"
+    csstype: "npm:^3.0.2"
+  checksum: 10c0/347e38b4c5dc20d50ff71bf04b7caaef490e5ff695e74a0088a13fbb2a0c5d125a5ecfd142adfa30f0176da0e2734942c91ba61d95ce269c43b3265bd7379361
   languageName: node
   linkType: hard
 
-"data-view-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "data-view-byte-offset@npm:1.0.0"
+"@types/resolve@npm:0.0.8":
+  version: 0.0.8
+  resolution: "@types/resolve@npm:0.0.8"
   dependencies:
-    call-bind: "npm:^1.0.6"
-    es-errors: "npm:^1.3.0"
-    is-data-view: "npm:^1.0.1"
-  checksum: 10c0/21b0d2e53fd6e20cc4257c873bf6d36d77bd6185624b84076c0a1ddaa757b49aaf076254006341d35568e89f52eecd1ccb1a502cfb620f2beca04f48a6a62a8f
+    "@types/node": "npm:*"
+  checksum: 10c0/ead6902f01e7240918e6f6dabf0e2bc37035492b1da16f605bbd1e153c17d0639df77981b2ec042480361be76c9e967543287d9b312cd668ed9123524994c344
   languageName: node
   linkType: hard
 
-"dateformat@npm:^4.6.3":
-  version: 4.6.3
-  resolution: "dateformat@npm:4.6.3"
-  checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+"@types/semver@npm:^7.5.0":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
   languageName: node
   linkType: hard
 
-"debounce@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "debounce@npm:1.2.1"
-  checksum: 10c0/6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
+"@types/source-list-map@npm:*":
+  version: 0.1.6
+  resolution: "@types/source-list-map@npm:0.1.6"
+  checksum: 10c0/1e6d8d4a48535c51368c65bb2c44a1c9fd9afe2eeefefa32cbf06f9c191f7b20f638b3aa755100de0a750b0ba6a76140e912f1bee75705bc2b9a58b5a5185539
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "debug@npm:4.3.4"
-  dependencies:
-    ms: "npm:2.1.2"
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+"@types/stack-utils@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "@types/stack-utils@npm:2.0.3"
+  checksum: 10c0/1f4658385ae936330581bcb8aa3a066df03867d90281cdf89cc356d404bd6579be0f11902304e1f775d92df22c6dd761d4451c804b0a4fba973e06211e9bd77c
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3":
-  version: 10.4.3
-  resolution: "decimal.js@npm:10.4.3"
-  checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
+"@types/tapable@npm:^1, @types/tapable@npm:^1.0.5":
+  version: 1.0.12
+  resolution: "@types/tapable@npm:1.0.12"
+  checksum: 10c0/d6a080f5839b323eb96dd5b65a6c3161c1297d8c2433eb52437912d1c3df54e38fce12ce7a57650f6453d96942298bd0935436e2501d09e407b7f41634483131
   languageName: node
   linkType: hard
 
-"dedent@npm:^1.0.0":
-  version: 1.5.1
-  resolution: "dedent@npm:1.5.1"
-  peerDependencies:
-    babel-plugin-macros: ^3.1.0
-  peerDependenciesMeta:
-    babel-plugin-macros:
-      optional: true
-  checksum: 10c0/f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
+"@types/testing-library__jest-dom@npm:^5.9.1":
+  version: 5.14.9
+  resolution: "@types/testing-library__jest-dom@npm:5.14.9"
+  dependencies:
+    "@types/jest": "npm:*"
+  checksum: 10c0/91f7b15e8813b515912c54da44464fb60ecf21162b7cae2272fcb3918074f4e1387dc2beca1f5041667e77b76b34253c39675ea4e0b3f28f102d8cc87fdba9fa
   languageName: node
   linkType: hard
 
-"deep-is@npm:^0.1.3":
-  version: 0.1.4
-  resolution: "deep-is@npm:0.1.4"
-  checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
+"@types/tough-cookie@npm:*":
+  version: 4.0.5
+  resolution: "@types/tough-cookie@npm:4.0.5"
+  checksum: 10c0/68c6921721a3dcb40451543db2174a145ef915bc8bcbe7ad4e59194a0238e776e782b896c7a59f4b93ac6acefca9161fccb31d1ce3b3445cb6faa467297fb473
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.2.2":
-  version: 4.3.1
-  resolution: "deepmerge@npm:4.3.1"
-  checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
+"@types/uglify-js@npm:*":
+  version: 3.17.5
+  resolution: "@types/uglify-js@npm:3.17.5"
+  dependencies:
+    source-map: "npm:^0.6.1"
+  checksum: 10c0/e225d7da26a7a8b71e71f584ab2b4e14f9bd61e2ae4c72fa14d3d862ebfb8f3c1c24414048f23ea485e93618d3370e6c9d5e5af51b6a836d48ec453a26e419f4
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "define-data-property@npm:1.1.4"
-  dependencies:
-    es-define-property: "npm:^1.0.0"
-    es-errors: "npm:^1.3.0"
-    gopd: "npm:^1.0.1"
-  checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37
+"@types/webpack-env@npm:^1.18.4":
+  version: 1.18.4
+  resolution: "@types/webpack-env@npm:1.18.4"
+  checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "define-properties@npm:1.2.1"
+"@types/webpack-sources@npm:*":
+  version: 3.2.3
+  resolution: "@types/webpack-sources@npm:3.2.3"
   dependencies:
-    define-data-property: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.0"
-    object-keys: "npm:^1.1.1"
-  checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
+    "@types/node": "npm:*"
+    "@types/source-list-map": "npm:*"
+    source-map: "npm:^0.7.3"
+  checksum: 10c0/74e9dfdd38bc345ce99442f3be5b5ad1efc7af5890304175c141717a7c0b38c152e6f7fe1d2875fc19aaa68964019ff4661678eba7fdeee8c3ad42dc6dbf6b62
   languageName: node
   linkType: hard
 
-"delayed-stream@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "delayed-stream@npm:1.0.0"
-  checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
+"@types/webpack@npm:^4.41.8":
+  version: 4.41.38
+  resolution: "@types/webpack@npm:4.41.38"
+  dependencies:
+    "@types/node": "npm:*"
+    "@types/tapable": "npm:^1"
+    "@types/uglify-js": "npm:*"
+    "@types/webpack-sources": "npm:*"
+    anymatch: "npm:^3.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10c0/5a0a7465d45a0e7701a8c863e88c6cba7660b37e4aeab851c71baf505dbab2e178be1cac82488c2e7d0ea11fb703ceddb53476daec3ec9a004e2fc1554233483
   languageName: node
   linkType: hard
 
-"delegates@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "delegates@npm:1.0.0"
-  checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5
+"@types/yargs-parser@npm:*":
+  version: 21.0.3
+  resolution: "@types/yargs-parser@npm:21.0.3"
+  checksum: 10c0/e71c3bd9d0b73ca82e10bee2064c384ab70f61034bbfb78e74f5206283fc16a6d85267b606b5c22cb2a3338373586786fed595b2009825d6a9115afba36560a0
   languageName: node
   linkType: hard
 
-"depd@npm:2.0.0":
-  version: 2.0.0
-  resolution: "depd@npm:2.0.0"
-  checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
+"@types/yargs@npm:^15.0.0":
+  version: 15.0.19
+  resolution: "@types/yargs@npm:15.0.19"
+  dependencies:
+    "@types/yargs-parser": "npm:*"
+  checksum: 10c0/9fe9b8645304a628006cbba2d1990fb015e2727274d0e3853f321a379a1242d1da2c15d2f56cff0d4313ae94f0383ccf834c3bded9fb3589608aefb3432fcf00
   languageName: node
   linkType: hard
 
-"detect-newline@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "detect-newline@npm:3.1.0"
-  checksum: 10c0/c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
+"@types/yargs@npm:^17.0.8":
+  version: 17.0.32
+  resolution: "@types/yargs@npm:17.0.32"
+  dependencies:
+    "@types/yargs-parser": "npm:*"
+  checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "diff-sequences@npm:29.6.3"
-  checksum: 10c0/32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
+"@typescript-eslint/eslint-plugin@npm:^4.5.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0"
+  dependencies:
+    "@typescript-eslint/experimental-utils": "npm:4.33.0"
+    "@typescript-eslint/scope-manager": "npm:4.33.0"
+    debug: "npm:^4.3.1"
+    functional-red-black-tree: "npm:^1.0.1"
+    ignore: "npm:^5.1.8"
+    regexpp: "npm:^3.1.0"
+    semver: "npm:^7.3.5"
+    tsutils: "npm:^3.21.0"
+  peerDependencies:
+    "@typescript-eslint/parser": ^4.0.0
+    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/c1e1e424e257fa6e5e8b18d7ff77e8a983a761f4acc0cd58ebd31de8ec56c8c472689989cff0290eee41457662a1e664b555cf74bfc1b37bdf8c87ccac2a4663
   languageName: node
   linkType: hard
 
-"dir-glob@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "dir-glob@npm:3.0.1"
+"@typescript-eslint/experimental-utils@npm:4.33.0, @typescript-eslint/experimental-utils@npm:^4.0.1":
+  version: 4.33.0
+  resolution: "@typescript-eslint/experimental-utils@npm:4.33.0"
   dependencies:
-    path-type: "npm:^4.0.0"
-  checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
+    "@types/json-schema": "npm:^7.0.7"
+    "@typescript-eslint/scope-manager": "npm:4.33.0"
+    "@typescript-eslint/types": "npm:4.33.0"
+    "@typescript-eslint/typescript-estree": "npm:4.33.0"
+    eslint-scope: "npm:^5.1.1"
+    eslint-utils: "npm:^3.0.0"
+  peerDependencies:
+    eslint: "*"
+  checksum: 10c0/bb2a48c9df21ef06ccbcd083753b8c51b30a46cde67ab56d278b30ad7868d2e07641e51b6f7fb54437dcb7aff134fac44708e730e2b8f6e43027fefe8629bcb9
   languageName: node
   linkType: hard
 
-"doctrine@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "doctrine@npm:2.1.0"
+"@typescript-eslint/experimental-utils@npm:^3.10.1":
+  version: 3.10.1
+  resolution: "@typescript-eslint/experimental-utils@npm:3.10.1"
   dependencies:
-    esutils: "npm:^2.0.2"
-  checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
+    "@types/json-schema": "npm:^7.0.3"
+    "@typescript-eslint/types": "npm:3.10.1"
+    "@typescript-eslint/typescript-estree": "npm:3.10.1"
+    eslint-scope: "npm:^5.0.0"
+    eslint-utils: "npm:^2.0.0"
+  peerDependencies:
+    eslint: "*"
+  checksum: 10c0/688ec095b8a88b3d8b9275e9d497528f5a24d648bbc2afb9772ed405d8e3bfbc48b6d33816aa46ee578d9cf070ea1f7c7529efadf98c851ff250dd40675d177f
   languageName: node
   linkType: hard
 
-"doctrine@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "doctrine@npm:3.0.0"
+"@typescript-eslint/parser@npm:^4.5.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/parser@npm:4.33.0"
   dependencies:
-    esutils: "npm:^2.0.2"
-  checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
+    "@typescript-eslint/scope-manager": "npm:4.33.0"
+    "@typescript-eslint/types": "npm:4.33.0"
+    "@typescript-eslint/typescript-estree": "npm:4.33.0"
+    debug: "npm:^4.3.1"
+  peerDependencies:
+    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/d6f91479b2c0d0ff20ac2dbc7540b28c175fd834a220a4f227209f6c74c55401ac6bd41b2bb4cf40b3ba7761075ccded2019bfc6096c2e4f273bd4ae86c44172
   languageName: node
   linkType: hard
 
-"domexception@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "domexception@npm:4.0.0"
+"@typescript-eslint/parser@npm:^7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/parser@npm:7.5.0"
   dependencies:
-    webidl-conversions: "npm:^7.0.0"
-  checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
+    "@typescript-eslint/scope-manager": "npm:7.5.0"
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/typescript-estree": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+    debug: "npm:^4.3.4"
+  peerDependencies:
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/65521202ff024e79594272fbb7e4731ecf9d2fdd2f58fc81450bfd2bca94ce9c17b0eadd7338c01701f5cf16d38b6c025ed3fc322380b1e4b5424b7484098cda
   languageName: node
   linkType: hard
 
-"dompurify@npm:^2.4.9":
-  version: 2.4.9
-  resolution: "dompurify@npm:2.4.9"
-  checksum: 10c0/cb847f5eacd9ff326dfc4566875709d050dc78c58837cc3afb83386992f6e7002295358cb9f75d66a9b638fe6da71b7d02ffa82f121713f78f7f3891394dece8
+"@typescript-eslint/scope-manager@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/scope-manager@npm:4.33.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:4.33.0"
+    "@typescript-eslint/visitor-keys": "npm:4.33.0"
+  checksum: 10c0/1dfe65777eeb430c1ef778bdad35e6065d4b3075ddb2639d0747d8db93c02eebf6832ba82388a7f80662e0e9f61f1922fe939b53a20889e11fb9f80c4029c6b7
   languageName: node
   linkType: hard
 
-"dot-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "dot-case@npm:3.0.4"
+"@typescript-eslint/scope-manager@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.5.0"
   dependencies:
-    no-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/5b859ea65097a7ea870e2c91b5768b72ddf7fa947223fd29e167bcdff58fe731d941c48e47a38ec8aa8e43044c8fbd15cd8fa21689a526bc34b6548197cd5b05
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+  checksum: 10c0/a017b151a6b39ef591f8e2e65598e005e1b4b2d5494e4b91bddb5856b3a4d57dd8a58d2bc7a140e627eb574f93a2c8fe55f1307aa264c928ffd31d9e190bc5dd
   languageName: node
   linkType: hard
 
-"duplexer@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "duplexer@npm:0.1.2"
-  checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
+"@typescript-eslint/types@npm:3.10.1":
+  version: 3.10.1
+  resolution: "@typescript-eslint/types@npm:3.10.1"
+  checksum: 10c0/b7419c85aca131c8d0522a47fe21a3497f43345930f7a2be1faa57ffbda3587ab278526cf7c515440ace8e30e40a03fe5f73b2133d161ffa47c22821e2b8f568
   languageName: node
   linkType: hard
 
-"eastasianwidth@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "eastasianwidth@npm:0.2.0"
-  checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
+"@typescript-eslint/types@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/types@npm:4.33.0"
+  checksum: 10c0/6c94780a589eca7a75ae2b014f320bc412b50794c39ab04889918bb39a40e72584b65c8c0b035330cb0599579afaa3adccee40701f63cf39c0e89299de199d4b
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.668":
-  version: 1.4.724
-  resolution: "electron-to-chromium@npm:1.4.724"
-  checksum: 10c0/bc7a3f153d952325bac09c1e67325bfc6d686130541550d1b7429cf72a1202256eed09299c4d8010684aa3683332336f05324acf03bc0be7c7060f4e0820c267
+"@typescript-eslint/types@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/types@npm:7.5.0"
+  checksum: 10c0/f3394f71f422dbd89f63b230f20e9769c12e47a287ff30ca03a80714e57ea21279b6f12a8ab14bafb00b59926f20a88894b2d1e72679f7ff298bae112679d4b3
   languageName: node
   linkType: hard
 
-"emittery@npm:^0.13.1":
-  version: 0.13.1
-  resolution: "emittery@npm:0.13.1"
-  checksum: 10c0/1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
+"@typescript-eslint/typescript-estree@npm:3.10.1":
+  version: 3.10.1
+  resolution: "@typescript-eslint/typescript-estree@npm:3.10.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:3.10.1"
+    "@typescript-eslint/visitor-keys": "npm:3.10.1"
+    debug: "npm:^4.1.1"
+    glob: "npm:^7.1.6"
+    is-glob: "npm:^4.0.1"
+    lodash: "npm:^4.17.15"
+    semver: "npm:^7.3.2"
+    tsutils: "npm:^3.17.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/4d733e2e4e1649fbf136183f72b75c59d434e1a987628d3177cb0555db1a47f77efeb1aba77e3cef3218728cfa1ef618864fa7690e285612f31d6f6d38a478ef
   languageName: node
   linkType: hard
 
-"emoji-regex@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "emoji-regex@npm:8.0.0"
-  checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
+"@typescript-eslint/typescript-estree@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/typescript-estree@npm:4.33.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:4.33.0"
+    "@typescript-eslint/visitor-keys": "npm:4.33.0"
+    debug: "npm:^4.3.1"
+    globby: "npm:^11.0.3"
+    is-glob: "npm:^4.0.1"
+    semver: "npm:^7.3.5"
+    tsutils: "npm:^3.21.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/67609a7bdd680136765d103dec4b8afb38a17436e8a5cd830da84f62c6153c3acba561da3b9e2140137b1a0bcbbfc19d4256c692f7072acfebcff88db079e22b
   languageName: node
   linkType: hard
 
-"emoji-regex@npm:^9.2.2":
-  version: 9.2.2
-  resolution: "emoji-regex@npm:9.2.2"
-  checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
+"@typescript-eslint/typescript-estree@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.5.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/visitor-keys": "npm:7.5.0"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:9.0.3"
+    semver: "npm:^7.5.4"
+    ts-api-utils: "npm:^1.0.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/ea3a270c725d6be273188b86110e0393052cd64d1c54a56eb5ea405e6d3fbbe84fb3b1ce1b8496a4078ac1eefd37aedcf12be91876764f6de31d5aa5131c7bcd
   languageName: node
   linkType: hard
 
-"emojis-list@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "emojis-list@npm:3.0.0"
-  checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
+"@typescript-eslint/utils@npm:^7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/utils@npm:7.5.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.12"
+    "@types/semver": "npm:^7.5.0"
+    "@typescript-eslint/scope-manager": "npm:7.5.0"
+    "@typescript-eslint/types": "npm:7.5.0"
+    "@typescript-eslint/typescript-estree": "npm:7.5.0"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    eslint: ^8.56.0
+  checksum: 10c0/c815ed6909769648953d6963c069038f7cac0c979051b25718feb30e0d3337b9647b75b8de00ac03fe960f0cc8dc4e8a81d4aac4719090a99785e0068712bd24
   languageName: node
   linkType: hard
 
-"encoding@npm:^0.1.13":
-  version: 0.1.13
-  resolution: "encoding@npm:0.1.13"
+"@typescript-eslint/visitor-keys@npm:3.10.1":
+  version: 3.10.1
+  resolution: "@typescript-eslint/visitor-keys@npm:3.10.1"
   dependencies:
-    iconv-lite: "npm:^0.6.2"
-  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+    eslint-visitor-keys: "npm:^1.1.0"
+  checksum: 10c0/74fe6592cc6f0cbfd6351f97d5e84d9d966cb1ab5f53cfe9f6d527c09b1f2ea4dbde8de67c8d59149a0486bdcafeee5c33730dce757311a7be546b1c2e49261b
   languageName: node
   linkType: hard
 
-"enhanced-resolve@npm:^5.16.0":
-  version: 5.16.0
-  resolution: "enhanced-resolve@npm:5.16.0"
+"@typescript-eslint/visitor-keys@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/visitor-keys@npm:4.33.0"
   dependencies:
-    graceful-fs: "npm:^4.2.4"
-    tapable: "npm:^2.2.0"
-  checksum: 10c0/dd69669cbb638ccacefd03e04d5e195ee6a99b7f5f8012f86d2df7781834de357923e06064ea621137c4ce0b37cc12b872b4e6d1ac6ab15fe98e7f1dfbbb08c4
+    "@typescript-eslint/types": "npm:4.33.0"
+    eslint-visitor-keys: "npm:^2.0.0"
+  checksum: 10c0/95b3904db6113ef365892567d47365e6af3708e6fa905743426036f99e1b7fd4a275facec5d939afecb618369f9d615e379d39f96b8936f469e75507c41c249c
   languageName: node
   linkType: hard
 
-"entities@npm:^4.4.0":
-  version: 4.5.0
-  resolution: "entities@npm:4.5.0"
-  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+"@typescript-eslint/visitor-keys@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.5.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.5.0"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10c0/eecf02b8dd54e83738a143aca87b902af4b357028a90fd34ed7a2f40a3ae2f6a188b9ba53903f23c80e868f1fffbb039e9ddb63525438d659707cc7bfb269317
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "env-paths@npm:2.2.1"
-  checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
+"@ungap/structured-clone@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d
   languageName: node
   linkType: hard
 
-"envinfo@npm:^7.7.3":
-  version: 7.11.1
-  resolution: "envinfo@npm:7.11.1"
-  bin:
-    envinfo: dist/cli.js
-  checksum: 10c0/4550cce03d4d8a7b137d548faaf9c920356474231636cb4a6e74ae75db3b9cb04aa0a052ee391e2363af5db697166c207ba76e106338d758c6126830b3e16d75
+"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/ast@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/helper-numbers": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+  checksum: 10c0/ba7f2b96c6e67e249df6156d02c69eb5f1bd18d5005303cdc42accb053bebbbde673826e54db0437c9748e97abd218366a1d13fa46859b23cde611b6b409998c
   languageName: node
   linkType: hard
 
-"err-code@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "err-code@npm:2.0.3"
-  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+"@webassemblyjs/ast@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/ast@npm:1.9.0"
+  dependencies:
+    "@webassemblyjs/helper-module-context": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
+    "@webassemblyjs/wast-parser": "npm:1.9.0"
+  checksum: 10c0/8246c714346cdcd3ab204a2b09904d9d36c4f7da8f30cc217b0b7272a3ef57a3c21e95d51b26601641133fb66fea5cc46c357cf897808512f13b3d1c2efe88e4
   languageName: node
   linkType: hard
 
-"error-ex@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "error-ex@npm:1.3.2"
+"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
+  checksum: 10c0/37fe26f89e18e4ca0e7d89cfe3b9f17cfa327d7daf906ae01400416dbb2e33c8a125b4dc55ad7ff405e5fcfb6cf0d764074c9bc532b9a31a71e762be57d2ea0a
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
+  checksum: 10c0/17acfdfe6650691ae8d0279e6ff4fb8b5efce64e12f3fa18c6a7d279968cc72eb21c0db7ebb5be9d627d05fa7014cef087843d999de96c917079f57d7dac8f77
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-api-error@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
+  checksum: 10c0/a681ed51863e4ff18cf38d223429f414894e5f7496856854d9a886eeddcee32d7c9f66290f2919c9bb6d2fc2b2fae3f989b6a1e02a81e829359738ea0c4d371a
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-api-error@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
+  checksum: 10c0/892851b25cf4b4b307490328f45858414326dac667ca15244b5e959fa6e22478b29dabeb581d49ef8a2874e291d0417a3a959be70428c39cd40870e73b394dbc
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-buffer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-buffer@npm:1.12.1"
+  checksum: 10c0/0270724afb4601237410f7fd845ab58ccda1d5456a8783aadfb16eaaf3f2c9610c28e4a5bcb6ad880cde5183c82f7f116d5ccfc2310502439d33f14b6888b48a
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-buffer@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
+  checksum: 10c0/b09a3e27d9127ccaab095bd171336e7675bb5b832e05b701ff174a853b763154a49f5382c4c3f2f1cc746b1cff3f2025452145cf807ddf788133bcccf5920ca8
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-code-frame@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-code-frame@npm:1.9.0"
   dependencies:
-    is-arrayish: "npm:^0.2.1"
-  checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
+    "@webassemblyjs/wast-printer": "npm:1.9.0"
+  checksum: 10c0/010969a6c8b016680a9b1383ff4b8147c363608dd1e29602154e5460954af4fd48daed518a76b232ca43935d4b6bebf54fba38da56f809e2bd12f063d84013ec
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2":
-  version: 1.23.3
-  resolution: "es-abstract@npm:1.23.3"
+"@webassemblyjs/helper-fsm@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-fsm@npm:1.9.0"
+  checksum: 10c0/ef0c99b58716d757a1a41f99fb46578d3f07d97b60cd51deaeffdf0aad09ec47f5093ee8d098d12324d57f8812609704c377fccfe9a32d02c0a658a4a33dce94
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-module-context@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-module-context@npm:1.9.0"
   dependencies:
-    array-buffer-byte-length: "npm:^1.0.1"
-    arraybuffer.prototype.slice: "npm:^1.0.3"
-    available-typed-arrays: "npm:^1.0.7"
-    call-bind: "npm:^1.0.7"
-    data-view-buffer: "npm:^1.0.1"
-    data-view-byte-length: "npm:^1.0.1"
-    data-view-byte-offset: "npm:^1.0.0"
-    es-define-property: "npm:^1.0.0"
-    es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-set-tostringtag: "npm:^2.0.3"
-    es-to-primitive: "npm:^1.2.1"
-    function.prototype.name: "npm:^1.1.6"
-    get-intrinsic: "npm:^1.2.4"
-    get-symbol-description: "npm:^1.0.2"
-    globalthis: "npm:^1.0.3"
-    gopd: "npm:^1.0.1"
-    has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.3"
-    has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.2"
-    internal-slot: "npm:^1.0.7"
-    is-array-buffer: "npm:^3.0.4"
-    is-callable: "npm:^1.2.7"
-    is-data-view: "npm:^1.0.1"
-    is-negative-zero: "npm:^2.0.3"
-    is-regex: "npm:^1.1.4"
-    is-shared-array-buffer: "npm:^1.0.3"
-    is-string: "npm:^1.0.7"
-    is-typed-array: "npm:^1.1.13"
-    is-weakref: "npm:^1.0.2"
-    object-inspect: "npm:^1.13.1"
-    object-keys: "npm:^1.1.1"
-    object.assign: "npm:^4.1.5"
-    regexp.prototype.flags: "npm:^1.5.2"
-    safe-array-concat: "npm:^1.1.2"
-    safe-regex-test: "npm:^1.0.3"
-    string.prototype.trim: "npm:^1.2.9"
-    string.prototype.trimend: "npm:^1.0.8"
-    string.prototype.trimstart: "npm:^1.0.8"
-    typed-array-buffer: "npm:^1.0.2"
-    typed-array-byte-length: "npm:^1.0.1"
-    typed-array-byte-offset: "npm:^1.0.2"
-    typed-array-length: "npm:^1.0.6"
-    unbox-primitive: "npm:^1.0.2"
-    which-typed-array: "npm:^1.1.15"
-  checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666
+    "@webassemblyjs/ast": "npm:1.9.0"
+  checksum: 10c0/130a9ac1141770b9f70ad568ec2dc769e92c756f91b06ece9cda2c2a5e80e21ec9c8c2a945a5839bf379e52fa921ae134245a7492e1b9ae0e8c557bb9b4953c3
   languageName: node
   linkType: hard
 
-"es-define-property@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-define-property@npm:1.0.0"
+"@webassemblyjs/helper-numbers@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
   dependencies:
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4
+    "@webassemblyjs/floating-point-hex-parser": "npm:1.11.6"
+    "@webassemblyjs/helper-api-error": "npm:1.11.6"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/c7d5afc0ff3bd748339b466d8d2f27b908208bf3ff26b2e8e72c39814479d486e0dca6f3d4d776fd9027c1efe05b5c0716c57a23041eb34473892b2731c33af3
   languageName: node
   linkType: hard
 
-"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "es-errors@npm:1.3.0"
-  checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
+"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
+  checksum: 10c0/79d2bebdd11383d142745efa32781249745213af8e022651847382685ca76709f83e1d97adc5f0d3c2b8546bf02864f8b43a531fdf5ca0748cb9e4e0ef2acaa5
   languageName: node
   linkType: hard
 
-"es-iterator-helpers@npm:^1.0.17":
-  version: 1.0.18
-  resolution: "es-iterator-helpers@npm:1.0.18"
+"@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
+  checksum: 10c0/1741993e1c723f56b619a4981ec975f903886aa3f1f50c7bdb2eaa45ca4ad8d023d6ae7413ef643f060567b1f12a9dcfad6c43688879c46ee4f0b53aa71cd5c9
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/helper-wasm-section@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.0"
-    es-errors: "npm:^1.3.0"
-    es-set-tostringtag: "npm:^2.0.3"
-    function-bind: "npm:^1.1.2"
-    get-intrinsic: "npm:^1.2.4"
-    globalthis: "npm:^1.0.3"
-    has-property-descriptors: "npm:^1.0.2"
-    has-proto: "npm:^1.0.3"
-    has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.7"
-    iterator.prototype: "npm:^1.1.2"
-    safe-array-concat: "npm:^1.1.2"
-  checksum: 10c0/93be402e01fa3d8bf62fcadd2fb3055126ffcfe8846911b10b85918ef46775252696c84e6191ec8125bedb61e92242ad1a54a86118436ba19814720cb9ff4aed
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+  checksum: 10c0/0546350724d285ae3c26e6fc444be4c3b5fb824f3be0ec8ceb474179dc3f4430336dd2e36a44b3e3a1a6815960e5eec98cd9b3a8ec66dc53d86daedd3296a6a2
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.2.1":
-  version: 1.5.0
-  resolution: "es-module-lexer@npm:1.5.0"
-  checksum: 10c0/d199853404f3381801eb102befb84a8fc48f93ed86b852c2461c2c4ad4bbbc91128f3d974ff9b8718628260ae3f36e661295ab3e419222868aa31269284e34c9
+"@webassemblyjs/helper-wasm-section@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-buffer": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
+    "@webassemblyjs/wasm-gen": "npm:1.9.0"
+  checksum: 10c0/2a5baa7749c50a4a428f372ab88b7e52956b48798d44e7291b4aa8558b247337dba791112ce8a4f5b2281e1b9014e6d44d0141476a5fcde6016fac2e009671e8
   languageName: node
   linkType: hard
 
-"es-object-atoms@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-object-atoms@npm:1.0.0"
+"@webassemblyjs/ieee754@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
   dependencies:
-    es-errors: "npm:^1.3.0"
-  checksum: 10c0/1fed3d102eb27ab8d983337bb7c8b159dd2a1e63ff833ec54eea1311c96d5b08223b433060ba240541ca8adba9eee6b0a60cdbf2f80634b784febc9cc8b687b4
+    "@xtuc/ieee754": "npm:^1.2.0"
+  checksum: 10c0/59de0365da450322c958deadade5ec2d300c70f75e17ae55de3c9ce564deff5b429e757d107c7ec69bd0ba169c6b6cc2ff66293ab7264a7053c829b50ffa732f
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "es-set-tostringtag@npm:2.0.3"
+"@webassemblyjs/ieee754@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/ieee754@npm:1.9.0"
   dependencies:
-    get-intrinsic: "npm:^1.2.4"
-    has-tostringtag: "npm:^1.0.2"
-    hasown: "npm:^2.0.1"
-  checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a
+    "@xtuc/ieee754": "npm:^1.2.0"
+  checksum: 10c0/0eff34ec7048400b30282ab9af6ad19d2852dab2f5ffaec8bdc697b8380bc2c9dbe6cadf65f49e68242c82ee3caa8aa6e46c89dbfdab37615189b4da2eab3819
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "es-shim-unscopables@npm:1.0.2"
+"@webassemblyjs/leb128@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/leb128@npm:1.11.6"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/cb344fc04f1968209804de4da018679c5d4708a03b472a33e0fa75657bb024978f570d3ccf9263b7f341f77ecaa75d0e051b9cd4b7bb17a339032cfd1c37f96e
   languageName: node
   linkType: hard
 
-"es-to-primitive@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "es-to-primitive@npm:1.2.1"
+"@webassemblyjs/leb128@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/leb128@npm:1.9.0"
   dependencies:
-    is-callable: "npm:^1.1.4"
-    is-date-object: "npm:^1.0.1"
-    is-symbol: "npm:^1.0.2"
-  checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/441be8634733b33b710f44d4394552d6290bb1a0a8311b384b1865b58c3549d0ddeaf1c3985bbee024a8df12c597be3580fc1cde2ae003dcbf26762b493a7a2f
   languageName: node
   linkType: hard
 
-"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
-  version: 0.10.64
-  resolution: "es5-ext@npm:0.10.64"
+"@webassemblyjs/utf8@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/utf8@npm:1.11.6"
+  checksum: 10c0/14d6c24751a89ad9d801180b0d770f30a853c39f035a15fbc96266d6ac46355227abd27a3fd2eeaa97b4294ced2440a6b012750ae17bafe1a7633029a87b6bee
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/utf8@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/utf8@npm:1.9.0"
+  checksum: 10c0/9566689a1bcf555d6b79d0da79e24ff2be23c0395e5a19ed3c2ceca7831e50b867e0b1c66b3ff1b1d7f297b2d2414314967a884a77634ad0acff8a78489e2b19
+  languageName: node
+  linkType: hard
+
+"@webassemblyjs/wasm-edit@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wasm-edit@npm:1.9.0"
   dependencies:
-    es6-iterator: "npm:^2.0.3"
-    es6-symbol: "npm:^3.1.3"
-    esniff: "npm:^2.0.1"
-    next-tick: "npm:^1.1.0"
-  checksum: 10c0/4459b6ae216f3c615db086e02437bdfde851515a101577fd61b19f9b3c1ad924bab4d197981eb7f0ccb915f643f2fc10ff76b97a680e96cbb572d15a27acd9a3
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-buffer": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-section": "npm:1.9.0"
+    "@webassemblyjs/wasm-gen": "npm:1.9.0"
+    "@webassemblyjs/wasm-opt": "npm:1.9.0"
+    "@webassemblyjs/wasm-parser": "npm:1.9.0"
+    "@webassemblyjs/wast-printer": "npm:1.9.0"
+  checksum: 10c0/07f4cb4a73989622c524f9264b6afe664d33354f081499f04db675aed2b79498bd43600c3d7bebcb9f93ccce6a094b3c28f3f7b11ea62e9e82074c2ae68dc058
   languageName: node
   linkType: hard
 
-"es6-iterator@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "es6-iterator@npm:2.0.3"
+"@webassemblyjs/wasm-edit@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-edit@npm:1.12.1"
   dependencies:
-    d: "npm:1"
-    es5-ext: "npm:^0.10.35"
-    es6-symbol: "npm:^3.1.1"
-  checksum: 10c0/91f20b799dba28fb05bf623c31857fc1524a0f1c444903beccaf8929ad196c8c9ded233e5ac7214fc63a92b3f25b64b7f2737fcca8b1f92d2d96cf3ac902f5d8
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-section": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-opt": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+    "@webassemblyjs/wast-printer": "npm:1.12.1"
+  checksum: 10c0/972f5e6c522890743999e0ed45260aae728098801c6128856b310dd21f1ee63435fc7b518e30e0ba1cdafd0d1e38275829c1e4451c3536a1d9e726e07a5bba0b
   languageName: node
   linkType: hard
 
-"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3":
-  version: 3.1.4
-  resolution: "es6-symbol@npm:3.1.4"
+"@webassemblyjs/wasm-gen@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-gen@npm:1.12.1"
   dependencies:
-    d: "npm:^1.0.2"
-    ext: "npm:^1.7.0"
-  checksum: 10c0/777bf3388db5d7919e09a0fd175aa5b8a62385b17cb2227b7a137680cba62b4d9f6193319a102642aa23d5840d38a62e4784f19cfa5be4a2210a3f0e9b23d15d
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/ieee754": "npm:1.11.6"
+    "@webassemblyjs/leb128": "npm:1.11.6"
+    "@webassemblyjs/utf8": "npm:1.11.6"
+  checksum: 10c0/1e257288177af9fa34c69cab94f4d9036ebed611f77f3897c988874e75182eeeec759c79b89a7a49dd24624fc2d3d48d5580b62b67c4a1c9bfbdcd266b281c16
   languageName: node
   linkType: hard
 
-"es6-weak-map@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "es6-weak-map@npm:2.0.3"
+"@webassemblyjs/wasm-gen@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wasm-gen@npm:1.9.0"
   dependencies:
-    d: "npm:1"
-    es5-ext: "npm:^0.10.46"
-    es6-iterator: "npm:^2.0.3"
-    es6-symbol: "npm:^3.1.1"
-  checksum: 10c0/460932be9542473dbbddd183e21c15a66cfec1b2c17dae2b514e190d6fb2896b7eb683783d4b36da036609d2e1c93d2815f21b374dfccaf02a8978694c2f7b67
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
+    "@webassemblyjs/ieee754": "npm:1.9.0"
+    "@webassemblyjs/leb128": "npm:1.9.0"
+    "@webassemblyjs/utf8": "npm:1.9.0"
+  checksum: 10c0/876826bef91f3af9e48118fb269c348871d5b6f019e071065556da56a3a5818630b00133e07c9dd2cc767e7f2c70934f3ed0060330ce3e37910e9c9df25f1600
   languageName: node
   linkType: hard
 
-"esbuild-loader@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "esbuild-loader@npm:4.1.0"
+"@webassemblyjs/wasm-opt@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-opt@npm:1.12.1"
   dependencies:
-    esbuild: "npm:^0.20.0"
-    get-tsconfig: "npm:^4.7.0"
-    loader-utils: "npm:^2.0.4"
-    webpack-sources: "npm:^1.4.3"
-  peerDependencies:
-    webpack: ^4.40.0 || ^5.0.0
-  checksum: 10c0/6752f48a88c85524ef316b5c7251e44f206da7aac4c63a02e8b4e8ff915d7215a7713710d41575dc749d0ac56cb0becf3f5b2cf543df875f4027b6009d73d7bc
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-buffer": "npm:1.12.1"
+    "@webassemblyjs/wasm-gen": "npm:1.12.1"
+    "@webassemblyjs/wasm-parser": "npm:1.12.1"
+  checksum: 10c0/992a45e1f1871033c36987459436ab4e6430642ca49328e6e32a13de9106fe69ae6c0ac27d7050efd76851e502d11cd1ac0e06b55655dfa889ad82f11a2712fb
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.20.0":
-  version: 0.20.2
-  resolution: "esbuild@npm:0.20.2"
+"@webassemblyjs/wasm-opt@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wasm-opt@npm:1.9.0"
   dependencies:
-    "@esbuild/aix-ppc64": "npm:0.20.2"
-    "@esbuild/android-arm": "npm:0.20.2"
-    "@esbuild/android-arm64": "npm:0.20.2"
-    "@esbuild/android-x64": "npm:0.20.2"
-    "@esbuild/darwin-arm64": "npm:0.20.2"
-    "@esbuild/darwin-x64": "npm:0.20.2"
-    "@esbuild/freebsd-arm64": "npm:0.20.2"
-    "@esbuild/freebsd-x64": "npm:0.20.2"
-    "@esbuild/linux-arm": "npm:0.20.2"
-    "@esbuild/linux-arm64": "npm:0.20.2"
-    "@esbuild/linux-ia32": "npm:0.20.2"
-    "@esbuild/linux-loong64": "npm:0.20.2"
-    "@esbuild/linux-mips64el": "npm:0.20.2"
-    "@esbuild/linux-ppc64": "npm:0.20.2"
-    "@esbuild/linux-riscv64": "npm:0.20.2"
-    "@esbuild/linux-s390x": "npm:0.20.2"
-    "@esbuild/linux-x64": "npm:0.20.2"
-    "@esbuild/netbsd-x64": "npm:0.20.2"
-    "@esbuild/openbsd-x64": "npm:0.20.2"
-    "@esbuild/sunos-x64": "npm:0.20.2"
-    "@esbuild/win32-arm64": "npm:0.20.2"
-    "@esbuild/win32-ia32": "npm:0.20.2"
-    "@esbuild/win32-x64": "npm:0.20.2"
-  dependenciesMeta:
-    "@esbuild/aix-ppc64":
-      optional: true
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 10c0/66398f9fb2c65e456a3e649747b39af8a001e47963b25e86d9c09d2a48d61aa641b27da0ce5cad63df95ad246105e1d83e7fee0e1e22a0663def73b1c5101112
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-buffer": "npm:1.9.0"
+    "@webassemblyjs/wasm-gen": "npm:1.9.0"
+    "@webassemblyjs/wasm-parser": "npm:1.9.0"
+  checksum: 10c0/3d5558e078b660cd9777950f2df60f005f3cbdbcfa6c8c19dc0cf012f44f5bfa97c991d7ac26b3e78596bad0538e92dd00b5db4b51ebc373da8e329a03639190
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "escalade@npm:3.1.2"
-  checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287
+"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wasm-parser@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@webassemblyjs/helper-api-error": "npm:1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6"
+    "@webassemblyjs/ieee754": "npm:1.11.6"
+    "@webassemblyjs/leb128": "npm:1.11.6"
+    "@webassemblyjs/utf8": "npm:1.11.6"
+  checksum: 10c0/e85cec1acad07e5eb65b92d37c8e6ca09c6ca50d7ca58803a1532b452c7321050a0328c49810c337cc2dfd100c5326a54d5ebd1aa5c339ebe6ef10c250323a0e
   languageName: node
   linkType: hard
 
-"escape-html@npm:~1.0.3":
-  version: 1.0.3
-  resolution: "escape-html@npm:1.0.3"
-  checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
+"@webassemblyjs/wasm-parser@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wasm-parser@npm:1.9.0"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-api-error": "npm:1.9.0"
+    "@webassemblyjs/helper-wasm-bytecode": "npm:1.9.0"
+    "@webassemblyjs/ieee754": "npm:1.9.0"
+    "@webassemblyjs/leb128": "npm:1.9.0"
+    "@webassemblyjs/utf8": "npm:1.9.0"
+  checksum: 10c0/1e8615b9f9c3c431c9635c9a9884bca89eff1ab2383ad849341c23e09899454482a8f8813d33bf86ee1b0acc97c7c83926961a9b34d4804fa5d559610ab0a4a2
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "escape-string-regexp@npm:1.0.5"
-  checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
+"@webassemblyjs/wast-parser@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wast-parser@npm:1.9.0"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/floating-point-hex-parser": "npm:1.9.0"
+    "@webassemblyjs/helper-api-error": "npm:1.9.0"
+    "@webassemblyjs/helper-code-frame": "npm:1.9.0"
+    "@webassemblyjs/helper-fsm": "npm:1.9.0"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/c79952466fdf7816be527b1db102952b777b12318eabb5c40df074cd8361e3a7b0179a985534fa8b5a7b93668b07ba46875ffeb5da03ca5177c80ba960ebdffc
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "escape-string-regexp@npm:2.0.0"
-  checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
+"@webassemblyjs/wast-printer@npm:1.12.1":
+  version: 1.12.1
+  resolution: "@webassemblyjs/wast-printer@npm:1.12.1"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.12.1"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/39bf746eb7a79aa69953f194943bbc43bebae98bd7cadd4d8bc8c0df470ca6bf9d2b789effaa180e900fab4e2691983c1f7d41571458bd2a26267f2f0c73705a
   languageName: node
   linkType: hard
 
-"escape-string-regexp@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "escape-string-regexp@npm:4.0.0"
-  checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
+"@webassemblyjs/wast-printer@npm:1.9.0":
+  version: 1.9.0
+  resolution: "@webassemblyjs/wast-printer@npm:1.9.0"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/wast-parser": "npm:1.9.0"
+    "@xtuc/long": "npm:4.2.2"
+  checksum: 10c0/f3d106aa884cbb7687307db7adeb3b98abff9de81b9ba8c1065267340b5e9de64ffc533044ab916b1f4ce8a67fb03efa54b29b61c8e908abe4c07edf82f614cd
   languageName: node
   linkType: hard
 
-"escodegen@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "escodegen@npm:2.1.0"
-  dependencies:
-    esprima: "npm:^4.0.1"
-    estraverse: "npm:^5.2.0"
-    esutils: "npm:^2.0.2"
-    source-map: "npm:~0.6.1"
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 10c0/e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
+"@webpack-cli/configtest@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "@webpack-cli/configtest@npm:2.1.1"
+  peerDependencies:
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  checksum: 10c0/a8da1f15702cb289807da99235ed95326ed7dabeb1a36ca59bd3a5dbe6adcc946a9a2767936050fc4d5ed14efab0e5b5a641dfe8e3d862c36caa5791ac12759d
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^9.1.0":
-  version: 9.1.0
-  resolution: "eslint-config-prettier@npm:9.1.0"
+"@webpack-cli/info@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@webpack-cli/info@npm:2.0.2"
   peerDependencies:
-    eslint: ">=7.0.0"
-  bin:
-    eslint-config-prettier: bin/cli.js
-  checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  checksum: 10c0/ca88a35604dc9aedac7c26e8f6793c5039dc1eea2b12a85fbfd669a5f21ecf9cf169d7fd157ea366a62666e3fa05b776306a96742ac61a9868f44fdce6b40f7d
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.34.1":
-  version: 7.34.1
-  resolution: "eslint-plugin-react@npm:7.34.1"
-  dependencies:
-    array-includes: "npm:^3.1.7"
-    array.prototype.findlast: "npm:^1.2.4"
-    array.prototype.flatmap: "npm:^1.3.2"
-    array.prototype.toreversed: "npm:^1.1.2"
-    array.prototype.tosorted: "npm:^1.1.3"
-    doctrine: "npm:^2.1.0"
-    es-iterator-helpers: "npm:^1.0.17"
-    estraverse: "npm:^5.3.0"
-    jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
-    minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.7"
-    object.fromentries: "npm:^2.0.7"
-    object.hasown: "npm:^1.1.3"
-    object.values: "npm:^1.1.7"
-    prop-types: "npm:^15.8.1"
-    resolve: "npm:^2.0.0-next.5"
-    semver: "npm:^6.3.1"
-    string.prototype.matchall: "npm:^4.0.10"
+"@webpack-cli/serve@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@webpack-cli/serve@npm:2.0.5"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c
+    webpack: 5.x.x
+    webpack-cli: 5.x.x
+  peerDependenciesMeta:
+    webpack-dev-server:
+      optional: true
+  checksum: 10c0/36079d34971ff99a58b66b13f4184dcdd8617853c48cccdbc3f9ab7ea9e5d4fcf504e873c298ea7aa15e0b51ad2c4aee4d7a70bd7d9364e60f57b0eb93ca15fc
   languageName: node
   linkType: hard
 
-"eslint-plugin-simple-import-sort@npm:^12.0.0":
-  version: 12.0.0
-  resolution: "eslint-plugin-simple-import-sort@npm:12.0.0"
-  peerDependencies:
-    eslint: ">=5.0.0"
-  checksum: 10c0/5405f01e4ca5b3c9a2a1b019e39fa858bb081872eb9602fb85d2e4913356fec0a9b3f997e957b1df0c370908ec124114148491e442d57e911b8249728d474398
+"@xmldom/xmldom@npm:^0.7.2":
+  version: 0.7.13
+  resolution: "@xmldom/xmldom@npm:0.7.13"
+  checksum: 10c0/cb02e4e8d986acf18578a5f25d1bce5e18d08718f40d8a0cdd922a4c112c8e00daf94de4e43f9556ed147c696b135f2ab81fa9a2a8a0416f60af15d156b60e40
   languageName: node
   linkType: hard
 
-"eslint-plugin-sonarjs@npm:^0.25.0":
-  version: 0.25.0
-  resolution: "eslint-plugin-sonarjs@npm:0.25.0"
-  peerDependencies:
-    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 10c0/5fc9264f7fda28a2f58b4dcd928d86a9981eca80242e275f11bcd8d8fcecd11da3ee6d709f46e8c4aa644340f939bce46ae0501ff20e2301920d38152935907a
+"@xtuc/ieee754@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@xtuc/ieee754@npm:1.2.0"
+  checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f
   languageName: node
   linkType: hard
 
-"eslint-plugin-unused-imports@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "eslint-plugin-unused-imports@npm:3.1.0"
-  dependencies:
-    eslint-rule-composer: "npm:^0.3.0"
-  peerDependencies:
-    "@typescript-eslint/eslint-plugin": 6 - 7
-    eslint: 8
-  peerDependenciesMeta:
-    "@typescript-eslint/eslint-plugin":
-      optional: true
-  checksum: 10c0/712268fc10e7a5b169070c5ec2655733f4cdcf079848b2812ebe716b429a16cb87f315d3c0004cf128ba3874f68dd938eec8394a03587484e97e146494b48cda
+"@xtuc/long@npm:4.2.2":
+  version: 4.2.2
+  resolution: "@xtuc/long@npm:4.2.2"
+  checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1
   languageName: node
   linkType: hard
 
-"eslint-rule-composer@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "eslint-rule-composer@npm:0.3.0"
-  checksum: 10c0/1f0c40d209e1503a955101a0dbba37e7fc67c8aaa47a5b9ae0b0fcbae7022c86e52b3df2b1b9ffd658e16cd80f31fff92e7222460a44d8251e61d49e0af79a07
+"abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "abab@npm:2.0.6"
+  checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:5.1.1":
-  version: 5.1.1
-  resolution: "eslint-scope@npm:5.1.1"
-  dependencies:
-    esrecurse: "npm:^4.3.0"
-    estraverse: "npm:^4.1.1"
-  checksum: 10c0/d30ef9dc1c1cbdece34db1539a4933fe3f9b14e1ffb27ecc85987902ee663ad7c9473bbd49a9a03195a373741e62e2f807c4938992e019b511993d163450e70a
+"abbrev@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "abbrev@npm:1.1.1"
+  checksum: 10c0/3f762677702acb24f65e813070e306c61fafe25d4b2583f9dfc935131f774863f3addd5741572ed576bd69cabe473c5af18e1e108b829cb7b6b4747884f726e6
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.2":
-  version: 7.2.2
-  resolution: "eslint-scope@npm:7.2.2"
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+  languageName: node
+  linkType: hard
+
+"abstract-logging@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "abstract-logging@npm:2.0.1"
+  checksum: 10c0/304879d9babcf6772260e5ddde632e6428e1f42f7a7a116d4689e97ad813a20e0ec2dd1e0a122f3617557f40091b9ca85735de4b48c17a2041268cb47b3f8ef1
+  languageName: node
+  linkType: hard
+
+"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
+  version: 1.3.8
+  resolution: "accepts@npm:1.3.8"
   dependencies:
-    esrecurse: "npm:^4.3.0"
-    estraverse: "npm:^5.2.0"
-  checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
+    mime-types: "npm:~2.1.34"
+    negotiator: "npm:0.6.3"
+  checksum: 10c0/3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "eslint-visitor-keys@npm:3.4.3"
-  checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
+"acorn-globals@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "acorn-globals@npm:6.0.0"
+  dependencies:
+    acorn: "npm:^7.1.1"
+    acorn-walk: "npm:^7.1.1"
+  checksum: 10c0/5f92390a3fd7e5a4f84fe976d4650e2a33ecf27135aa9efc5406e3406df7f00a1bbb00648ee0c8058846f55ad0924ff574e6c73395705690e754589380a41801
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.57.0":
-  version: 8.57.0
-  resolution: "eslint@npm:8.57.0"
+"acorn-globals@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "acorn-globals@npm:7.0.1"
   dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.2.0"
-    "@eslint-community/regexpp": "npm:^4.6.1"
-    "@eslint/eslintrc": "npm:^2.1.4"
-    "@eslint/js": "npm:8.57.0"
-    "@humanwhocodes/config-array": "npm:^0.11.14"
-    "@humanwhocodes/module-importer": "npm:^1.0.1"
-    "@nodelib/fs.walk": "npm:^1.2.8"
-    "@ungap/structured-clone": "npm:^1.2.0"
-    ajv: "npm:^6.12.4"
-    chalk: "npm:^4.0.0"
-    cross-spawn: "npm:^7.0.2"
-    debug: "npm:^4.3.2"
-    doctrine: "npm:^3.0.0"
-    escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^7.2.2"
-    eslint-visitor-keys: "npm:^3.4.3"
-    espree: "npm:^9.6.1"
-    esquery: "npm:^1.4.2"
-    esutils: "npm:^2.0.2"
-    fast-deep-equal: "npm:^3.1.3"
-    file-entry-cache: "npm:^6.0.1"
-    find-up: "npm:^5.0.0"
-    glob-parent: "npm:^6.0.2"
-    globals: "npm:^13.19.0"
-    graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.2.0"
-    imurmurhash: "npm:^0.1.4"
-    is-glob: "npm:^4.0.0"
-    is-path-inside: "npm:^3.0.3"
-    js-yaml: "npm:^4.1.0"
-    json-stable-stringify-without-jsonify: "npm:^1.0.1"
-    levn: "npm:^0.4.1"
-    lodash.merge: "npm:^4.6.2"
-    minimatch: "npm:^3.1.2"
-    natural-compare: "npm:^1.4.0"
-    optionator: "npm:^0.9.3"
-    strip-ansi: "npm:^6.0.1"
-    text-table: "npm:^0.2.0"
-  bin:
-    eslint: bin/eslint.js
-  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
+    acorn: "npm:^8.1.0"
+    acorn-walk: "npm:^8.0.2"
+  checksum: 10c0/7437f58e92d99292dbebd0e79531af27d706c9f272f31c675d793da6c82d897e75302a8744af13c7f7978a8399840f14a353b60cf21014647f71012982456d2b
   languageName: node
   linkType: hard
 
-"esniff@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "esniff@npm:2.0.1"
-  dependencies:
-    d: "npm:^1.0.1"
-    es5-ext: "npm:^0.10.62"
-    event-emitter: "npm:^0.3.5"
-    type: "npm:^2.7.2"
-  checksum: 10c0/7efd8d44ac20e5db8cb0ca77eb65eca60628b2d0f3a1030bcb05e71cc40e6e2935c47b87dba3c733db12925aa5b897f8e0e7a567a2c274206f184da676ea2e65
+"acorn-import-assertions@npm:^1.9.0":
+  version: 1.9.0
+  resolution: "acorn-import-assertions@npm:1.9.0"
+  peerDependencies:
+    acorn: ^8
+  checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe
   languageName: node
   linkType: hard
 
-"espree@npm:^9.6.0, espree@npm:^9.6.1":
-  version: 9.6.1
-  resolution: "espree@npm:9.6.1"
-  dependencies:
-    acorn: "npm:^8.9.0"
-    acorn-jsx: "npm:^5.3.2"
-    eslint-visitor-keys: "npm:^3.4.1"
-  checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
+"acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "acorn-jsx@npm:5.3.2"
+  peerDependencies:
+    acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "esprima@npm:4.0.1"
+"acorn-walk@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "acorn-walk@npm:7.2.0"
+  checksum: 10c0/ff99f3406ed8826f7d6ef6ac76b7608f099d45a1ff53229fa267125da1924188dbacf02e7903dfcfd2ae4af46f7be8847dc7d564c73c4e230dfb69c8ea8e6b4c
+  languageName: node
+  linkType: hard
+
+"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2":
+  version: 8.3.2
+  resolution: "acorn-walk@npm:8.3.2"
+  checksum: 10c0/7e2a8dad5480df7f872569b9dccff2f3da7e65f5353686b1d6032ab9f4ddf6e3a2cb83a9b52cf50b1497fd522154dda92f0abf7153290cc79cd14721ff121e52
+  languageName: node
+  linkType: hard
+
+"acorn@npm:^6.4.1":
+  version: 6.4.2
+  resolution: "acorn@npm:6.4.2"
   bin:
-    esparse: ./bin/esparse.js
-    esvalidate: ./bin/esvalidate.js
-  checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
+    acorn: bin/acorn
+  checksum: 10c0/52a72d5d785fa64a95880f2951021a38954f8f69a4944dfeab6fb1449b0f02293eae109a56d55b58ff31a90a00d16a804658a12db8ef834c20b3d1201fe5ba5b
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.2":
-  version: 1.5.0
-  resolution: "esquery@npm:1.5.0"
-  dependencies:
-    estraverse: "npm:^5.1.0"
-  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+"acorn@npm:^7.1.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0":
+  version: 7.4.1
+  resolution: "acorn@npm:7.4.1"
+  bin:
+    acorn: bin/acorn
+  checksum: 10c0/bd0b2c2b0f334bbee48828ff897c12bd2eb5898d03bf556dcc8942022cec795ac5bb5b6b585e2de687db6231faf07e096b59a361231dd8c9344d5df5f7f0e526
   languageName: node
   linkType: hard
 
-"esrecurse@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "esrecurse@npm:4.3.0"
-  dependencies:
-    estraverse: "npm:^5.2.0"
-  checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
+"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.11.3
+  resolution: "acorn@npm:8.11.3"
+  bin:
+    acorn: bin/acorn
+  checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299
   languageName: node
   linkType: hard
 
-"estraverse@npm:^4.1.1":
-  version: 4.3.0
-  resolution: "estraverse@npm:4.3.0"
-  checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
+"address@npm:1.1.2":
+  version: 1.1.2
+  resolution: "address@npm:1.1.2"
+  checksum: 10c0/3ac908133d1d8cc52110473833718e82775428e73b4eb51b42cd7c7f571c7459c28c3c54592231efdcb96f6ed376eb490194e97c533df9e8efb910fa29a34e55
   languageName: node
   linkType: hard
 
-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "estraverse@npm:5.3.0"
-  checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
+"address@npm:^1.0.1":
+  version: 1.2.2
+  resolution: "address@npm:1.2.2"
+  checksum: 10c0/1c8056b77fb124456997b78ed682ecc19d2fd7ea8bd5850a2aa8c3e3134c913847c57bcae418622efd32ba858fa1e242a40a251ac31da0515664fc0ac03a047d
   languageName: node
   linkType: hard
 
-"esutils@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "esutils@npm:2.0.3"
-  checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
+"adjust-sourcemap-loader@npm:3.0.0":
+  version: 3.0.0
+  resolution: "adjust-sourcemap-loader@npm:3.0.0"
+  dependencies:
+    loader-utils: "npm:^2.0.0"
+    regex-parser: "npm:^2.2.11"
+  checksum: 10c0/928363c7b5d4f61c34c661d1f5ee2a74850c6ca0b8ccdaa88f69f9e294e06a273ec9d8e1c5de3fdf742f2e5e7a78943276bb4d954ac7e801f2a001291315cb22
   languageName: node
   linkType: hard
 
-"event-emitter@npm:^0.3.5":
-  version: 0.3.5
-  resolution: "event-emitter@npm:0.3.5"
+"agent-base@npm:6, agent-base@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "agent-base@npm:6.0.2"
   dependencies:
-    d: "npm:1"
-    es5-ext: "npm:~0.10.14"
-  checksum: 10c0/75082fa8ffb3929766d0f0a063bfd6046bd2a80bea2666ebaa0cfd6f4a9116be6647c15667bea77222afc12f5b4071b68d393cf39fdaa0e8e81eda006160aff0
+    debug: "npm:4"
+  checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
   languageName: node
   linkType: hard
 
-"events@npm:^3.2.0":
-  version: 3.3.0
-  resolution: "events@npm:3.3.0"
-  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
+  dependencies:
+    debug: "npm:^4.3.4"
+  checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50
   languageName: node
   linkType: hard
 
-"execa@npm:^5.0.0":
-  version: 5.1.1
-  resolution: "execa@npm:5.1.1"
+"agentkeepalive@npm:^4.2.1":
+  version: 4.5.0
+  resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
-    cross-spawn: "npm:^7.0.3"
-    get-stream: "npm:^6.0.0"
-    human-signals: "npm:^2.1.0"
-    is-stream: "npm:^2.0.0"
-    merge-stream: "npm:^2.0.0"
-    npm-run-path: "npm:^4.0.1"
-    onetime: "npm:^5.1.2"
-    signal-exit: "npm:^3.0.3"
-    strip-final-newline: "npm:^2.0.0"
-  checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
+    humanize-ms: "npm:^1.2.1"
+  checksum: 10c0/394ea19f9710f230722996e156607f48fdf3a345133b0b1823244b7989426c16019a428b56c82d3eabef616e938812981d9009f4792ecc66bd6a59e991c62612
   languageName: node
   linkType: hard
 
-"exit@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "exit@npm:0.1.2"
-  checksum: 10c0/71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
+"aggregate-error@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "aggregate-error@npm:3.1.0"
+  dependencies:
+    clean-stack: "npm:^2.0.0"
+    indent-string: "npm:^4.0.0"
+  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
   languageName: node
   linkType: hard
 
-"expect@npm:^29.0.0, expect@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "expect@npm:29.7.0"
+"ajv-errors@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "ajv-errors@npm:1.0.1"
+  peerDependencies:
+    ajv: ">=5.0.0"
+  checksum: 10c0/de2d6e8100c8707ea063ee4785d53adf599b457c0d4f72c3592244d67ad16448a6d35f7ce45f12bdd2819939447c876e8ef2f1c0800896d7f2aa25c3838acdf1
+  languageName: node
+  linkType: hard
+
+"ajv-formats@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "ajv-formats@npm:2.1.1"
   dependencies:
-    "@jest/expect-utils": "npm:^29.7.0"
-    jest-get-type: "npm:^29.6.3"
-    jest-matcher-utils: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-  checksum: 10c0/2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
+    ajv: "npm:^8.0.0"
+  peerDependencies:
+    ajv: ^8.0.0
+  peerDependenciesMeta:
+    ajv:
+      optional: true
+  checksum: 10c0/e43ba22e91b6a48d96224b83d260d3a3a561b42d391f8d3c6d2c1559f9aa5b253bfb306bc94bbeca1d967c014e15a6efe9a207309e95b3eaae07fcbcdc2af662
   languageName: node
   linkType: hard
 
-"exponential-backoff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+"ajv-keywords@npm:^3.1.0, ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2":
+  version: 3.5.2
+  resolution: "ajv-keywords@npm:3.5.2"
+  peerDependencies:
+    ajv: ^6.9.1
+  checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360
   languageName: node
   linkType: hard
 
-"ext@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "ext@npm:1.7.0"
+"ajv-keywords@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "ajv-keywords@npm:5.1.0"
   dependencies:
-    type: "npm:^2.7.2"
-  checksum: 10c0/a8e5f34e12214e9eee3a4af3b5c9d05ba048f28996450975b369fc86e5d0ef13b6df0615f892f5396a9c65d616213c25ec5b0ad17ef42eac4a500512a19da6c7
+    fast-deep-equal: "npm:^3.1.3"
+  peerDependencies:
+    ajv: ^8.8.2
+  checksum: 10c0/18bec51f0171b83123ba1d8883c126e60c6f420cef885250898bf77a8d3e65e3bfb9e8564f497e30bdbe762a83e0d144a36931328616a973ee669dc74d4a9590
   languageName: node
   linkType: hard
 
-"fantasticon@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "fantasticon@npm:1.2.3"
+"ajv@npm:^6.1.0, ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.11.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.12.6":
+  version: 6.12.6
+  resolution: "ajv@npm:6.12.6"
   dependencies:
-    change-case: "npm:^4.1.2"
-    cli-color: "npm:^2.0.0"
-    commander: "npm:^7.2.0"
-    glob: "npm:^7.2.0"
-    handlebars: "npm:^4.7.7"
-    slugify: "npm:^1.6.0"
-    svg2ttf: "npm:^6.0.3"
-    svgicons2svgfont: "npm:^10.0.3"
-    ttf2eot: "npm:^2.0.0"
-    ttf2woff: "npm:^3.0.0"
-    ttf2woff2: "npm:^4.0.4"
-  bin:
-    fantasticon: bin/fantasticon
-  checksum: 10c0/e2a328258574f033daa0af0523d467fa2709e482316c00e47010b06e5108274b09a1d0d76324f6ab879c7365108ba72eb768aadb45da6e28afecd506cb507c3a
+    fast-deep-equal: "npm:^3.1.1"
+    fast-json-stable-stringify: "npm:^2.0.0"
+    json-schema-traverse: "npm:^0.4.1"
+    uri-js: "npm:^4.2.2"
+  checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
   languageName: node
   linkType: hard
 
-"fast-content-type-parse@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "fast-content-type-parse@npm:1.1.0"
-  checksum: 10c0/882bf990fa5d64be1825ce183818db43900ece0d7ef184cb9409bae8ed1001acbe536a657b1496382cb3e308e71ab39cc399bbdae70cba1745eecaeca4e55384
+"ajv@npm:^8.0.0, ajv@npm:^8.1.0, ajv@npm:^8.9.0":
+  version: 8.12.0
+  resolution: "ajv@npm:8.12.0"
+  dependencies:
+    fast-deep-equal: "npm:^3.1.1"
+    json-schema-traverse: "npm:^1.0.0"
+    require-from-string: "npm:^2.0.2"
+    uri-js: "npm:^4.2.2"
+  checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e
   languageName: node
   linkType: hard
 
-"fast-decode-uri-component@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "fast-decode-uri-component@npm:1.0.1"
-  checksum: 10c0/039d50c2e99d64f999c3f2126c23fbf75a04a4117e218a149ca0b1d2aeb8c834b7b19d643b9d35d4eabce357189a6a94085f78cf48869e6e26cc59b036284bc3
+"ajv@npm:^8.0.1":
+  version: 8.13.0
+  resolution: "ajv@npm:8.13.0"
+  dependencies:
+    fast-deep-equal: "npm:^3.1.3"
+    json-schema-traverse: "npm:^1.0.0"
+    require-from-string: "npm:^2.0.2"
+    uri-js: "npm:^4.4.1"
+  checksum: 10c0/14c6497b6f72843986d7344175a1aa0e2c35b1e7f7475e55bc582cddb765fca7e6bf950f465dc7846f817776d9541b706f4b5b3fbedd8dfdeb5fce6f22864264
   languageName: node
   linkType: hard
 
-"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "fast-deep-equal@npm:3.1.3"
-  checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
+"alphanum-sort@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "alphanum-sort@npm:1.0.2"
+  checksum: 10c0/2944e7ae4d36328a2df071017c01cd1d06ef6a5d87c8fbbeffd9075d42f4da48051bde79a5e3d863b98f37778c76e8eebd4353c1e7bbba2480382096953ec2b8
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.9":
-  version: 3.3.2
-  resolution: "fast-glob@npm:3.3.2"
-  dependencies:
-    "@nodelib/fs.stat": "npm:^2.0.2"
-    "@nodelib/fs.walk": "npm:^1.2.3"
-    glob-parent: "npm:^5.1.2"
-    merge2: "npm:^1.3.0"
-    micromatch: "npm:^4.0.4"
-  checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+"ansi-colors@npm:^3.0.0":
+  version: 3.2.4
+  resolution: "ansi-colors@npm:3.2.4"
+  checksum: 10c0/1785466547bac3b1cb8055325a415c8c946a818669da4fd3d1247cab7617b845b221c2ae04756277074d278b52d90efd67f73d2dd927c7a0d1a10395c1b7665b
   languageName: node
   linkType: hard
 
-"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "fast-json-stable-stringify@npm:2.1.0"
-  checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
+"ansi-colors@npm:^4.1.1":
+  version: 4.1.3
+  resolution: "ansi-colors@npm:4.1.3"
+  checksum: 10c0/ec87a2f59902f74e61eada7f6e6fe20094a628dab765cfdbd03c3477599368768cffccdb5d3bb19a1b6c99126783a143b1fee31aab729b31ffe5836c7e5e28b9
   languageName: node
   linkType: hard
 
-"fast-json-stringify@npm:^2.5.2":
+"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.1":
+  version: 4.3.2
+  resolution: "ansi-escapes@npm:4.3.2"
+  dependencies:
+    type-fest: "npm:^0.21.3"
+  checksum: 10c0/da917be01871525a3dfcf925ae2977bc59e8c513d4423368645634bf5d4ceba5401574eb705c1e92b79f7292af5a656f78c5725a4b0e1cec97c4b413705c1d50
+  languageName: node
+  linkType: hard
+
+"ansi-html@npm:0.0.7, ansi-html@npm:^0.0.7":
+  version: 0.0.7
+  resolution: "ansi-html@npm:0.0.7"
+  bin:
+    ansi-html: ./bin/ansi-html
+  checksum: 10c0/f6d3072422dc8d4c795142fd4ee8ee596538ddd02ac23676ec6c61dc61c1149f61acfc651b28ff49e7828a6372d4adab2d94d14e95feff73f656388803e13929
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "ansi-regex@npm:2.1.1"
+  checksum: 10c0/78cebaf50bce2cb96341a7230adf28d804611da3ce6bf338efa7b72f06cc6ff648e29f80cd95e582617ba58d5fdbec38abfeed3500a98bce8381a9daec7c548b
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^4.1.0":
+  version: 4.1.1
+  resolution: "ansi-regex@npm:4.1.1"
+  checksum: 10c0/d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "ansi-regex@npm:5.0.1"
+  checksum: 10c0/9a64bb8627b434ba9327b60c027742e5d17ac69277960d041898596271d992d4d52ba7267a63ca10232e29f6107fc8a835f6ce8d719b88c5f8493f8254813737
+  languageName: node
+  linkType: hard
+
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "ansi-styles@npm:3.2.1"
+  dependencies:
+    color-convert: "npm:^1.9.0"
+  checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
+  version: 4.3.0
+  resolution: "ansi-styles@npm:4.3.0"
+  dependencies:
+    color-convert: "npm:^2.0.1"
+  checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^5.0.0":
+  version: 5.2.0
+  resolution: "ansi-styles@npm:5.2.0"
+  checksum: 10c0/9c4ca80eb3c2fb7b33841c210d2f20807f40865d27008d7c3f707b7f95cab7d67462a565e2388ac3285b71cb3d9bb2173de8da37c57692a362885ec34d6e27df
+  languageName: node
+  linkType: hard
+
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
+  languageName: node
+  linkType: hard
+
+"anymatch@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "anymatch@npm:2.0.0"
+  dependencies:
+    micromatch: "npm:^3.1.4"
+    normalize-path: "npm:^2.1.1"
+  checksum: 10c0/a0d745e52f0233048724b9c9d7b1d8a650f7a50151a0f1d2cce1857b09fd096052d334f8c570cc88596edef8249ae778f767db94025cd00f81e154a37bb7e34e
+  languageName: node
+  linkType: hard
+
+"anymatch@npm:^3.0.0, anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
+  version: 3.1.3
+  resolution: "anymatch@npm:3.1.3"
+  dependencies:
+    normalize-path: "npm:^3.0.0"
+    picomatch: "npm:^2.0.4"
+  checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
+  languageName: node
+  linkType: hard
+
+"aproba@npm:^1.0.3 || ^2.0.0":
+  version: 2.0.0
+  resolution: "aproba@npm:2.0.0"
+  checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5
+  languageName: node
+  linkType: hard
+
+"aproba@npm:^1.1.1":
+  version: 1.2.0
+  resolution: "aproba@npm:1.2.0"
+  checksum: 10c0/2d34f008c9edfa991f42fe4b667d541d38a474a39ae0e24805350486d76744cd91ee45313283c1d39a055b14026dd0fc4d0cbfc13f210855d59d7e8b5a61dc51
+  languageName: node
+  linkType: hard
+
+"archy@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "archy@npm:1.0.0"
+  checksum: 10c0/200c849dd1c304ea9914827b0555e7e1e90982302d574153e28637db1a663c53de62bad96df42d50e8ce7fc18d05e3437d9aa8c4b383803763755f0956c7d308
+  languageName: node
+  linkType: hard
+
+"are-we-there-yet@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "are-we-there-yet@npm:3.0.1"
+  dependencies:
+    delegates: "npm:^1.0.0"
+    readable-stream: "npm:^3.6.0"
+  checksum: 10c0/8373f289ba42e4b5ec713bb585acdac14b5702c75f2a458dc985b9e4fa5762bc5b46b40a21b72418a3ed0cfb5e35bdc317ef1ae132f3035f633d581dd03168c3
+  languageName: node
+  linkType: hard
+
+"argparse@npm:^1.0.6, argparse@npm:^1.0.7":
+  version: 1.0.10
+  resolution: "argparse@npm:1.0.10"
+  dependencies:
+    sprintf-js: "npm:~1.0.2"
+  checksum: 10c0/b2972c5c23c63df66bca144dbc65d180efa74f25f8fd9b7d9a0a6c88ae839db32df3d54770dcb6460cf840d232b60695d1a6b1053f599d84e73f7437087712de
+  languageName: node
+  linkType: hard
+
+"argparse@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "argparse@npm:2.0.1"
+  checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e
+  languageName: node
+  linkType: hard
+
+"aria-query@npm:^4.2.2":
+  version: 4.2.2
+  resolution: "aria-query@npm:4.2.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.10.2"
+    "@babel/runtime-corejs3": "npm:^7.10.2"
+  checksum: 10c0/7e224fbbb4de8210c5d8cbaf0e1a22caa78f2068bf231f4c75302bd77eeba1c3e3b97912080535140be60174720d2ac817e5d6fec18592951b4b6488d4da7cdc
+  languageName: node
+  linkType: hard
+
+"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "aria-query@npm:5.3.0"
+  dependencies:
+    dequal: "npm:^2.0.3"
+  checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
+  languageName: node
+  linkType: hard
+
+"arity-n@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "arity-n@npm:1.0.4"
+  checksum: 10c0/31c390104bf3b9275574c9d59df67b8a2684981b93ca728a99c4f92241b71b8089b1e99b732f889891e78087887b49a59c885167e2185303449bece83e8d7f9c
+  languageName: node
+  linkType: hard
+
+"arr-diff@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "arr-diff@npm:4.0.0"
+  checksum: 10c0/67b80067137f70c89953b95f5c6279ad379c3ee39f7143578e13bd51580a40066ee2a55da066e22d498dce10f68c2d70056d7823f972fab99dfbf4c78d0bc0f7
+  languageName: node
+  linkType: hard
+
+"arr-flatten@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "arr-flatten@npm:1.1.0"
+  checksum: 10c0/bef53be02ed3bc58f202b3861a5b1eb6e1ae4fecf39c3ad4d15b1e0433f941077d16e019a33312d820844b0661777322acbb7d0c447b04d9bdf7d6f9c532548a
+  languageName: node
+  linkType: hard
+
+"arr-union@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "arr-union@npm:3.1.0"
+  checksum: 10c0/7d5aa05894e54aa93c77c5726c1dd5d8e8d3afe4f77983c0aa8a14a8a5cbe8b18f0cf4ecaa4ac8c908ef5f744d2cbbdaa83fd6e96724d15fea56cfa7f5efdd51
+  languageName: node
+  linkType: hard
+
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    is-array-buffer: "npm:^3.0.4"
+  checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917
+  languageName: node
+  linkType: hard
+
+"array-flatten@npm:1.1.1":
+  version: 1.1.1
+  resolution: "array-flatten@npm:1.1.1"
+  checksum: 10c0/806966c8abb2f858b08f5324d9d18d7737480610f3bd5d3498aaae6eb5efdc501a884ba019c9b4a8f02ff67002058749d05548fd42fa8643f02c9c7f22198b91
+  languageName: node
+  linkType: hard
+
+"array-flatten@npm:^2.1.0":
+  version: 2.1.2
+  resolution: "array-flatten@npm:2.1.2"
+  checksum: 10c0/bdc1cee68e41bec9cfc1161408734e2269428ef371445606bce4e6241001e138a94b9a617cc9a5b4b7fe6a3a51e3d5a942646975ce82a2e202ccf3e9b478c82f
+  languageName: node
+  linkType: hard
+
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
+  version: 3.1.8
+  resolution: "array-includes@npm:3.1.8"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    is-string: "npm:^1.0.7"
+  checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370
+  languageName: node
+  linkType: hard
+
+"array-union@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "array-union@npm:1.0.2"
+  dependencies:
+    array-uniq: "npm:^1.0.1"
+  checksum: 10c0/18686767c0cfdae8dc4acf5ac119b0f0eacad82b7fcc0aa62cc41f93c5ad406d494b6a6e53d85e52e8f0349b67a4fec815feeb537e95c02510d747bc9a4157c7
+  languageName: node
+  linkType: hard
+
+"array-union@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "array-union@npm:2.1.0"
+  checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962
+  languageName: node
+  linkType: hard
+
+"array-uniq@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "array-uniq@npm:1.0.3"
+  checksum: 10c0/3acbaf9e6d5faeb1010e2db04ab171b8d265889e46c61762e502979bdc5e55656013726e9a61507de3c82d329a0dc1e8072630a3454b4f2b881cb19ba7fd8aa6
+  languageName: node
+  linkType: hard
+
+"array-unique@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "array-unique@npm:0.3.2"
+  checksum: 10c0/dbf4462cdba8a4b85577be07705210b3d35be4b765822a3f52962d907186617638ce15e0603a4fefdcf82f4cbbc9d433f8cbbd6855148a68872fa041b6474121
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlast@npm:^1.2.4":
+  version: 1.2.5
+  resolution: "array.prototype.findlast@npm:1.2.5"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/ddc952b829145ab45411b9d6adcb51a8c17c76bf89c9dd64b52d5dffa65d033da8c076ed2e17091779e83bc892b9848188d7b4b33453c5565e65a92863cb2775
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlastindex@npm:^1.2.3":
+  version: 1.2.5
+  resolution: "array.prototype.findlastindex@npm:1.2.5"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/962189487728b034f3134802b421b5f39e42ee2356d13b42d2ddb0e52057ffdcc170b9524867f4f0611a6f638f4c19b31e14606e8bcbda67799e26685b195aa3
+  languageName: node
+  linkType: hard
+
+"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "array.prototype.flat@npm:1.3.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+  languageName: node
+  linkType: hard
+
+"array.prototype.flatmap@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "array.prototype.flatmap@npm:1.3.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4
+  languageName: node
+  linkType: hard
+
+"array.prototype.reduce@npm:^1.0.6":
+  version: 1.0.7
+  resolution: "array.prototype.reduce@npm:1.0.7"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-array-method-boxes-properly: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    is-string: "npm:^1.0.7"
+  checksum: 10c0/97aac907d7b15088d5b991bad79de96f95ea0d47a701a034e2dc816e0aabaed2fb401d7fe65ab6fda05eafa58319aa2d1bac404f515e162b81b3b61a51224db2
+  languageName: node
+  linkType: hard
+
+"array.prototype.toreversed@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "array.prototype.toreversed@npm:1.1.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    es-shim-unscopables: "npm:^1.0.0"
+  checksum: 10c0/2b7627ea85eae1e80ecce665a500cc0f3355ac83ee4a1a727562c7c2a1d5f1c0b4dd7b65c468ec6867207e452ba01256910a2c0b41486bfdd11acf875a7a3435
+  languageName: node
+  linkType: hard
+
+"array.prototype.tosorted@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "array.prototype.tosorted@npm:1.1.3"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.1.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.22.3"
+    es-errors: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.3"
+    is-array-buffer: "npm:^3.0.4"
+    is-shared-array-buffer: "npm:^1.0.2"
+  checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36
+  languageName: node
+  linkType: hard
+
+"arrify@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "arrify@npm:2.0.1"
+  checksum: 10c0/3fb30b5e7c37abea1907a60b28a554d2f0fc088757ca9bf5b684786e583fdf14360721eb12575c1ce6f995282eab936712d3c4389122682eafab0e0b57f78dbb
+  languageName: node
+  linkType: hard
+
+"asap@npm:~2.0.6":
+  version: 2.0.6
+  resolution: "asap@npm:2.0.6"
+  checksum: 10c0/c6d5e39fe1f15e4b87677460bd66b66050cd14c772269cee6688824c1410a08ab20254bb6784f9afb75af9144a9f9a7692d49547f4d19d715aeb7c0318f3136d
+  languageName: node
+  linkType: hard
+
+"asn1.js@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "asn1.js@npm:4.10.1"
+  dependencies:
+    bn.js: "npm:^4.0.0"
+    inherits: "npm:^2.0.1"
+    minimalistic-assert: "npm:^1.0.0"
+  checksum: 10c0/afa7f3ab9e31566c80175a75b182e5dba50589dcc738aa485be42bdd787e2a07246a4b034d481861123cbe646a7656f318f4f1cad2e9e5e808a210d5d6feaa88
+  languageName: node
+  linkType: hard
+
+"assert@npm:^1.1.1":
+  version: 1.5.1
+  resolution: "assert@npm:1.5.1"
+  dependencies:
+    object.assign: "npm:^4.1.4"
+    util: "npm:^0.10.4"
+  checksum: 10c0/836688b928b68b7fc5bbc165443e16a62623d57676a1e8a980a0316f9ae86e5e0a102c63470491bf55a8545e75766303640c0c7ad1cf6bfa5450130396043bbd
+  languageName: node
+  linkType: hard
+
+"assign-symbols@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "assign-symbols@npm:1.0.0"
+  checksum: 10c0/29a654b8a6da6889a190d0d0efef4b1bfb5948fa06cbc245054aef05139f889f2f7c75b989917e3fde853fc4093b88048e4de8578a73a76f113d41bfd66e5775
+  languageName: node
+  linkType: hard
+
+"ast-types-flow@npm:^0.0.8":
+  version: 0.0.8
+  resolution: "ast-types-flow@npm:0.0.8"
+  checksum: 10c0/f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e
+  languageName: node
+  linkType: hard
+
+"astral-regex@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "astral-regex@npm:2.0.0"
+  checksum: 10c0/f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25
+  languageName: node
+  linkType: hard
+
+"async-each@npm:^1.0.1":
+  version: 1.0.6
+  resolution: "async-each@npm:1.0.6"
+  checksum: 10c0/d4e45e8f077e20e015952c065ceae75f82b30ee2d4a8e56a5c454ae44331aaa009d8c94fe043ba254c177bffae9f6ebeefebb7daf9f7ce4d27fac0274dc328ae
+  languageName: node
+  linkType: hard
+
+"async-limiter@npm:~1.0.0":
+  version: 1.0.1
+  resolution: "async-limiter@npm:1.0.1"
+  checksum: 10c0/0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969
+  languageName: node
+  linkType: hard
+
+"async@npm:^2.6.4":
+  version: 2.6.4
+  resolution: "async@npm:2.6.4"
+  dependencies:
+    lodash: "npm:^4.17.14"
+  checksum: 10c0/0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0
+  languageName: node
+  linkType: hard
+
+"asynckit@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "asynckit@npm:0.4.0"
+  checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d
+  languageName: node
+  linkType: hard
+
+"at-least-node@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "at-least-node@npm:1.0.0"
+  checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef
+  languageName: node
+  linkType: hard
+
+"atob@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "atob@npm:2.1.2"
+  bin:
+    atob: bin/atob.js
+  checksum: 10c0/ada635b519dc0c576bb0b3ca63a73b50eefacf390abb3f062558342a8d68f2db91d0c8db54ce81b0d89de3b0f000de71f3ae7d761fd7d8cc624278fe443d6c7e
+  languageName: node
+  linkType: hard
+
+"atomic-sleep@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "atomic-sleep@npm:1.0.0"
+  checksum: 10c0/e329a6665512736a9bbb073e1761b4ec102f7926cce35037753146a9db9c8104f5044c1662e4a863576ce544fb8be27cd2be6bc8c1a40147d03f31eb1cfb6e8a
+  languageName: node
+  linkType: hard
+
+"autoprefixer@npm:^9.6.1":
+  version: 9.8.8
+  resolution: "autoprefixer@npm:9.8.8"
+  dependencies:
+    browserslist: "npm:^4.12.0"
+    caniuse-lite: "npm:^1.0.30001109"
+    normalize-range: "npm:^0.1.2"
+    num2fraction: "npm:^1.2.2"
+    picocolors: "npm:^0.2.1"
+    postcss: "npm:^7.0.32"
+    postcss-value-parser: "npm:^4.1.0"
+  bin:
+    autoprefixer: bin/autoprefixer
+  checksum: 10c0/9b2688cd0ef7252ae1a565ca935a83ddd5c38b9b4c7bf895f36d88e91dbc36d2e7ccb2d34270e436498d8f372d7320a83af6ceb5d1c3bff8f8cbeb6ff33ac837
+  languageName: node
+  linkType: hard
+
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: "npm:^1.0.0"
+  checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2
+  languageName: node
+  linkType: hard
+
+"avvio@npm:^7.1.2":
+  version: 7.2.5
+  resolution: "avvio@npm:7.2.5"
+  dependencies:
+    archy: "npm:^1.0.0"
+    debug: "npm:^4.0.0"
+    fastq: "npm:^1.6.1"
+    queue-microtask: "npm:^1.1.2"
+  checksum: 10c0/20ca0bf216647ff09ebaa9f206cd55dbe768a72b915ad41e517223ed4595ab7ec72eeff99a5da88d47a7ecc53002424d2b4c68b09559e3ab918c296ced5100d8
+  languageName: node
+  linkType: hard
+
+"axe-core@npm:=4.7.0":
+  version: 4.7.0
+  resolution: "axe-core@npm:4.7.0"
+  checksum: 10c0/89ac5712b5932ac7d23398b4cb5ba081c394a086e343acc68ba49c83472706e18e0799804e8388c779dcdacc465377deb29f2714241d3fbb389cf3a6b275c9ba
+  languageName: node
+  linkType: hard
+
+"axios@npm:^1.6.8":
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
+  dependencies:
+    follow-redirects: "npm:^1.15.6"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9
+  languageName: node
+  linkType: hard
+
+"axobject-query@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "axobject-query@npm:3.2.1"
+  dependencies:
+    dequal: "npm:^2.0.3"
+  checksum: 10c0/f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7
+  languageName: node
+  linkType: hard
+
+"babel-eslint@npm:^10.1.0":
+  version: 10.1.0
+  resolution: "babel-eslint@npm:10.1.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.0.0"
+    "@babel/parser": "npm:^7.7.0"
+    "@babel/traverse": "npm:^7.7.0"
+    "@babel/types": "npm:^7.7.0"
+    eslint-visitor-keys: "npm:^1.0.0"
+    resolve: "npm:^1.12.0"
+  peerDependencies:
+    eslint: ">= 4.12.1"
+  checksum: 10c0/a1596111871ce3615410a2ffb87ab8383b35a8c8e1942b47130cb12bca2578c8eb9d8e56c3c84f44d7abe716684f6794f2e6c1e5b4e6d09f171ae51670be44b9
+  languageName: node
+  linkType: hard
+
+"babel-extract-comments@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "babel-extract-comments@npm:1.0.0"
+  dependencies:
+    babylon: "npm:^6.18.0"
+  checksum: 10c0/e57e36648ecabc77934bbdd1b88394f76fb5bf9c3a0f615459486a6076f5f57c5eba054c628cca1f7cedf34f242df5f909e1cabc8ce68a24d80b90a6d9061cd5
+  languageName: node
+  linkType: hard
+
+"babel-jest@npm:^26.6.0, babel-jest@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "babel-jest@npm:26.6.3"
+  dependencies:
+    "@jest/transform": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/babel__core": "npm:^7.1.7"
+    babel-plugin-istanbul: "npm:^6.0.0"
+    babel-preset-jest: "npm:^26.6.2"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.4"
+    slash: "npm:^3.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/355e431fbd663fd43dcf68c93edcf66e31c3295c35754739edb3ce39435fdc407de75540b310b370e6eb924af528839b6effb8de21870ad12423aac31e258221
+  languageName: node
+  linkType: hard
+
+"babel-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "babel-jest@npm:29.7.0"
+  dependencies:
+    "@jest/transform": "npm:^29.7.0"
+    "@types/babel__core": "npm:^7.1.14"
+    babel-plugin-istanbul: "npm:^6.1.1"
+    babel-preset-jest: "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    slash: "npm:^3.0.0"
+  peerDependencies:
+    "@babel/core": ^7.8.0
+  checksum: 10c0/2eda9c1391e51936ca573dd1aedfee07b14c59b33dbe16ef347873ddd777bcf6e2fc739681e9e9661ab54ef84a3109a03725be2ac32cd2124c07ea4401cbe8c1
+  languageName: node
+  linkType: hard
+
+"babel-loader@npm:8.1.0":
+  version: 8.1.0
+  resolution: "babel-loader@npm:8.1.0"
+  dependencies:
+    find-cache-dir: "npm:^2.1.0"
+    loader-utils: "npm:^1.4.0"
+    mkdirp: "npm:^0.5.3"
+    pify: "npm:^4.0.1"
+    schema-utils: "npm:^2.6.5"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+    webpack: ">=2"
+  checksum: 10c0/f5accd405956e8e77bb82b145e57e59eba737b8e5a2e3dd47a77be194a7f305c97087c55f749435b9ce3d3b41992434080e962f4bd7bc768b3082cb47548509d
+  languageName: node
+  linkType: hard
+
+"babel-plugin-istanbul@npm:^6.0.0, babel-plugin-istanbul@npm:^6.1.1":
+  version: 6.1.1
+  resolution: "babel-plugin-istanbul@npm:6.1.1"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.0.0"
+    "@istanbuljs/load-nyc-config": "npm:^1.0.0"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-instrument: "npm:^5.0.4"
+    test-exclude: "npm:^6.0.0"
+  checksum: 10c0/1075657feb705e00fd9463b329921856d3775d9867c5054b449317d39153f8fbcebd3e02ebf00432824e647faff3683a9ca0a941325ef1afe9b3c4dd51b24beb
+  languageName: node
+  linkType: hard
+
+"babel-plugin-jest-hoist@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "babel-plugin-jest-hoist@npm:26.6.2"
+  dependencies:
+    "@babel/template": "npm:^7.3.3"
+    "@babel/types": "npm:^7.3.3"
+    "@types/babel__core": "npm:^7.0.0"
+    "@types/babel__traverse": "npm:^7.0.6"
+  checksum: 10c0/2fcddf7b338e38453d6a42c23db5b790e4188fcbffeba8ff74a62b7d64fe5a642b009a7bd780e47840c382600628de2a6486a92bb151648c64028a6c628e9bfd
+  languageName: node
+  linkType: hard
+
+"babel-plugin-jest-hoist@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-plugin-jest-hoist@npm:29.6.3"
+  dependencies:
+    "@babel/template": "npm:^7.3.3"
+    "@babel/types": "npm:^7.3.3"
+    "@types/babel__core": "npm:^7.1.14"
+    "@types/babel__traverse": "npm:^7.0.6"
+  checksum: 10c0/7e6451caaf7dce33d010b8aafb970e62f1b0c0b57f4978c37b0d457bbcf0874d75a395a102daf0bae0bd14eafb9f6e9a165ee5e899c0a4f1f3bb2e07b304ed2e
+  languageName: node
+  linkType: hard
+
+"babel-plugin-macros@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "babel-plugin-macros@npm:3.1.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.12.5"
+    cosmiconfig: "npm:^7.0.0"
+    resolve: "npm:^1.19.0"
+  checksum: 10c0/c6dfb15de96f67871d95bd2e8c58b0c81edc08b9b087dc16755e7157f357dc1090a8dc60ebab955e92587a9101f02eba07e730adc253a1e4cf593ca3ebd3839c
+  languageName: node
+  linkType: hard
+
+"babel-plugin-named-asset-import@npm:^0.3.7":
+  version: 0.3.8
+  resolution: "babel-plugin-named-asset-import@npm:0.3.8"
+  peerDependencies:
+    "@babel/core": ^7.1.0
+  checksum: 10c0/1a583432e16b9b17ead619f2c1d241106c5e57171d75e0494b93a3f23fec94c53a6e521b9485a17f8daa6c5ddb111e57849b424c7796fa07c204cbbee1583f48
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-corejs2@npm:^0.4.10":
+  version: 0.4.11
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.11"
+  dependencies:
+    "@babel/compat-data": "npm:^7.22.6"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
+    semver: "npm:^6.3.1"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10c0/b2217bc8d5976cf8142453ed44daabf0b2e0e75518f24eac83b54a8892e87a88f1bd9089daa92fd25df979ecd0acfd29b6bc28c4182c1c46344cee15ef9bce84
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4":
+  version: 0.10.4
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.1"
+    core-js-compat: "npm:^3.36.1"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10c0/31b92cd3dfb5b417da8dfcf0deaa4b8b032b476d7bb31ca51c66127cf25d41e89260e89d17bc004b2520faa38aa9515fafabf81d89f9d4976e9dc1163e4a7c41
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-regenerator@npm:^0.6.1":
+  version: 0.6.2
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.2"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.2"
+  peerDependencies:
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 10c0/bc541037cf7620bc84ddb75a1c0ce3288f90e7d2799c070a53f8a495c8c8ae0316447becb06f958dd25dcce2a2fce855d318ecfa48036a1ddb218d55aa38a744
+  languageName: node
+  linkType: hard
+
+"babel-plugin-syntax-object-rest-spread@npm:^6.8.0":
+  version: 6.13.0
+  resolution: "babel-plugin-syntax-object-rest-spread@npm:6.13.0"
+  checksum: 10c0/c52846fea6ada0689446edf8bbe9634f89e22d3d7a66d994ec64f91f8e04de06758f68dfe3ed06d69b5c668e55cebc105650c89b1f00f8c6ef9778f847baf15a
+  languageName: node
+  linkType: hard
+
+"babel-plugin-transform-object-rest-spread@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-plugin-transform-object-rest-spread@npm:6.26.0"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread: "npm:^6.8.0"
+    babel-runtime: "npm:^6.26.0"
+  checksum: 10c0/ba0da2471ab7dab4b48df54ae2c920d0a5756667ce7e62e9acd1e891bfdd0d8e62412d61d68076c7bc9ac68d8338b533e296df55c55fc4ab70b8bf1e186e526c
+  languageName: node
+  linkType: hard
+
+"babel-plugin-transform-react-remove-prop-types@npm:^0.4.24":
+  version: 0.4.24
+  resolution: "babel-plugin-transform-react-remove-prop-types@npm:0.4.24"
+  checksum: 10c0/713441fd9fb663cc95709cb52d9c2c6228ea6d5406092a8a50094c810bcb13c3c347f8fca703d45b20cc401782743a91d7272025950147f9247d53360267f107
+  languageName: node
+  linkType: hard
+
+"babel-preset-current-node-syntax@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "babel-preset-current-node-syntax@npm:1.0.1"
+  dependencies:
+    "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
+    "@babel/plugin-syntax-bigint": "npm:^7.8.3"
+    "@babel/plugin-syntax-class-properties": "npm:^7.8.3"
+    "@babel/plugin-syntax-import-meta": "npm:^7.8.3"
+    "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
+    "@babel/plugin-syntax-numeric-separator": "npm:^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
+    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
+    "@babel/plugin-syntax-top-level-await": "npm:^7.8.3"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/5ba39a3a0e6c37d25e56a4fb843be632dac98d54706d8a0933f9bcb1a07987a96d55c2b5a6c11788a74063fb2534fe68c1f1dbb6c93626850c785e0938495627
+  languageName: node
+  linkType: hard
+
+"babel-preset-jest@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "babel-preset-jest@npm:26.6.2"
+  dependencies:
+    babel-plugin-jest-hoist: "npm:^26.6.2"
+    babel-preset-current-node-syntax: "npm:^1.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/b6e0efe33b485eb2fba019026933e46d680605b3bf84a6b7378f1df8344b890f66318c49129921dd98bf5819694316312a97b50b16d9aa377faf8624f9f0db5b
+  languageName: node
+  linkType: hard
+
+"babel-preset-jest@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-preset-jest@npm:29.6.3"
+  dependencies:
+    babel-plugin-jest-hoist: "npm:^29.6.3"
+    babel-preset-current-node-syntax: "npm:^1.0.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/ec5fd0276b5630b05f0c14bb97cc3815c6b31600c683ebb51372e54dcb776cff790bdeeabd5b8d01ede375a040337ccbf6a3ccd68d3a34219125945e167ad943
+  languageName: node
+  linkType: hard
+
+"babel-preset-react-app@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "babel-preset-react-app@npm:10.0.1"
+  dependencies:
+    "@babel/core": "npm:^7.16.0"
+    "@babel/plugin-proposal-class-properties": "npm:^7.16.0"
+    "@babel/plugin-proposal-decorators": "npm:^7.16.4"
+    "@babel/plugin-proposal-nullish-coalescing-operator": "npm:^7.16.0"
+    "@babel/plugin-proposal-numeric-separator": "npm:^7.16.0"
+    "@babel/plugin-proposal-optional-chaining": "npm:^7.16.0"
+    "@babel/plugin-proposal-private-methods": "npm:^7.16.0"
+    "@babel/plugin-transform-flow-strip-types": "npm:^7.16.0"
+    "@babel/plugin-transform-react-display-name": "npm:^7.16.0"
+    "@babel/plugin-transform-runtime": "npm:^7.16.4"
+    "@babel/preset-env": "npm:^7.16.4"
+    "@babel/preset-react": "npm:^7.16.0"
+    "@babel/preset-typescript": "npm:^7.16.0"
+    "@babel/runtime": "npm:^7.16.3"
+    babel-plugin-macros: "npm:^3.1.0"
+    babel-plugin-transform-react-remove-prop-types: "npm:^0.4.24"
+  checksum: 10c0/aba225d0caf2591f7cc1aeed69369d1e86419a92fcf6025312421c238f4468347a7b6c12a45a4fb15e879a01f5a060439842fbde5739d7be31077b35c7d20fa5
+  languageName: node
+  linkType: hard
+
+"babel-runtime@npm:^6.26.0":
+  version: 6.26.0
+  resolution: "babel-runtime@npm:6.26.0"
+  dependencies:
+    core-js: "npm:^2.4.0"
+    regenerator-runtime: "npm:^0.11.0"
+  checksum: 10c0/caa752004936b1463765ed3199c52f6a55d0613b9bed108743d6f13ca532b821d4ea9decc4be1b583193164462b1e3e7eefdfa36b15c72e7daac58dd72c1772f
+  languageName: node
+  linkType: hard
+
+"babylon@npm:^6.18.0":
+  version: 6.18.0
+  resolution: "babylon@npm:6.18.0"
+  bin:
+    babylon: ./bin/babylon.js
+  checksum: 10c0/9b1bf946e16782deadb1f5414c1269efa6044eb1e97a3de2051f09a3f2a54e97be3542d4242b28d23de0ef67816f519d38ce1ec3ddb7be306131c39a60e5a667
+  languageName: node
+  linkType: hard
+
+"balanced-match@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "balanced-match@npm:1.0.2"
+  checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee
+  languageName: node
+  linkType: hard
+
+"base64-js@npm:^1.0.2":
+  version: 1.5.1
+  resolution: "base64-js@npm:1.5.1"
+  checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
+  languageName: node
+  linkType: hard
+
+"base@npm:^0.11.1":
+  version: 0.11.2
+  resolution: "base@npm:0.11.2"
+  dependencies:
+    cache-base: "npm:^1.0.1"
+    class-utils: "npm:^0.3.5"
+    component-emitter: "npm:^1.2.1"
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    mixin-deep: "npm:^1.2.0"
+    pascalcase: "npm:^0.1.1"
+  checksum: 10c0/30a2c0675eb52136b05ef496feb41574d9f0bb2d6d677761da579c00a841523fccf07f1dbabec2337b5f5750f428683b8ca60d89e56a1052c4ae1c0cd05de64d
+  languageName: node
+  linkType: hard
+
+"batch@npm:0.6.1":
+  version: 0.6.1
+  resolution: "batch@npm:0.6.1"
+  checksum: 10c0/925a13897b4db80d4211082fe287bcf96d297af38e26448c857cee3e095c9792e3b8f26b37d268812e7f38a589f694609de8534a018b1937d7dc9f84e6b387c5
+  languageName: node
+  linkType: hard
+
+"bfj@npm:^7.0.2":
+  version: 7.1.0
+  resolution: "bfj@npm:7.1.0"
+  dependencies:
+    bluebird: "npm:^3.7.2"
+    check-types: "npm:^11.2.3"
+    hoopy: "npm:^0.1.4"
+    jsonpath: "npm:^1.1.1"
+    tryer: "npm:^1.0.1"
+  checksum: 10c0/e5fc6690cd093c06ca6ed7584a2caf0c4a762bc9d9d9cb18efbabc75c973b071a8dad7037c617d0ea4d97b7b439821fea32f7c232ed0be8fa7840533a9643171
+  languageName: node
+  linkType: hard
+
+"big.js@npm:^5.2.2":
+  version: 5.2.2
+  resolution: "big.js@npm:5.2.2"
+  checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f
+  languageName: node
+  linkType: hard
+
+"binary-extensions@npm:^1.0.0":
+  version: 1.13.1
+  resolution: "binary-extensions@npm:1.13.1"
+  checksum: 10c0/2d616938ac23d828ec3fbe0dea429b566fd2c137ddc38f166f16561ccd58029deac3fa9fddb489ab13d679c8fb5f1bd0e82824041299e5e39d8dd3cc68fbb9f9
+  languageName: node
+  linkType: hard
+
+"binary-extensions@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "binary-extensions@npm:2.3.0"
+  checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5
+  languageName: node
+  linkType: hard
+
+"bindings@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "bindings@npm:1.5.0"
+  dependencies:
+    file-uri-to-path: "npm:1.0.0"
+  checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba
+  languageName: node
+  linkType: hard
+
+"blob-polyfill@npm:^9.0.20240710":
+  version: 9.0.20240710
+  resolution: "blob-polyfill@npm:9.0.20240710"
+  checksum: 10c0/eb28a475aa43c62bb855ec5404e3382772d1778852b827d6f21a73e499e3eafb3a4f81e9add68f87df336bc23db857ac357767fbb2b4a373f23dc9da872bcfda
+  languageName: node
+  linkType: hard
+
+"bluebird@npm:^3.5.5, bluebird@npm:^3.7.2":
+  version: 3.7.2
+  resolution: "bluebird@npm:3.7.2"
+  checksum: 10c0/680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2
+  languageName: node
+  linkType: hard
+
+"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
+  version: 4.12.0
+  resolution: "bn.js@npm:4.12.0"
+  checksum: 10c0/9736aaa317421b6b3ed038ff3d4491935a01419ac2d83ddcfebc5717385295fcfcf0c57311d90fe49926d0abbd7a9dbefdd8861e6129939177f7e67ebc645b21
+  languageName: node
+  linkType: hard
+
+"bn.js@npm:^5.0.0, bn.js@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "bn.js@npm:5.2.1"
+  checksum: 10c0/bed3d8bd34ec89dbcf9f20f88bd7d4a49c160fda3b561c7bb227501f974d3e435a48fb9b61bc3de304acab9215a3bda0803f7017ffb4d0016a0c3a740a283caa
+  languageName: node
+  linkType: hard
+
+"body-parser@npm:1.20.2":
+  version: 1.20.2
+  resolution: "body-parser@npm:1.20.2"
+  dependencies:
+    bytes: "npm:3.1.2"
+    content-type: "npm:~1.0.5"
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    destroy: "npm:1.2.0"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.4.24"
+    on-finished: "npm:2.4.1"
+    qs: "npm:6.11.0"
+    raw-body: "npm:2.5.2"
+    type-is: "npm:~1.6.18"
+    unpipe: "npm:1.0.0"
+  checksum: 10c0/06f1438fff388a2e2354c96aa3ea8147b79bfcb1262dfcc2aae68ec13723d01d5781680657b74e9f83c808266d5baf52804032fbde2b7382b89bd8cdb273ace9
+  languageName: node
+  linkType: hard
+
+"bonjour@npm:^3.5.0":
+  version: 3.5.0
+  resolution: "bonjour@npm:3.5.0"
+  dependencies:
+    array-flatten: "npm:^2.1.0"
+    deep-equal: "npm:^1.0.1"
+    dns-equal: "npm:^1.0.0"
+    dns-txt: "npm:^2.0.2"
+    multicast-dns: "npm:^6.0.1"
+    multicast-dns-service-types: "npm:^1.1.0"
+  checksum: 10c0/0be7c4cd96df563571973706226e750f6feeacd81d01c1ade11247eb3a7e14846af49cffe397ab970059b828dd89f694f456e22bca4ca315a7f0326e9303e241
+  languageName: node
+  linkType: hard
+
+"boolbase@npm:^1.0.0, boolbase@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "boolbase@npm:1.0.0"
+  checksum: 10c0/e4b53deb4f2b85c52be0e21a273f2045c7b6a6ea002b0e139c744cb6f95e9ec044439a52883b0d74dedd1ff3da55ed140cfdddfed7fb0cccbed373de5dce1bcf
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^1.1.7":
+  version: 1.1.11
+  resolution: "brace-expansion@npm:1.1.11"
+  dependencies:
+    balanced-match: "npm:^1.0.0"
+    concat-map: "npm:0.0.1"
+  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  languageName: node
+  linkType: hard
+
+"brace-expansion@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "brace-expansion@npm:2.0.1"
+  dependencies:
+    balanced-match: "npm:^1.0.0"
+  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  languageName: node
+  linkType: hard
+
+"braces@npm:^2.3.1, braces@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "braces@npm:2.3.2"
+  dependencies:
+    arr-flatten: "npm:^1.1.0"
+    array-unique: "npm:^0.3.2"
+    extend-shallow: "npm:^2.0.1"
+    fill-range: "npm:^4.0.0"
+    isobject: "npm:^3.0.1"
+    repeat-element: "npm:^1.1.2"
+    snapdragon: "npm:^0.8.1"
+    snapdragon-node: "npm:^2.0.1"
+    split-string: "npm:^3.0.2"
+    to-regex: "npm:^3.0.1"
+  checksum: 10c0/72b27ea3ea2718f061c29e70fd6e17606e37c65f5801abddcf0b0052db1de7d60f3bf92cfc220ab57b44bd0083a5f69f9d03b3461d2816cfe9f9398207acc728
+  languageName: node
+  linkType: hard
+
+"braces@npm:^3.0.2, braces@npm:~3.0.2":
+  version: 3.0.2
+  resolution: "braces@npm:3.0.2"
+  dependencies:
+    fill-range: "npm:^7.0.1"
+  checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381
+  languageName: node
+  linkType: hard
+
+"brorand@npm:^1.0.1, brorand@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "brorand@npm:1.1.0"
+  checksum: 10c0/6f366d7c4990f82c366e3878492ba9a372a73163c09871e80d82fb4ae0d23f9f8924cb8a662330308206e6b3b76ba1d528b4601c9ef73c2166b440b2ea3b7571
+  languageName: node
+  linkType: hard
+
+"browser-process-hrtime@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "browser-process-hrtime@npm:1.0.0"
+  checksum: 10c0/65da78e51e9d7fa5909147f269c54c65ae2e03d1cf797cc3cfbbe49f475578b8160ce4a76c36c1a2ffbff26c74f937d73096c508057491ddf1a6dfd11143f72d
+  languageName: node
+  linkType: hard
+
+"browserify-aes@npm:^1.0.4, browserify-aes@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "browserify-aes@npm:1.2.0"
+  dependencies:
+    buffer-xor: "npm:^1.0.3"
+    cipher-base: "npm:^1.0.0"
+    create-hash: "npm:^1.1.0"
+    evp_bytestokey: "npm:^1.0.3"
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.0.1"
+  checksum: 10c0/967f2ae60d610b7b252a4cbb55a7a3331c78293c94b4dd9c264d384ca93354c089b3af9c0dd023534efdc74ffbc82510f7ad4399cf82bc37bc07052eea485f18
+  languageName: node
+  linkType: hard
+
+"browserify-cipher@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "browserify-cipher@npm:1.0.1"
+  dependencies:
+    browserify-aes: "npm:^1.0.4"
+    browserify-des: "npm:^1.0.0"
+    evp_bytestokey: "npm:^1.0.0"
+  checksum: 10c0/aa256dcb42bc53a67168bbc94ab85d243b0a3b56109dee3b51230b7d010d9b78985ffc1fb36e145c6e4db151f888076c1cfc207baf1525d3e375cbe8187fe27d
+  languageName: node
+  linkType: hard
+
+"browserify-des@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "browserify-des@npm:1.0.2"
+  dependencies:
+    cipher-base: "npm:^1.0.1"
+    des.js: "npm:^1.0.0"
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.1.2"
+  checksum: 10c0/943eb5d4045eff80a6cde5be4e5fbb1f2d5002126b5a4789c3c1aae3cdddb1eb92b00fb92277f512288e5c6af330730b1dbabcf7ce0923e749e151fcee5a074d
+  languageName: node
+  linkType: hard
+
+"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "browserify-rsa@npm:4.1.0"
+  dependencies:
+    bn.js: "npm:^5.0.0"
+    randombytes: "npm:^2.0.1"
+  checksum: 10c0/fb2b5a8279d8a567a28d8ee03fb62e448428a906bab5c3dc9e9c3253ace551b5ea271db15e566ac78f1b1d71b243559031446604168b9235c351a32cae99d02a
+  languageName: node
+  linkType: hard
+
+"browserify-sign@npm:^4.0.0":
+  version: 4.2.3
+  resolution: "browserify-sign@npm:4.2.3"
+  dependencies:
+    bn.js: "npm:^5.2.1"
+    browserify-rsa: "npm:^4.1.0"
+    create-hash: "npm:^1.2.0"
+    create-hmac: "npm:^1.1.7"
+    elliptic: "npm:^6.5.5"
+    hash-base: "npm:~3.0"
+    inherits: "npm:^2.0.4"
+    parse-asn1: "npm:^5.1.7"
+    readable-stream: "npm:^2.3.8"
+    safe-buffer: "npm:^5.2.1"
+  checksum: 10c0/30c0eba3f5970a20866a4d3fbba2c5bd1928cd24f47faf995f913f1499214c6f3be14bb4d6ec1ab5c6cafb1eca9cb76ba1c2e1c04ed018370634d4e659c77216
+  languageName: node
+  linkType: hard
+
+"browserify-zlib@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "browserify-zlib@npm:0.2.0"
+  dependencies:
+    pako: "npm:~1.0.5"
+  checksum: 10c0/9ab10b6dc732c6c5ec8ebcbe5cb7fe1467f97402c9b2140113f47b5f187b9438f93a8e065d8baf8b929323c18324fbf1105af479ee86d9d36cab7d7ef3424ad9
+  languageName: node
+  linkType: hard
+
+"browserslist@npm:4.14.2":
+  version: 4.14.2
+  resolution: "browserslist@npm:4.14.2"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001125"
+    electron-to-chromium: "npm:^1.3.564"
+    escalade: "npm:^3.0.2"
+    node-releases: "npm:^1.1.61"
+  bin:
+    browserslist: cli.js
+  checksum: 10c0/aacba943106bc58f1a3ccfa1bbb04af90f34fb492248d3111ca85368cfcdd09575783fa81d695b0ff67856eacd6970758bfe7fa456eec00afae01487800fd8f8
+  languageName: node
+  linkType: hard
+
+"browserslist@npm:^4.0.0, browserslist@npm:^4.12.0, browserslist@npm:^4.21.10, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0, browserslist@npm:^4.6.2, browserslist@npm:^4.6.4":
+  version: 4.23.0
+  resolution: "browserslist@npm:4.23.0"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001587"
+    electron-to-chromium: "npm:^1.4.668"
+    node-releases: "npm:^2.0.14"
+    update-browserslist-db: "npm:^1.0.13"
+  bin:
+    browserslist: cli.js
+  checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943
+  languageName: node
+  linkType: hard
+
+"bser@npm:2.1.1":
+  version: 2.1.1
+  resolution: "bser@npm:2.1.1"
+  dependencies:
+    node-int64: "npm:^0.4.0"
+  checksum: 10c0/24d8dfb7b6d457d73f32744e678a60cc553e4ec0e9e1a01cf614b44d85c3c87e188d3cc78ef0442ce5032ee6818de20a0162ba1074725c0d08908f62ea979227
+  languageName: node
+  linkType: hard
+
+"buffer-from@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "buffer-from@npm:1.1.2"
+  checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34
+  languageName: node
+  linkType: hard
+
+"buffer-indexof@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "buffer-indexof@npm:1.1.1"
+  checksum: 10c0/67906b0a9892854e24ac717ef823c3b19790c653a8b1902835bbf3c3c46ea8d99f0680a92f7394fc5acbbecb3385775ccd504ea00587d2d67d8dfaadd460eeae
+  languageName: node
+  linkType: hard
+
+"buffer-xor@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "buffer-xor@npm:1.0.3"
+  checksum: 10c0/fd269d0e0bf71ecac3146187cfc79edc9dbb054e2ee69b4d97dfb857c6d997c33de391696d04bdd669272751fa48e7872a22f3a6c7b07d6c0bc31dbe02a4075c
+  languageName: node
+  linkType: hard
+
+"buffer@npm:^4.3.0":
+  version: 4.9.2
+  resolution: "buffer@npm:4.9.2"
+  dependencies:
+    base64-js: "npm:^1.0.2"
+    ieee754: "npm:^1.1.4"
+    isarray: "npm:^1.0.0"
+  checksum: 10c0/dc443d7e7caab23816b58aacdde710b72f525ad6eecd7d738fcaa29f6d6c12e8d9c13fed7219fd502be51ecf0615f5c077d4bdc6f9308dde2e53f8e5393c5b21
+  languageName: node
+  linkType: hard
+
+"bufferstreams@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bufferstreams@npm:3.0.0"
+  dependencies:
+    readable-stream: "npm:^3.4.0"
+  checksum: 10c0/9110ed5e0cf0801d5462fdbb48ee3b655b4a3fd01ceace57ecb92cc3c5574b516ec336f69a489296af8b3e9e229b07f929e649c9a3078a5a7f7f072865482feb
+  languageName: node
+  linkType: hard
+
+"builtin-modules@npm:^3.1.0":
+  version: 3.3.0
+  resolution: "builtin-modules@npm:3.3.0"
+  checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a
+  languageName: node
+  linkType: hard
+
+"builtin-status-codes@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "builtin-status-codes@npm:3.0.0"
+  checksum: 10c0/c37bbba11a34c4431e56bd681b175512e99147defbe2358318d8152b3a01df7bf25e0305873947e5b350073d5ef41a364a22b37e48f1fb6d2fe6d5286a0f348c
+  languageName: node
+  linkType: hard
+
+"bytes@npm:3.0.0":
+  version: 3.0.0
+  resolution: "bytes@npm:3.0.0"
+  checksum: 10c0/91d42c38601c76460519ffef88371caacaea483a354c8e4b8808e7b027574436a5713337c003ea3de63ee4991c2a9a637884fdfe7f761760d746929d9e8fec60
+  languageName: node
+  linkType: hard
+
+"bytes@npm:3.1.2":
+  version: 3.1.2
+  resolution: "bytes@npm:3.1.2"
+  checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^12.0.2":
+  version: 12.0.4
+  resolution: "cacache@npm:12.0.4"
+  dependencies:
+    bluebird: "npm:^3.5.5"
+    chownr: "npm:^1.1.1"
+    figgy-pudding: "npm:^3.5.1"
+    glob: "npm:^7.1.4"
+    graceful-fs: "npm:^4.1.15"
+    infer-owner: "npm:^1.0.3"
+    lru-cache: "npm:^5.1.1"
+    mississippi: "npm:^3.0.0"
+    mkdirp: "npm:^0.5.1"
+    move-concurrently: "npm:^1.0.1"
+    promise-inflight: "npm:^1.0.1"
+    rimraf: "npm:^2.6.3"
+    ssri: "npm:^6.0.1"
+    unique-filename: "npm:^1.1.1"
+    y18n: "npm:^4.0.0"
+  checksum: 10c0/b4b0aa49e3fbd3ca92f71bc62923e4afce31fd687b31d5ba524b2a54b36e96a8b027165599307dda5e4a6f7268cc951b77ca170efa00c1b72761f9daae51fdfb
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^15.0.5":
+  version: 15.3.0
+  resolution: "cacache@npm:15.3.0"
+  dependencies:
+    "@npmcli/fs": "npm:^1.0.0"
+    "@npmcli/move-file": "npm:^1.0.1"
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.0.0"
+    glob: "npm:^7.1.4"
+    infer-owner: "npm:^1.0.4"
+    lru-cache: "npm:^6.0.0"
+    minipass: "npm:^3.1.1"
+    minipass-collect: "npm:^1.0.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.2"
+    mkdirp: "npm:^1.0.3"
+    p-map: "npm:^4.0.0"
+    promise-inflight: "npm:^1.0.1"
+    rimraf: "npm:^3.0.2"
+    ssri: "npm:^8.0.1"
+    tar: "npm:^6.0.2"
+    unique-filename: "npm:^1.1.1"
+  checksum: 10c0/886fcc0acc4f6fd5cd142d373d8276267bc6d655d7c4ce60726fbbec10854de3395ee19bbf9e7e73308cdca9fdad0ad55060ff3bd16c6d4165c5b8d21515e1d8
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^16.1.0":
+  version: 16.1.3
+  resolution: "cacache@npm:16.1.3"
+  dependencies:
+    "@npmcli/fs": "npm:^2.1.0"
+    "@npmcli/move-file": "npm:^2.0.0"
+    chownr: "npm:^2.0.0"
+    fs-minipass: "npm:^2.1.0"
+    glob: "npm:^8.0.1"
+    infer-owner: "npm:^1.0.4"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^3.1.6"
+    minipass-collect: "npm:^1.0.2"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    mkdirp: "npm:^1.0.4"
+    p-map: "npm:^4.0.0"
+    promise-inflight: "npm:^1.0.1"
+    rimraf: "npm:^3.0.2"
+    ssri: "npm:^9.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^2.0.0"
+  checksum: 10c0/cdf6836e1c457d2a5616abcaf5d8240c0346b1f5bd6fdb8866b9d84b6dff0b54e973226dc11e0d099f35394213d24860d1989c8358d2a41b39eb912b3000e749
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^18.0.0":
+  version: 18.0.2
+  resolution: "cacache@npm:18.0.2"
+  dependencies:
+    "@npmcli/fs": "npm:^3.1.0"
+    fs-minipass: "npm:^3.0.0"
+    glob: "npm:^10.2.2"
+    lru-cache: "npm:^10.0.1"
+    minipass: "npm:^7.0.3"
+    minipass-collect: "npm:^2.0.1"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10c0/7992665305cc251a984f4fdbab1449d50e88c635bc43bf2785530c61d239c61b349e5734461baa461caaee65f040ab14e2d58e694f479c0810cffd181ba5eabc
+  languageName: node
+  linkType: hard
+
+"cache-base@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "cache-base@npm:1.0.1"
+  dependencies:
+    collection-visit: "npm:^1.0.0"
+    component-emitter: "npm:^1.2.1"
+    get-value: "npm:^2.0.6"
+    has-value: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    set-value: "npm:^2.0.0"
+    to-object-path: "npm:^0.3.0"
+    union-value: "npm:^1.0.0"
+    unset-value: "npm:^1.0.0"
+  checksum: 10c0/a7142e25c73f767fa520957dcd179b900b86eac63b8cfeaa3b2a35e18c9ca5968aa4e2d2bed7a3e7efd10f13be404344cfab3a4156217e71f9bdb95940bb9c8c
+  languageName: node
+  linkType: hard
+
+"call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
+  dependencies:
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    set-function-length: "npm:^1.2.1"
+  checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d
+  languageName: node
+  linkType: hard
+
+"caller-callsite@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "caller-callsite@npm:2.0.0"
+  dependencies:
+    callsites: "npm:^2.0.0"
+  checksum: 10c0/a00ca91280e10ee2321de21dda6c168e427df7a63aeaca027ea45e3e466ac5e1a5054199f6547ba1d5a513d3b6b5933457266daaa47f8857fb532a343ee6b5e1
+  languageName: node
+  linkType: hard
+
+"caller-path@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "caller-path@npm:2.0.0"
+  dependencies:
+    caller-callsite: "npm:^2.0.0"
+  checksum: 10c0/029b5b2c557d831216305c3218e9ff30fa668be31d58dd08088f74c8eabc8362c303e0908b3a93abb25ba10e3a5bfc9cff5eb7fab6ab9cf820e3b160ccb67581
+  languageName: node
+  linkType: hard
+
+"callsites@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "callsites@npm:2.0.0"
+  checksum: 10c0/13bff4fee946e6020b37e76284e95e24aa239c9e34ac4f3451e4c5330fca6f2f962e1d1ab69e4da7940e1fce135107a2b2b98c01d62ea33144350fc89dc5494e
+  languageName: node
+  linkType: hard
+
+"callsites@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "callsites@npm:3.1.0"
+  checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301
+  languageName: node
+  linkType: hard
+
+"camel-case@npm:^4.1.1, camel-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "camel-case@npm:4.1.2"
+  dependencies:
+    pascal-case: "npm:^3.1.2"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/bf9eefaee1f20edbed2e9a442a226793bc72336e2b99e5e48c6b7252b6f70b080fc46d8246ab91939e2af91c36cdd422e0af35161e58dd089590f302f8f64c8a
+  languageName: node
+  linkType: hard
+
+"camelcase@npm:5.3.1, camelcase@npm:^5.0.0, camelcase@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "camelcase@npm:5.3.1"
+  checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23
+  languageName: node
+  linkType: hard
+
+"camelcase@npm:^6.0.0, camelcase@npm:^6.1.0, camelcase@npm:^6.2.0":
+  version: 6.3.0
+  resolution: "camelcase@npm:6.3.0"
+  checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710
+  languageName: node
+  linkType: hard
+
+"caniuse-api@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "caniuse-api@npm:3.0.0"
+  dependencies:
+    browserslist: "npm:^4.0.0"
+    caniuse-lite: "npm:^1.0.0"
+    lodash.memoize: "npm:^4.1.2"
+    lodash.uniq: "npm:^4.5.0"
+  checksum: 10c0/60f9e85a3331e6d761b1b03eec71ca38ef7d74146bece34694853033292156b815696573ed734b65583acf493e88163618eda915c6c826d46a024c71a9572b4c
+  languageName: node
+  linkType: hard
+
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000981, caniuse-lite@npm:^1.0.30001109, caniuse-lite@npm:^1.0.30001125":
+  version: 1.0.30001617
+  resolution: "caniuse-lite@npm:1.0.30001617"
+  checksum: 10c0/711702501063968b2807d1a8f40981e66f45eb8962968b4b84c70392dc804cee62845e8e391e9749f78ff41ca48be2a4a7a38620c44af526b5e03bc3c7a1bc0a
+  languageName: node
+  linkType: hard
+
+"caniuse-lite@npm:^1.0.30001587":
+  version: 1.0.30001605
+  resolution: "caniuse-lite@npm:1.0.30001605"
+  checksum: 10c0/ceb96a0ecfdaee6510c00aebaaa63db20aaeafab03450d4e3b214e009cb632f87385a70c299cdd1ca4c17e1473883d8fa2051c5b2d083a454338c0c779b25cbc
+  languageName: node
+  linkType: hard
+
+"capital-case@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "capital-case@npm:1.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+    upper-case-first: "npm:^2.0.2"
+  checksum: 10c0/6a034af73401f6e55d91ea35c190bbf8bda21714d4ea8bb8f1799311d123410a80f0875db4e3236dc3f97d74231ff4bf1c8783f2be13d7733c7d990c57387281
+  languageName: node
+  linkType: hard
+
+"capture-exit@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "capture-exit@npm:2.0.0"
+  dependencies:
+    rsvp: "npm:^4.8.4"
+  checksum: 10c0/d68df1e15937809501644a49c0267ef323b5b6a0cae5c08bbdceafd718aa08241844798bfdd762cf6756bc2becd83122aabc25b5222192f18093113bec670617
+  languageName: node
+  linkType: hard
+
+"case-sensitive-paths-webpack-plugin@npm:2.3.0":
+  version: 2.3.0
+  resolution: "case-sensitive-paths-webpack-plugin@npm:2.3.0"
+  checksum: 10c0/144fdac31f42e05b3f37985bc719e2fbca6ca6467054f82e342943077eb760ede37251ce004fa61e901b4a0f304d025b0a2a0b4ea5ad3926ae4b9ed56a318335
+  languageName: node
+  linkType: hard
+
+"chalk@npm:2.4.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+  version: 2.4.2
+  resolution: "chalk@npm:2.4.2"
+  dependencies:
+    ansi-styles: "npm:^3.2.1"
+    escape-string-regexp: "npm:^1.0.5"
+    supports-color: "npm:^5.3.0"
+  checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "chalk@npm:3.0.0"
+  dependencies:
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10c0/ee650b0a065b3d7a6fda258e75d3a86fc8e4effa55871da730a9e42ccb035bf5fd203525e5a1ef45ec2582ecc4f65b47eb11357c526b84dd29a14fb162c414d2
+  languageName: node
+  linkType: hard
+
+"chalk@npm:^4.0.0, chalk@npm:^4.1.0":
+  version: 4.1.2
+  resolution: "chalk@npm:4.1.2"
+  dependencies:
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880
+  languageName: node
+  linkType: hard
+
+"change-case@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "change-case@npm:4.1.2"
+  dependencies:
+    camel-case: "npm:^4.1.2"
+    capital-case: "npm:^1.0.4"
+    constant-case: "npm:^3.0.4"
+    dot-case: "npm:^3.0.4"
+    header-case: "npm:^2.0.4"
+    no-case: "npm:^3.0.4"
+    param-case: "npm:^3.0.4"
+    pascal-case: "npm:^3.1.2"
+    path-case: "npm:^3.0.4"
+    sentence-case: "npm:^3.0.4"
+    snake-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/95a6e48563cd393241ce18470c7310a8a050304a64b63addac487560ab039ce42b099673d1d293cc10652324d92060de11b5d918179fe3b5af2ee521fb03ca58
+  languageName: node
+  linkType: hard
+
+"char-regex@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "char-regex@npm:1.0.2"
+  checksum: 10c0/57a09a86371331e0be35d9083ba429e86c4f4648ecbe27455dbfb343037c16ee6fdc7f6b61f433a57cc5ded5561d71c56a150e018f40c2ffb7bc93a26dae341e
+  languageName: node
+  linkType: hard
+
+"check-types@npm:^11.2.3":
+  version: 11.2.3
+  resolution: "check-types@npm:11.2.3"
+  checksum: 10c0/08d17e528b189e0e431689f0f2f0a78f425202f6e5ac93def5c3b8d128eb888a5103fc980d4feb7b2d4248f8114d354c223dff3c0b5ac4b1def526ef441aaf55
+  languageName: node
+  linkType: hard
+
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
+  dependencies:
+    anymatch: "npm:~3.1.2"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.2"
+    glob-parent: "npm:~5.1.2"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.6.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462
+  languageName: node
+  linkType: hard
+
+"chokidar@npm:^2.1.8":
+  version: 2.1.8
+  resolution: "chokidar@npm:2.1.8"
+  dependencies:
+    anymatch: "npm:^2.0.0"
+    async-each: "npm:^1.0.1"
+    braces: "npm:^2.3.2"
+    fsevents: "npm:^1.2.7"
+    glob-parent: "npm:^3.1.0"
+    inherits: "npm:^2.0.3"
+    is-binary-path: "npm:^1.0.0"
+    is-glob: "npm:^4.0.0"
+    normalize-path: "npm:^3.0.0"
+    path-is-absolute: "npm:^1.0.0"
+    readdirp: "npm:^2.2.1"
+    upath: "npm:^1.1.1"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/5631cc00080224f9482cf5418dcbea111aec02fa8d81a8cfe37e47b9cf36089e071de52d503647e3a821a01426a40adc926ba899f657af86a51b8f8d4eef12a7
+  languageName: node
+  linkType: hard
+
+"chownr@npm:^1.1.1":
+  version: 1.1.4
+  resolution: "chownr@npm:1.1.4"
+  checksum: 10c0/ed57952a84cc0c802af900cf7136de643d3aba2eecb59d29344bc2f3f9bf703a301b9d84cdc71f82c3ffc9ccde831b0d92f5b45f91727d6c9da62f23aef9d9db
+  languageName: node
+  linkType: hard
+
+"chownr@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "chownr@npm:2.0.0"
+  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+  languageName: node
+  linkType: hard
+
+"chrome-trace-event@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "chrome-trace-event@npm:1.0.3"
+  checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c
+  languageName: node
+  linkType: hard
+
+"ci-info@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "ci-info@npm:2.0.0"
+  checksum: 10c0/8c5fa3830a2bcee2b53c2e5018226f0141db9ec9f7b1e27a5c57db5512332cde8a0beb769bcbaf0d8775a78afbf2bb841928feca4ea6219638a5b088f9884b46
+  languageName: node
+  linkType: hard
+
+"ci-info@npm:^3.2.0":
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a
+  languageName: node
+  linkType: hard
+
+"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "cipher-base@npm:1.0.4"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.0.1"
+  checksum: 10c0/d8d005f8b64d8a77b3d3ce531301ae7b45902c9cab4ec8b66bdbd2bf2a1d9fceb9a2133c293eb3c060b2d964da0f14c47fb740366081338aa3795dd1faa8984b
+  languageName: node
+  linkType: hard
+
+"cjs-module-lexer@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "cjs-module-lexer@npm:0.6.0"
+  checksum: 10c0/a4fe091f5551e8580d74c0afbf767893ea0ace49f8e33eecb54ae8e325661f31d44752171b4ec52d33aca90c4d854114afe315aa6021780a3c49a0f4a67924b5
+  languageName: node
+  linkType: hard
+
+"cjs-module-lexer@npm:^1.0.0":
+  version: 1.2.3
+  resolution: "cjs-module-lexer@npm:1.2.3"
+  checksum: 10c0/0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab
+  languageName: node
+  linkType: hard
+
+"class-utils@npm:^0.3.5":
+  version: 0.3.6
+  resolution: "class-utils@npm:0.3.6"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    define-property: "npm:^0.2.5"
+    isobject: "npm:^3.0.0"
+    static-extend: "npm:^0.1.1"
+  checksum: 10c0/d44f4afc7a3e48dba4c2d3fada5f781a1adeeff371b875c3b578bc33815c6c29d5d06483c2abfd43a32d35b104b27b67bfa39c2e8a422fa858068bd756cfbd42
+  languageName: node
+  linkType: hard
+
+"clean-css@npm:^4.2.3":
+  version: 4.2.4
+  resolution: "clean-css@npm:4.2.4"
+  dependencies:
+    source-map: "npm:~0.6.0"
+  checksum: 10c0/0e41795fdc9d65e5e17a3b0016d90bf2a653e3a680829b5bcebdbab48604cfe36d96d8af6346338d2c2aca8aa9af024ac4fb752ac3eb5b71bef68a34a129b58a
+  languageName: node
+  linkType: hard
+
+"clean-stack@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "clean-stack@npm:2.2.0"
+  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
+  languageName: node
+  linkType: hard
+
+"cli-color@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "cli-color@npm:2.0.4"
+  dependencies:
+    d: "npm:^1.0.1"
+    es5-ext: "npm:^0.10.64"
+    es6-iterator: "npm:^2.0.3"
+    memoizee: "npm:^0.4.15"
+    timers-ext: "npm:^0.1.7"
+  checksum: 10c0/49a0078fa3517cdfb3ad919a05ab2fe7352d9c9f0617937c38fc6245a38101632d9a23f40a53b2818773d2694b8ae814ff760801a702a26d76b297990ce8d399
+  languageName: node
+  linkType: hard
+
+"cliui@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "cliui@npm:5.0.0"
+  dependencies:
+    string-width: "npm:^3.1.0"
+    strip-ansi: "npm:^5.2.0"
+    wrap-ansi: "npm:^5.1.0"
+  checksum: 10c0/76142bf306965850a71efd10c9755bd7f447c7c20dd652e1c1ce27d987f862a3facb3cceb2909cef6f0cb363646ee7a1735e3dfdd49f29ed16d733d33e15e2f8
+  languageName: node
+  linkType: hard
+
+"cliui@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "cliui@npm:6.0.0"
+  dependencies:
+    string-width: "npm:^4.2.0"
+    strip-ansi: "npm:^6.0.0"
+    wrap-ansi: "npm:^6.2.0"
+  checksum: 10c0/35229b1bb48647e882104cac374c9a18e34bbf0bace0e2cf03000326b6ca3050d6b59545d91e17bfe3705f4a0e2988787aa5cde6331bf5cbbf0164732cef6492
+  languageName: node
+  linkType: hard
+
+"cliui@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "cliui@npm:8.0.1"
+  dependencies:
+    string-width: "npm:^4.2.0"
+    strip-ansi: "npm:^6.0.1"
+    wrap-ansi: "npm:^7.0.0"
+  checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5
+  languageName: node
+  linkType: hard
+
+"clone-deep@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "clone-deep@npm:4.0.1"
+  dependencies:
+    is-plain-object: "npm:^2.0.4"
+    kind-of: "npm:^6.0.2"
+    shallow-clone: "npm:^3.0.0"
+  checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758
+  languageName: node
+  linkType: hard
+
+"co@npm:^4.6.0":
+  version: 4.6.0
+  resolution: "co@npm:4.6.0"
+  checksum: 10c0/c0e85ea0ca8bf0a50cbdca82efc5af0301240ca88ebe3644a6ffb8ffe911f34d40f8fbcf8f1d52c5ddd66706abd4d3bfcd64259f1e8e2371d4f47573b0dc8c28
+  languageName: node
+  linkType: hard
+
+"coa@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "coa@npm:2.0.2"
+  dependencies:
+    "@types/q": "npm:^1.5.1"
+    chalk: "npm:^2.4.1"
+    q: "npm:^1.1.2"
+  checksum: 10c0/0264392e3b691a8551e619889f3e67558b4f755eeb09d67625032a25c37634731e778fabbd9d14df6477d6ae770e30ea9405d18e515b2ec492b0eb90bb8d7f43
+  languageName: node
+  linkType: hard
+
+"collect-v8-coverage@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "collect-v8-coverage@npm:1.0.2"
+  checksum: 10c0/ed7008e2e8b6852c5483b444a3ae6e976e088d4335a85aa0a9db2861c5f1d31bd2d7ff97a60469b3388deeba661a619753afbe201279fb159b4b9548ab8269a1
+  languageName: node
+  linkType: hard
+
+"collection-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "collection-visit@npm:1.0.0"
+  dependencies:
+    map-visit: "npm:^1.0.0"
+    object-visit: "npm:^1.0.0"
+  checksum: 10c0/add72a8d1c37cb90e53b1aaa2c31bf1989bfb733f0b02ce82c9fa6828c7a14358dba2e4f8e698c02f69e424aeccae1ffb39acdeaf872ade2f41369e84a2fcf8a
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^1.9.0, color-convert@npm:^1.9.3":
+  version: 1.9.3
+  resolution: "color-convert@npm:1.9.3"
+  dependencies:
+    color-name: "npm:1.1.3"
+  checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c
+  languageName: node
+  linkType: hard
+
+"color-convert@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "color-convert@npm:2.0.1"
+  dependencies:
+    color-name: "npm:~1.1.4"
+  checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7
+  languageName: node
+  linkType: hard
+
+"color-name@npm:1.1.3":
+  version: 1.1.3
+  resolution: "color-name@npm:1.1.3"
+  checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6
+  languageName: node
+  linkType: hard
+
+"color-name@npm:^1.0.0, color-name@npm:~1.1.4":
+  version: 1.1.4
+  resolution: "color-name@npm:1.1.4"
+  checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95
+  languageName: node
+  linkType: hard
+
+"color-string@npm:^1.6.0":
+  version: 1.9.1
+  resolution: "color-string@npm:1.9.1"
+  dependencies:
+    color-name: "npm:^1.0.0"
+    simple-swizzle: "npm:^0.2.2"
+  checksum: 10c0/b0bfd74c03b1f837f543898b512f5ea353f71630ccdd0d66f83028d1f0924a7d4272deb278b9aef376cacf1289b522ac3fb175e99895283645a2dc3a33af2404
+  languageName: node
+  linkType: hard
+
+"color-support@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "color-support@npm:1.1.3"
+  bin:
+    color-support: bin.js
+  checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6
+  languageName: node
+  linkType: hard
+
+"color@npm:^3.0.0":
+  version: 3.2.1
+  resolution: "color@npm:3.2.1"
+  dependencies:
+    color-convert: "npm:^1.9.3"
+    color-string: "npm:^1.6.0"
+  checksum: 10c0/39345d55825884c32a88b95127d417a2c24681d8b57069413596d9fcbb721459ef9d9ec24ce3e65527b5373ce171b73e38dbcd9c830a52a6487e7f37bf00e83c
+  languageName: node
+  linkType: hard
+
+"colorette@npm:^2.0.14":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40
+  languageName: node
+  linkType: hard
+
+"combined-stream@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "combined-stream@npm:1.0.8"
+  dependencies:
+    delayed-stream: "npm:~1.0.0"
+  checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5
+  languageName: node
+  linkType: hard
+
+"commander@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3
+  languageName: node
+  linkType: hard
+
+"commander@npm:^2.20.0":
+  version: 2.20.3
+  resolution: "commander@npm:2.20.3"
+  checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288
+  languageName: node
+  linkType: hard
+
+"commander@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "commander@npm:4.1.1"
+  checksum: 10c0/84a76c08fe6cc08c9c93f62ac573d2907d8e79138999312c92d4155bc2325d487d64d13f669b2000c9f8caf70493c1be2dac74fec3c51d5a04f8bc3ae1830bab
+  languageName: node
+  linkType: hard
+
+"commander@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "commander@npm:7.2.0"
+  checksum: 10c0/8d690ff13b0356df7e0ebbe6c59b4712f754f4b724d4f473d3cc5b3fdcf978e3a5dc3078717858a2ceb50b0f84d0660a7f22a96cdc50fb877d0c9bb31593d23a
+  languageName: node
+  linkType: hard
+
+"common-tags@npm:^1.8.0":
+  version: 1.8.2
+  resolution: "common-tags@npm:1.8.2"
+  checksum: 10c0/23efe47ff0a1a7c91489271b3a1e1d2a171c12ec7f9b35b29b2fce51270124aff0ec890087e2bc2182c1cb746e232ab7561aaafe05f1e7452aea733d2bfe3f63
+  languageName: node
+  linkType: hard
+
+"common@workspace:*, common@workspace:packages/common":
+  version: 0.0.0-use.local
+  resolution: "common@workspace:packages/common"
+  languageName: unknown
+  linkType: soft
+
+"commondir@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "commondir@npm:1.0.1"
+  checksum: 10c0/33a124960e471c25ee19280c9ce31ccc19574b566dc514fe4f4ca4c34fa8b0b57cf437671f5de380e11353ea9426213fca17687dd2ef03134fea2dbc53809fd6
+  languageName: node
+  linkType: hard
+
+"component-emitter@npm:^1.2.1":
+  version: 1.3.1
+  resolution: "component-emitter@npm:1.3.1"
+  checksum: 10c0/e4900b1b790b5e76b8d71b328da41482118c0f3523a516a41be598dc2785a07fd721098d9bf6e22d89b19f4fa4e1025160dc00317ea111633a3e4f75c2b86032
+  languageName: node
+  linkType: hard
+
+"compose-function@npm:3.0.3":
+  version: 3.0.3
+  resolution: "compose-function@npm:3.0.3"
+  dependencies:
+    arity-n: "npm:^1.0.4"
+  checksum: 10c0/2b3b8a785e4d5431c0be2ab04e9de29451f3721136bef27ce6973c1971193ed9d7887ec82175b3d3e1fc00c8af6040a5841532c763a63e1ea8aeeeb128ad26fa
+  languageName: node
+  linkType: hard
+
+"compressible@npm:~2.0.16":
+  version: 2.0.18
+  resolution: "compressible@npm:2.0.18"
+  dependencies:
+    mime-db: "npm:>= 1.43.0 < 2"
+  checksum: 10c0/8a03712bc9f5b9fe530cc5a79e164e665550d5171a64575d7dcf3e0395d7b4afa2d79ab176c61b5b596e28228b350dd07c1a2a6ead12fd81d1b6cd632af2fef7
+  languageName: node
+  linkType: hard
+
+"compression@npm:^1.7.4":
+  version: 1.7.4
+  resolution: "compression@npm:1.7.4"
+  dependencies:
+    accepts: "npm:~1.3.5"
+    bytes: "npm:3.0.0"
+    compressible: "npm:~2.0.16"
+    debug: "npm:2.6.9"
+    on-headers: "npm:~1.0.2"
+    safe-buffer: "npm:5.1.2"
+    vary: "npm:~1.1.2"
+  checksum: 10c0/138db836202a406d8a14156a5564fb1700632a76b6e7d1546939472895a5304f2b23c80d7a22bf44c767e87a26e070dbc342ea63bb45ee9c863354fa5556bbbc
+  languageName: node
+  linkType: hard
+
+"concat-map@npm:0.0.1":
+  version: 0.0.1
+  resolution: "concat-map@npm:0.0.1"
+  checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f
+  languageName: node
+  linkType: hard
+
+"concat-stream@npm:^1.5.0":
+  version: 1.6.2
+  resolution: "concat-stream@npm:1.6.2"
+  dependencies:
+    buffer-from: "npm:^1.0.0"
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^2.2.2"
+    typedarray: "npm:^0.0.6"
+  checksum: 10c0/2e9864e18282946dabbccb212c5c7cec0702745e3671679eb8291812ca7fd12023f7d8cb36493942a62f770ac96a7f90009dc5c82ad69893438371720fa92617
+  languageName: node
+  linkType: hard
+
+"confusing-browser-globals@npm:^1.0.10":
+  version: 1.0.11
+  resolution: "confusing-browser-globals@npm:1.0.11"
+  checksum: 10c0/475d0a284fa964a5182b519af5738b5b64bf7e413cfd703c1b3496bf6f4df9f827893a9b221c0ea5873c1476835beb1e0df569ba643eff0734010c1eb780589e
+  languageName: node
+  linkType: hard
+
+"connect-history-api-fallback@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "connect-history-api-fallback@npm:1.6.0"
+  checksum: 10c0/6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
+  languageName: node
+  linkType: hard
+
+"console-browserify@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "console-browserify@npm:1.2.0"
+  checksum: 10c0/89b99a53b7d6cee54e1e64fa6b1f7ac24b844b4019c5d39db298637e55c1f4ffa5c165457ad984864de1379df2c8e1886cbbdac85d9dbb6876a9f26c3106f226
+  languageName: node
+  linkType: hard
+
+"console-control-strings@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "console-control-strings@npm:1.1.0"
+  checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50
+  languageName: node
+  linkType: hard
+
+"constant-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "constant-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+    upper-case: "npm:^2.0.2"
+  checksum: 10c0/91d54f18341fcc491ae66d1086642b0cc564be3e08984d7b7042f8b0a721c8115922f7f11d6a09f13ed96ff326eabae11f9d1eb0335fa9d8b6e39e4df096010e
+  languageName: node
+  linkType: hard
+
+"constants-browserify@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "constants-browserify@npm:1.0.0"
+  checksum: 10c0/ab49b1d59a433ed77c964d90d19e08b2f77213fb823da4729c0baead55e3c597f8f97ebccfdfc47bd896d43854a117d114c849a6f659d9986420e97da0f83ac5
+  languageName: node
+  linkType: hard
+
+"content-disposition@npm:0.5.4, content-disposition@npm:^0.5.3":
+  version: 0.5.4
+  resolution: "content-disposition@npm:0.5.4"
+  dependencies:
+    safe-buffer: "npm:5.2.1"
+  checksum: 10c0/bac0316ebfeacb8f381b38285dc691c9939bf0a78b0b7c2d5758acadad242d04783cee5337ba7d12a565a19075af1b3c11c728e1e4946de73c6ff7ce45f3f1bb
+  languageName: node
+  linkType: hard
+
+"content-type@npm:~1.0.4, content-type@npm:~1.0.5":
+  version: 1.0.5
+  resolution: "content-type@npm:1.0.5"
+  checksum: 10c0/b76ebed15c000aee4678c3707e0860cb6abd4e680a598c0a26e17f0bfae723ec9cc2802f0ff1bc6e4d80603719010431d2231018373d4dde10f9ccff9dadf5af
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:1.7.0":
+  version: 1.7.0
+  resolution: "convert-source-map@npm:1.7.0"
+  dependencies:
+    safe-buffer: "npm:~5.1.1"
+  checksum: 10c0/e58240044fa2ca34943a450c9af1f2c739a053dc91a97543dd73df666b7e28d9687285926081883950fcc7cb409aad7254d05afbbaf4e2e47491bbf9fad8b952
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:^0.3.3":
+  version: 0.3.5
+  resolution: "convert-source-map@npm:0.3.5"
+  checksum: 10c0/2fcb42750476916528df41416d8849a0a3764ed0bc3ea0a5ce4f673b70a85adf76a4819ccfbae8b5cba5d7100f86a81adbd5696ad9a60c774a4d002d12450b92
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
+  version: 1.9.0
+  resolution: "convert-source-map@npm:1.9.0"
+  checksum: 10c0/281da55454bf8126cbc6625385928c43479f2060984180c42f3a86c8b8c12720a24eac260624a7d1e090004028d2dee78602330578ceec1a08e27cb8bb0a8a5b
+  languageName: node
+  linkType: hard
+
+"convert-source-map@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "convert-source-map@npm:2.0.0"
+  checksum: 10c0/8f2f7a27a1a011cc6cc88cc4da2d7d0cfa5ee0369508baae3d98c260bb3ac520691464e5bbe4ae7cdf09860c1d69ecc6f70c63c6e7c7f7e3f18ec08484dc7d9b
+  languageName: node
+  linkType: hard
+
+"cookie-signature@npm:1.0.6":
+  version: 1.0.6
+  resolution: "cookie-signature@npm:1.0.6"
+  checksum: 10c0/b36fd0d4e3fef8456915fcf7742e58fbfcc12a17a018e0eb9501c9d5ef6893b596466f03b0564b81af29ff2538fd0aa4b9d54fe5ccbfb4c90ea50ad29fe2d221
+  languageName: node
+  linkType: hard
+
+"cookie@npm:0.6.0":
+  version: 0.6.0
+  resolution: "cookie@npm:0.6.0"
+  checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686
+  languageName: node
+  linkType: hard
+
+"cookie@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "cookie@npm:0.5.0"
+  checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+  languageName: node
+  linkType: hard
+
+"copy-concurrently@npm:^1.0.0":
+  version: 1.0.5
+  resolution: "copy-concurrently@npm:1.0.5"
+  dependencies:
+    aproba: "npm:^1.1.1"
+    fs-write-stream-atomic: "npm:^1.0.8"
+    iferr: "npm:^0.1.5"
+    mkdirp: "npm:^0.5.1"
+    rimraf: "npm:^2.5.4"
+    run-queue: "npm:^1.0.0"
+  checksum: 10c0/c2ce213cb27ee3df584d16eb6c9bfe99cfb531585007533c3e4c752521b4fbf0b2f7f90807d79c496683330808ecd9fdbd9ab9ddfa0913150b7f5097423348ce
+  languageName: node
+  linkType: hard
+
+"copy-descriptor@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "copy-descriptor@npm:0.1.1"
+  checksum: 10c0/161f6760b7348c941007a83df180588fe2f1283e0867cc027182734e0f26134e6cc02de09aa24a95dc267b2e2025b55659eef76c8019df27bc2d883033690181
+  languageName: node
+  linkType: hard
+
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
+  version: 3.37.0
+  resolution: "core-js-compat@npm:3.37.0"
+  dependencies:
+    browserslist: "npm:^4.23.0"
+  checksum: 10c0/ca6ba7d200f7a4a850fd5cba58b40ab78139d3f301bad7b53816eafe0cfb000523e72882069ddaba440794b950ed101225668bf7b97b73e54a5e3384a8215e03
+  languageName: node
+  linkType: hard
+
+"core-js-pure@npm:^3.30.2":
+  version: 3.37.0
+  resolution: "core-js-pure@npm:3.37.0"
+  checksum: 10c0/0559e5f7862674136754cdef7b2386f9a19f29fd834008d3fa3fb3b3d9ec31180e4c0c6b3b7cef35933665832489236846cf39b11f1f8f003cd848e7f834357a
+  languageName: node
+  linkType: hard
+
+"core-js@npm:^2.4.0":
+  version: 2.6.12
+  resolution: "core-js@npm:2.6.12"
+  checksum: 10c0/00128efe427789120a06b819adc94cc72b96955acb331cb71d09287baf9bd37bebd191d91f1ee4939c893a050307ead4faea08876f09115112612b6a05684b63
+  languageName: node
+  linkType: hard
+
+"core-js@npm:^3.36.1":
+  version: 3.36.1
+  resolution: "core-js@npm:3.36.1"
+  checksum: 10c0/4f0ad2464535d809ba659226feca15bff14b9b5452518bddff8d81b9c94b0227b3027d9838f22f1dce664958acb4107b935cc0037695ae545edc2a303bca98bf
+  languageName: node
+  linkType: hard
+
+"core-js@npm:^3.6.5":
+  version: 3.37.0
+  resolution: "core-js@npm:3.37.0"
+  checksum: 10c0/7e00331f346318ca3f595c08ce9e74ddae744715aef137486c1399163afd79792fb94c3161280863adfdc3e30f8026912d56bd3036f93cacfc689d33e185f2ee
+  languageName: node
+  linkType: hard
+
+"core-util-is@npm:~1.0.0":
+  version: 1.0.3
+  resolution: "core-util-is@npm:1.0.3"
+  checksum: 10c0/90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^5.0.0":
+  version: 5.2.1
+  resolution: "cosmiconfig@npm:5.2.1"
+  dependencies:
+    import-fresh: "npm:^2.0.0"
+    is-directory: "npm:^0.3.1"
+    js-yaml: "npm:^3.13.1"
+    parse-json: "npm:^4.0.0"
+  checksum: 10c0/ae9ba309cdbb42d0c9d63dad5c1dfa1c56bb8f818cb8633eea14fd2dbdc9f33393b77658ba96fdabda497bc943afed8c3371d1222afe613c518ba676fa624645
+  languageName: node
+  linkType: hard
+
+"cosmiconfig@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "cosmiconfig@npm:7.1.0"
+  dependencies:
+    "@types/parse-json": "npm:^4.0.0"
+    import-fresh: "npm:^3.2.1"
+    parse-json: "npm:^5.0.0"
+    path-type: "npm:^4.0.0"
+    yaml: "npm:^1.10.0"
+  checksum: 10c0/b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03
+  languageName: node
+  linkType: hard
+
+"create-ecdh@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "create-ecdh@npm:4.0.4"
+  dependencies:
+    bn.js: "npm:^4.1.0"
+    elliptic: "npm:^6.5.3"
+  checksum: 10c0/77b11a51360fec9c3bce7a76288fc0deba4b9c838d5fb354b3e40c59194d23d66efe6355fd4b81df7580da0661e1334a235a2a5c040b7569ba97db428d466e7f
+  languageName: node
+  linkType: hard
+
+"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "create-hash@npm:1.2.0"
+  dependencies:
+    cipher-base: "npm:^1.0.1"
+    inherits: "npm:^2.0.1"
+    md5.js: "npm:^1.3.4"
+    ripemd160: "npm:^2.0.1"
+    sha.js: "npm:^2.4.0"
+  checksum: 10c0/d402e60e65e70e5083cb57af96d89567954d0669e90550d7cec58b56d49c4b193d35c43cec8338bc72358198b8cbf2f0cac14775b651e99238e1cf411490f915
+  languageName: node
+  linkType: hard
+
+"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "create-hmac@npm:1.1.7"
+  dependencies:
+    cipher-base: "npm:^1.0.3"
+    create-hash: "npm:^1.1.0"
+    inherits: "npm:^2.0.1"
+    ripemd160: "npm:^2.0.0"
+    safe-buffer: "npm:^5.0.1"
+    sha.js: "npm:^2.4.8"
+  checksum: 10c0/24332bab51011652a9a0a6d160eed1e8caa091b802335324ae056b0dcb5acbc9fcf173cf10d128eba8548c3ce98dfa4eadaa01bd02f44a34414baee26b651835
+  languageName: node
+  linkType: hard
+
+"create-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "create-jest@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-config: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    prompts: "npm:^2.0.1"
+  bin:
+    create-jest: bin/create-jest.js
+  checksum: 10c0/e7e54c280692470d3398f62a6238fd396327e01c6a0757002833f06d00afc62dd7bfe04ff2b9cd145264460e6b4d1eb8386f2925b7e567f97939843b7b0e812f
+  languageName: node
+  linkType: hard
+
+"cross-spawn@npm:7.0.3, cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "cross-spawn@npm:7.0.3"
+  dependencies:
+    path-key: "npm:^3.1.0"
+    shebang-command: "npm:^2.0.0"
+    which: "npm:^2.0.1"
+  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+  languageName: node
+  linkType: hard
+
+"cross-spawn@npm:^6.0.0":
+  version: 6.0.5
+  resolution: "cross-spawn@npm:6.0.5"
+  dependencies:
+    nice-try: "npm:^1.0.4"
+    path-key: "npm:^2.0.1"
+    semver: "npm:^5.5.0"
+    shebang-command: "npm:^1.2.0"
+    which: "npm:^1.2.9"
+  checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012
+  languageName: node
+  linkType: hard
+
+"crypto-browserify@npm:^3.11.0":
+  version: 3.12.0
+  resolution: "crypto-browserify@npm:3.12.0"
+  dependencies:
+    browserify-cipher: "npm:^1.0.0"
+    browserify-sign: "npm:^4.0.0"
+    create-ecdh: "npm:^4.0.0"
+    create-hash: "npm:^1.1.0"
+    create-hmac: "npm:^1.1.0"
+    diffie-hellman: "npm:^5.0.0"
+    inherits: "npm:^2.0.1"
+    pbkdf2: "npm:^3.0.3"
+    public-encrypt: "npm:^4.0.0"
+    randombytes: "npm:^2.0.0"
+    randomfill: "npm:^1.0.3"
+  checksum: 10c0/0c20198886576050a6aa5ba6ae42f2b82778bfba1753d80c5e7a090836890dc372bdc780986b2568b4fb8ed2a91c958e61db1f0b6b1cc96af4bd03ffc298ba92
+  languageName: node
+  linkType: hard
+
+"crypto-random-string@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "crypto-random-string@npm:1.0.0"
+  checksum: 10c0/0cb4dbbb895656919d1de11ba43829a3527edddb85a9c49c9d4c4eb783d3b03fc9f371cefee62c87082fd8758db2798a52a9cad48a7381826190d3c2cf858e4a
+  languageName: node
+  linkType: hard
+
+"css-blank-pseudo@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "css-blank-pseudo@npm:0.1.4"
+  dependencies:
+    postcss: "npm:^7.0.5"
+  bin:
+    css-blank-pseudo: cli.js
+  checksum: 10c0/5347c13e93b10dba9ef55904eef0578bdea71884d2225a65e975e755f92196dda8bb03b8496f16dac3ad6a51ccd8ef4f4fe6f5695b7115462601d2ac32e7732f
+  languageName: node
+  linkType: hard
+
+"css-color-names@npm:0.0.4, css-color-names@npm:^0.0.4":
+  version: 0.0.4
+  resolution: "css-color-names@npm:0.0.4"
+  checksum: 10c0/88ef97c25bcfb217469cdff428049022438cc546eb208210f0edec03b75050723db3ba02cd0f4959c84cd0659be0b43af3323eff80d1ba5fb15c2accf09ccbe2
+  languageName: node
+  linkType: hard
+
+"css-declaration-sorter@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "css-declaration-sorter@npm:4.0.1"
+  dependencies:
+    postcss: "npm:^7.0.1"
+    timsort: "npm:^0.3.0"
+  checksum: 10c0/5d99058fb4bfec937731724f917d982790f6f08afdf147835053de1f84ecd42f06b139fe68e005adda83c190fac1a84e663eb8003b6bb733a9c72a4420fe22d2
+  languageName: node
+  linkType: hard
+
+"css-has-pseudo@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "css-has-pseudo@npm:0.10.0"
+  dependencies:
+    postcss: "npm:^7.0.6"
+    postcss-selector-parser: "npm:^5.0.0-rc.4"
+  bin:
+    css-has-pseudo: cli.js
+  checksum: 10c0/fc3d62b5324b97918968d3af92eb0c6cb32022b89a664ae60e814fb9d9f84c2bf9bdfc2a750a4d8edf4ebc6b2a03d227442ae2faf0c50f5cbff6047d6408c1df
+  languageName: node
+  linkType: hard
+
+"css-loader@npm:4.3.0":
+  version: 4.3.0
+  resolution: "css-loader@npm:4.3.0"
+  dependencies:
+    camelcase: "npm:^6.0.0"
+    cssesc: "npm:^3.0.0"
+    icss-utils: "npm:^4.1.1"
+    loader-utils: "npm:^2.0.0"
+    postcss: "npm:^7.0.32"
+    postcss-modules-extract-imports: "npm:^2.0.0"
+    postcss-modules-local-by-default: "npm:^3.0.3"
+    postcss-modules-scope: "npm:^2.2.0"
+    postcss-modules-values: "npm:^3.0.0"
+    postcss-value-parser: "npm:^4.1.0"
+    schema-utils: "npm:^2.7.1"
+    semver: "npm:^7.3.2"
+  peerDependencies:
+    webpack: ^4.27.0 || ^5.0.0
+  checksum: 10c0/adc0a57a3639519c5012c031ddebdfdb8f1f01930f46cf62ad2d8dff5c42bcbfb1acbab237cb7c5ce0125ef3236f5aadb5b64fe2b5d2a7e749cd9e245430a9c3
+  languageName: node
+  linkType: hard
+
+"css-loader@npm:^6.10.0":
+  version: 6.10.0
+  resolution: "css-loader@npm:6.10.0"
+  dependencies:
+    icss-utils: "npm:^5.1.0"
+    postcss: "npm:^8.4.33"
+    postcss-modules-extract-imports: "npm:^3.0.0"
+    postcss-modules-local-by-default: "npm:^4.0.4"
+    postcss-modules-scope: "npm:^3.1.1"
+    postcss-modules-values: "npm:^4.0.0"
+    postcss-value-parser: "npm:^4.2.0"
+    semver: "npm:^7.5.4"
+  peerDependencies:
+    "@rspack/core": 0.x || 1.x
+    webpack: ^5.0.0
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 10c0/acadd2a93f505bf8a8d1c6912a476ef953585f195412b6aa1f2581053bcce8563b833f2a6666c1e1521f4b35fb315176563495a38933becc89e3143cfa7dce45
+  languageName: node
+  linkType: hard
+
+"css-prefers-color-scheme@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "css-prefers-color-scheme@npm:3.1.1"
+  dependencies:
+    postcss: "npm:^7.0.5"
+  bin:
+    css-prefers-color-scheme: cli.js
+  checksum: 10c0/6cf84ad2176263c893e5b38ba3f97abc97fb611258cf89fad6f0528a8b60e687c14cadd1989c1a074d9210725a9ee6fb2bd96d95232a5bc1e9b71d570fb197fc
+  languageName: node
+  linkType: hard
+
+"css-select-base-adapter@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "css-select-base-adapter@npm:0.1.1"
+  checksum: 10c0/17f28a0d9e8596c541de250e48958e72a65399c9e15ba5689915d6631a451068187c19d674f08187843a61cb949951cb33c7db82bd7341536769523baed867dc
+  languageName: node
+  linkType: hard
+
+"css-select@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "css-select@npm:2.1.0"
+  dependencies:
+    boolbase: "npm:^1.0.0"
+    css-what: "npm:^3.2.1"
+    domutils: "npm:^1.7.0"
+    nth-check: "npm:^1.0.2"
+  checksum: 10c0/47832492c8218ffd92ed18eaa325397bd0bd8e4bcf3bc71767c5e1ed8b4f39b672ba157b0b5e693ef50006017d78c19e46791a75b43bb192c4db3680a331afc7
+  languageName: node
+  linkType: hard
+
+"css-select@npm:^4.1.3":
+  version: 4.3.0
+  resolution: "css-select@npm:4.3.0"
+  dependencies:
+    boolbase: "npm:^1.0.0"
+    css-what: "npm:^6.0.1"
+    domhandler: "npm:^4.3.1"
+    domutils: "npm:^2.8.0"
+    nth-check: "npm:^2.0.1"
+  checksum: 10c0/a489d8e5628e61063d5a8fe0fa1cc7ae2478cb334a388a354e91cf2908154be97eac9fa7ed4dffe87a3e06cf6fcaa6016553115335c4fd3377e13dac7bd5a8e1
+  languageName: node
+  linkType: hard
+
+"css-tree@npm:1.0.0-alpha.37":
+  version: 1.0.0-alpha.37
+  resolution: "css-tree@npm:1.0.0-alpha.37"
+  dependencies:
+    mdn-data: "npm:2.0.4"
+    source-map: "npm:^0.6.1"
+  checksum: 10c0/8f3c197baea919f4f55d0e84b1665d5e7d5fd74cb192fd0bf951828929b9cd5fd71de074afb685705bf5b40d7b04d4c5a206bfab26954378f04f2f5ce426d2f8
+  languageName: node
+  linkType: hard
+
+"css-tree@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "css-tree@npm:1.1.3"
+  dependencies:
+    mdn-data: "npm:2.0.14"
+    source-map: "npm:^0.6.1"
+  checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c
+  languageName: node
+  linkType: hard
+
+"css-what@npm:^3.2.1":
+  version: 3.4.2
+  resolution: "css-what@npm:3.4.2"
+  checksum: 10c0/454dca1b9dff8cf740d666d24a6c517562f374fe3a160891ebf8c82a9dd76864757913573c4db30537a959f5f595750420be00552ea6d5a9456ee68acc2349bf
+  languageName: node
+  linkType: hard
+
+"css-what@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "css-what@npm:6.1.0"
+  checksum: 10c0/a09f5a6b14ba8dcf57ae9a59474722e80f20406c53a61e9aedb0eedc693b135113ffe2983f4efc4b5065ae639442e9ae88df24941ef159c218b231011d733746
+  languageName: node
+  linkType: hard
+
+"css.escape@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "css.escape@npm:1.5.1"
+  checksum: 10c0/5e09035e5bf6c2c422b40c6df2eb1529657a17df37fda5d0433d722609527ab98090baf25b13970ca754079a0f3161dd3dfc0e743563ded8cfa0749d861c1525
+  languageName: node
+  linkType: hard
+
+"css@npm:^2.0.0":
+  version: 2.2.4
+  resolution: "css@npm:2.2.4"
+  dependencies:
+    inherits: "npm:^2.0.3"
+    source-map: "npm:^0.6.1"
+    source-map-resolve: "npm:^0.5.2"
+    urix: "npm:^0.1.0"
+  checksum: 10c0/496fa66568ebd9e51b3153817dd36ec004a45780da6f818e13117e3c4e50b774af41fff70a6ff2fa03777b239c4028ff655fe571b20964b90e886441cd141569
+  languageName: node
+  linkType: hard
+
+"cssdb@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "cssdb@npm:4.4.0"
+  checksum: 10c0/f3e0b3c3e5c1fbf0d0bd41394c1c344c636fe1fef42beaf9cd62dd9369f300260d26b6b4b29903ab71a47334b3574c71e9925c7df6d64c56b7dac6c3fefd452f
+  languageName: node
+  linkType: hard
+
+"cssesc@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "cssesc@npm:2.0.0"
+  bin:
+    cssesc: bin/cssesc
+  checksum: 10c0/3cf8cb06782e70bea7ccc3a215682399e0a1c42061b4f09411617ec8c04567eab52e132af5b35abea16269220e0e7d3d66f5d14014926eac63471406fec12094
+  languageName: node
+  linkType: hard
+
+"cssesc@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "cssesc@npm:3.0.0"
+  bin:
+    cssesc: bin/cssesc
+  checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7
+  languageName: node
+  linkType: hard
+
+"cssnano-preset-default@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "cssnano-preset-default@npm:4.0.8"
+  dependencies:
+    css-declaration-sorter: "npm:^4.0.1"
+    cssnano-util-raw-cache: "npm:^4.0.1"
+    postcss: "npm:^7.0.0"
+    postcss-calc: "npm:^7.0.1"
+    postcss-colormin: "npm:^4.0.3"
+    postcss-convert-values: "npm:^4.0.1"
+    postcss-discard-comments: "npm:^4.0.2"
+    postcss-discard-duplicates: "npm:^4.0.2"
+    postcss-discard-empty: "npm:^4.0.1"
+    postcss-discard-overridden: "npm:^4.0.1"
+    postcss-merge-longhand: "npm:^4.0.11"
+    postcss-merge-rules: "npm:^4.0.3"
+    postcss-minify-font-values: "npm:^4.0.2"
+    postcss-minify-gradients: "npm:^4.0.2"
+    postcss-minify-params: "npm:^4.0.2"
+    postcss-minify-selectors: "npm:^4.0.2"
+    postcss-normalize-charset: "npm:^4.0.1"
+    postcss-normalize-display-values: "npm:^4.0.2"
+    postcss-normalize-positions: "npm:^4.0.2"
+    postcss-normalize-repeat-style: "npm:^4.0.2"
+    postcss-normalize-string: "npm:^4.0.2"
+    postcss-normalize-timing-functions: "npm:^4.0.2"
+    postcss-normalize-unicode: "npm:^4.0.1"
+    postcss-normalize-url: "npm:^4.0.1"
+    postcss-normalize-whitespace: "npm:^4.0.2"
+    postcss-ordered-values: "npm:^4.1.2"
+    postcss-reduce-initial: "npm:^4.0.3"
+    postcss-reduce-transforms: "npm:^4.0.2"
+    postcss-svgo: "npm:^4.0.3"
+    postcss-unique-selectors: "npm:^4.0.1"
+  checksum: 10c0/6017657e0733da6ca73098452a7aed1a9b408b8b745e58ac86a4e3a5aa44f8d4476c2d6f16284a00aa649396624a03fb9bacce4746cfbb0edb593871ff20c7a1
+  languageName: node
+  linkType: hard
+
+"cssnano-util-get-arguments@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cssnano-util-get-arguments@npm:4.0.0"
+  checksum: 10c0/d14ff2f16852ee0883844f960f035d15ecc04c516f3dd98979e5515b02e9b7f883a5b5a54fd209cc1d117bb906a28382a5b2dd15a165e8e8f3e66ae14fddbe03
+  languageName: node
+  linkType: hard
+
+"cssnano-util-get-match@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cssnano-util-get-match@npm:4.0.0"
+  checksum: 10c0/62462d6fe07334f7bbe2530fa427c3fdd240af0cc949bb9feb2bf178432743ec1e6e5914f50c44cc3eb65488b1d6e6f9dcd5fbf948bc31e6672dea623e1923bb
+  languageName: node
+  linkType: hard
+
+"cssnano-util-raw-cache@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssnano-util-raw-cache@npm:4.0.1"
+  dependencies:
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/d0bc709570d540b5b122baa47f61072f268488ef78eefac3388bdcfc880f533c4cf8361afafcad78222453d405509fd211a832382d61c5ad6f3fef142ce5afb5
+  languageName: node
+  linkType: hard
+
+"cssnano-util-same-parent@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "cssnano-util-same-parent@npm:4.0.1"
+  checksum: 10c0/bec24c8609def0a73734a2d5e0df130655c9c7ec9098da0b66166e81f6614eb90fa43cb0afe81dabea51e253c11a240546c5e1a67b30d22aa297349394522642
+  languageName: node
+  linkType: hard
+
+"cssnano@npm:^4.1.10":
+  version: 4.1.11
+  resolution: "cssnano@npm:4.1.11"
+  dependencies:
+    cosmiconfig: "npm:^5.0.0"
+    cssnano-preset-default: "npm:^4.0.8"
+    is-resolvable: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/ca0898a512b203437fd8320b3618aa9806db8fed3406389c83f071b9e52e49b3b9e11c628a56690e61451bdc33dc63cd01567d94d599afd4087f548769ffa19e
+  languageName: node
+  linkType: hard
+
+"csso@npm:^4.0.2":
+  version: 4.2.0
+  resolution: "csso@npm:4.2.0"
+  dependencies:
+    css-tree: "npm:^1.1.2"
+  checksum: 10c0/f8c6b1300efaa0f8855a7905ae3794a29c6496e7f16a71dec31eb6ca7cfb1f058a4b03fd39b66c4deac6cb06bf6b4ba86da7b67d7320389cb9994d52b924b903
+  languageName: node
+  linkType: hard
+
+"cssom@npm:^0.4.4":
+  version: 0.4.4
+  resolution: "cssom@npm:0.4.4"
+  checksum: 10c0/0d4fc70255ea3afbd4add79caffa3b01720929da91105340600d8c0f06c31716f933c6314c3d43b62b57c9637bc2eb35296a9e2db427e8b572ee38a4be2b5f82
+  languageName: node
+  linkType: hard
+
+"cssom@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "cssom@npm:0.5.0"
+  checksum: 10c0/8c4121c243baf0678c65dcac29b201ff0067dfecf978de9d5c83b2ff127a8fdefd2bfd54577f5ad8c80ed7d2c8b489ae01c82023545d010c4ecb87683fb403dd
+  languageName: node
+  linkType: hard
+
+"cssom@npm:~0.3.6":
+  version: 0.3.8
+  resolution: "cssom@npm:0.3.8"
+  checksum: 10c0/d74017b209440822f9e24d8782d6d2e808a8fdd58fa626a783337222fe1c87a518ba944d4c88499031b4786e68772c99dfae616638d71906fe9f203aeaf14411
+  languageName: node
+  linkType: hard
+
+"cssstyle@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "cssstyle@npm:2.3.0"
+  dependencies:
+    cssom: "npm:~0.3.6"
+  checksum: 10c0/863400da2a458f73272b9a55ba7ff05de40d850f22eb4f37311abebd7eff801cf1cd2fb04c4c92b8c3daed83fe766e52e4112afb7bc88d86c63a9c2256a7d178
+  languageName: node
+  linkType: hard
+
+"cssstyle@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "cssstyle@npm:3.0.0"
+  dependencies:
+    rrweb-cssom: "npm:^0.6.0"
+  checksum: 10c0/23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807
+  languageName: node
+  linkType: hard
+
+"csstype@npm:^3.0.2":
+  version: 3.1.3
+  resolution: "csstype@npm:3.1.3"
+  checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248
+  languageName: node
+  linkType: hard
+
+"cubic2quad@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "cubic2quad@npm:1.2.1"
+  checksum: 10c0/6be433131510b5468a940c3ebc5ae74300f7a223cf3e13003c54e1b0648b0c99e585bb159cfc1bca3c26e2f9bdf1bcbcc7b5547ccde45d11180c2364c3dfd0f7
+  languageName: node
+  linkType: hard
+
+"cyclist@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "cyclist@npm:1.0.2"
+  checksum: 10c0/163e2f7207180ccf2bb5a6ca8a7360469c13fad631509ef96de02397266b3a42089e2b2b51b97d3d8fdc4709d2fbe651c309670e5cc28b0ae445b1e5a34a98e2
+  languageName: node
+  linkType: hard
+
+"d@npm:1, d@npm:^1.0.1, d@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "d@npm:1.0.2"
+  dependencies:
+    es5-ext: "npm:^0.10.64"
+    type: "npm:^2.7.2"
+  checksum: 10c0/3e6ede10cd3b77586c47da48423b62bed161bf1a48bdbcc94d87263522e22f5dfb0e678a6dba5323fdc14c5d8612b7f7eb9e7d9e37b2e2d67a7bf9f116dabe5a
+  languageName: node
+  linkType: hard
+
+"damerau-levenshtein@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "damerau-levenshtein@npm:1.0.8"
+  checksum: 10c0/4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3
+  languageName: node
+  linkType: hard
+
+"data-urls@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "data-urls@npm:2.0.0"
+  dependencies:
+    abab: "npm:^2.0.3"
+    whatwg-mimetype: "npm:^2.3.0"
+    whatwg-url: "npm:^8.0.0"
+  checksum: 10c0/1246442178eb756afb1d99e54669a119eafb3e69c73300d14089687c50c64f9feadd93c973f496224a12f89daa94267a6114aecd70e9b279c09d908c5be44d01
+  languageName: node
+  linkType: hard
+
+"data-urls@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "data-urls@npm:3.0.2"
+  dependencies:
+    abab: "npm:^2.0.6"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^11.0.0"
+  checksum: 10c0/051c3aaaf3e961904f136aab095fcf6dff4db23a7fc759dd8ba7b3e6ba03fc07ef608086caad8ab910d864bd3b5e57d0d2f544725653d77c96a2c971567045f4
+  languageName: node
+  linkType: hard
+
+"data-urls@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "data-urls@npm:4.0.0"
+  dependencies:
+    abab: "npm:^2.0.6"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^12.0.0"
+  checksum: 10c0/928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766
+  languageName: node
+  linkType: hard
+
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/8984119e59dbed906a11fcfb417d7d861936f16697a0e7216fe2c6c810f6b5e8f4a5281e73f2c28e8e9259027190ac4a33e2a65fdd7fa86ac06b76e838918583
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/b7d9e48a0cf5aefed9ab7d123559917b2d7e0d65531f43b2fd95b9d3a6b46042dd3fca597c42bba384e66b70d7ad66ff23932f8367b241f53d93af42cfe04ec2
+  languageName: node
+  linkType: hard
+
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
+  dependencies:
+    call-bind: "npm:^1.0.6"
+    es-errors: "npm:^1.3.0"
+    is-data-view: "npm:^1.0.1"
+  checksum: 10c0/21b0d2e53fd6e20cc4257c873bf6d36d77bd6185624b84076c0a1ddaa757b49aaf076254006341d35568e89f52eecd1ccb1a502cfb620f2beca04f48a6a62a8f
+  languageName: node
+  linkType: hard
+
+"dateformat@npm:^4.6.3":
+  version: 4.6.3
+  resolution: "dateformat@npm:4.6.3"
+  checksum: 10c0/e2023b905e8cfe2eb8444fb558562b524807a51cdfe712570f360f873271600b5c94aebffaf11efb285e2c072264a7cf243eadb68f3eba0f8cc85fb86cd25df6
+  languageName: node
+  linkType: hard
+
+"debounce@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "debounce@npm:1.2.1"
+  checksum: 10c0/6c9320aa0973fc42050814621a7a8a78146c1975799b5b3cc1becf1f77ba9a5aa583987884230da0842a03f385def452fad5d60db97c3d1c8b824e38a8edf500
+  languageName: node
+  linkType: hard
+
+"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.0":
+  version: 2.6.9
+  resolution: "debug@npm:2.6.9"
+  dependencies:
+    ms: "npm:2.0.0"
+  checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589
+  languageName: node
+  linkType: hard
+
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+  version: 4.3.4
+  resolution: "debug@npm:4.3.4"
+  dependencies:
+    ms: "npm:2.1.2"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736
+  languageName: node
+  linkType: hard
+
+"debug@npm:^3.2.7":
+  version: 3.2.7
+  resolution: "debug@npm:3.2.7"
+  dependencies:
+    ms: "npm:^2.1.1"
+  checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a
+  languageName: node
+  linkType: hard
+
+"decamelize@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "decamelize@npm:1.2.0"
+  checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2
+  languageName: node
+  linkType: hard
+
+"decimal.js@npm:^10.2.1, decimal.js@npm:^10.4.2, decimal.js@npm:^10.4.3":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee
+  languageName: node
+  linkType: hard
+
+"decode-uri-component@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "decode-uri-component@npm:0.2.2"
+  checksum: 10c0/1f4fa54eb740414a816b3f6c24818fbfcabd74ac478391e9f4e2282c994127db02010ce804f3d08e38255493cfe68608b3f5c8e09fd6efc4ae46c807691f7a31
+  languageName: node
+  linkType: hard
+
+"dedent@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "dedent@npm:0.7.0"
+  checksum: 10c0/7c3aa00ddfe3e5fcd477958e156156a5137e3bb6ff1493ca05edff4decf29a90a057974cc77e75951f8eb801c1816cb45aea1f52d628cdd000b82b36ab839d1b
+  languageName: node
+  linkType: hard
+
+"dedent@npm:^1.0.0":
+  version: 1.5.1
+  resolution: "dedent@npm:1.5.1"
+  peerDependencies:
+    babel-plugin-macros: ^3.1.0
+  peerDependenciesMeta:
+    babel-plugin-macros:
+      optional: true
+  checksum: 10c0/f8612cd5b00aab58b18bb95572dca08dc2d49720bfa7201a444c3dae430291e8a06d4928614a6ec8764d713927f44bce9c990d3b8238fca2f430990ddc17c070
+  languageName: node
+  linkType: hard
+
+"deep-equal@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "deep-equal@npm:1.1.2"
+  dependencies:
+    is-arguments: "npm:^1.1.1"
+    is-date-object: "npm:^1.0.5"
+    is-regex: "npm:^1.1.4"
+    object-is: "npm:^1.1.5"
+    object-keys: "npm:^1.1.1"
+    regexp.prototype.flags: "npm:^1.5.1"
+  checksum: 10c0/cd85d822d18e9b3e1532d0f6ba412d229aa9d22881d70da161674428ae96e47925191296f7cda29306bac252889007da40ed8449363bd1c96c708acb82068a00
+  languageName: node
+  linkType: hard
+
+"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3":
+  version: 0.1.4
+  resolution: "deep-is@npm:0.1.4"
+  checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c
+  languageName: node
+  linkType: hard
+
+"deepmerge@npm:^4.2.2":
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 10c0/e53481aaf1aa2c4082b5342be6b6d8ad9dfe387bc92ce197a66dea08bd4265904a087e75e464f14d1347cf2ac8afe1e4c16b266e0561cc5df29382d3c5f80044
+  languageName: node
+  linkType: hard
+
+"default-gateway@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "default-gateway@npm:4.2.0"
+  dependencies:
+    execa: "npm:^1.0.0"
+    ip-regex: "npm:^2.1.0"
+  checksum: 10c0/2f499b3a9a6c995fd2b4c0d2411256b1899c94e7eacdb895be64e25c301fa8bce8fd3f8152e540669bb178c6a355154c2f86ec23d4ff40ff3b8413d2a59cd86d
+  languageName: node
+  linkType: hard
+
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
+  dependencies:
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    gopd: "npm:^1.0.1"
+  checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37
+  languageName: node
+  linkType: hard
+
+"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "define-properties@npm:1.2.1"
+  dependencies:
+    define-data-property: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.0"
+    object-keys: "npm:^1.1.1"
+  checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^0.2.5":
+  version: 0.2.5
+  resolution: "define-property@npm:0.2.5"
+  dependencies:
+    is-descriptor: "npm:^0.1.0"
+  checksum: 10c0/9986915c0893818dedc9ca23eaf41370667762fd83ad8aa4bf026a28563120dbaacebdfbfbf2b18d3b929026b9c6ee972df1dbf22de8fafb5fe6ef18361e4750
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "define-property@npm:1.0.0"
+  dependencies:
+    is-descriptor: "npm:^1.0.0"
+  checksum: 10c0/d7cf09db10d55df305f541694ed51dafc776ad9bb8a24428899c9f2d36b11ab38dce5527a81458d1b5e7c389f8cbe803b4abad6e91a0037a329d153b84fc975e
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "define-property@npm:2.0.2"
+  dependencies:
+    is-descriptor: "npm:^1.0.2"
+    isobject: "npm:^3.0.1"
+  checksum: 10c0/f91a08ad008fa764172a2c072adc7312f10217ade89ddaea23018321c6d71b2b68b8c229141ed2064179404e345c537f1a2457c379824813695b51a6ad3e4969
+  languageName: node
+  linkType: hard
+
+"del@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "del@npm:4.1.1"
+  dependencies:
+    "@types/glob": "npm:^7.1.1"
+    globby: "npm:^6.1.0"
+    is-path-cwd: "npm:^2.0.0"
+    is-path-in-cwd: "npm:^2.0.0"
+    p-map: "npm:^2.0.0"
+    pify: "npm:^4.0.1"
+    rimraf: "npm:^2.6.3"
+  checksum: 10c0/ed3233e86e39c0a6a7ea85d8ad0ebc00603078ad408b9c34b4742f707c20028c5731dce2e8aa9a6eb5ae6bee30ccc5405cf7b5d457306520e37c92d0410b6061
+  languageName: node
+  linkType: hard
+
+"delayed-stream@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "delayed-stream@npm:1.0.0"
+  checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19
+  languageName: node
+  linkType: hard
+
+"delegates@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "delegates@npm:1.0.0"
+  checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5
+  languageName: node
+  linkType: hard
+
+"depd@npm:2.0.0":
+  version: 2.0.0
+  resolution: "depd@npm:2.0.0"
+  checksum: 10c0/58bd06ec20e19529b06f7ad07ddab60e504d9e0faca4bd23079fac2d279c3594334d736508dc350e06e510aba5e22e4594483b3a6562ce7c17dd797f4cc4ad2c
+  languageName: node
+  linkType: hard
+
+"depd@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "depd@npm:1.1.2"
+  checksum: 10c0/acb24aaf936ef9a227b6be6d495f0d2eb20108a9a6ad40585c5bda1a897031512fef6484e4fdbb80bd249fdaa82841fa1039f416ece03188e677ba11bcfda249
+  languageName: node
+  linkType: hard
+
+"dequal@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "dequal@npm:2.0.3"
+  checksum: 10c0/f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
+  languageName: node
+  linkType: hard
+
+"des.js@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "des.js@npm:1.1.0"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    minimalistic-assert: "npm:^1.0.0"
+  checksum: 10c0/671354943ad67493e49eb4c555480ab153edd7cee3a51c658082fcde539d2690ed2a4a0b5d1f401f9cde822edf3939a6afb2585f32c091f2d3a1b1665cd45236
+  languageName: node
+  linkType: hard
+
+"destroy@npm:1.2.0":
+  version: 1.2.0
+  resolution: "destroy@npm:1.2.0"
+  checksum: 10c0/bd7633942f57418f5a3b80d5cb53898127bcf53e24cdf5d5f4396be471417671f0fee48a4ebe9a1e9defbde2a31280011af58a57e090ff822f589b443ed4e643
+  languageName: node
+  linkType: hard
+
+"detect-newline@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "detect-newline@npm:3.1.0"
+  checksum: 10c0/c38cfc8eeb9fda09febb44bcd85e467c970d4e3bf526095394e5a4f18bc26dd0cf6b22c69c1fa9969261521c593836db335c2795218f6d781a512aea2fb8209d
+  languageName: node
+  linkType: hard
+
+"detect-node@npm:^2.0.4":
+  version: 2.1.0
+  resolution: "detect-node@npm:2.1.0"
+  checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09
+  languageName: node
+  linkType: hard
+
+"detect-port-alt@npm:1.1.6":
+  version: 1.1.6
+  resolution: "detect-port-alt@npm:1.1.6"
+  dependencies:
+    address: "npm:^1.0.1"
+    debug: "npm:^2.6.0"
+  bin:
+    detect: ./bin/detect-port
+    detect-port: ./bin/detect-port
+  checksum: 10c0/7269e6aef7b782d98c77505c07a7a0f5e2ee98a9607dc791035fc0192fc58aa03cc833fae605e10eaf239a2a5a55cd938e0bb141dea764ac6180ca082fd62b23
+  languageName: node
+  linkType: hard
+
+"diff-sequences@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "diff-sequences@npm:26.6.2"
+  checksum: 10c0/a576b78f542377ce2bb032aa91aaf12376c6f562f79b2570f5fe16b4c18acff78de144ae44f0d86bedfe9c29ef38aa027db963850213e07bbc1c1a3b2834e861
+  languageName: node
+  linkType: hard
+
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: 10c0/32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2
+  languageName: node
+  linkType: hard
+
+"diffie-hellman@npm:^5.0.0":
+  version: 5.0.3
+  resolution: "diffie-hellman@npm:5.0.3"
+  dependencies:
+    bn.js: "npm:^4.1.0"
+    miller-rabin: "npm:^4.0.0"
+    randombytes: "npm:^2.0.0"
+  checksum: 10c0/ce53ccafa9ca544b7fc29b08a626e23a9b6562efc2a98559a0c97b4718937cebaa9b5d7d0a05032cc9c1435e9b3c1532b9e9bf2e0ede868525922807ad6e1ecf
+  languageName: node
+  linkType: hard
+
+"dir-glob@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "dir-glob@npm:3.0.1"
+  dependencies:
+    path-type: "npm:^4.0.0"
+  checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c
+  languageName: node
+  linkType: hard
+
+"dns-equal@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "dns-equal@npm:1.0.0"
+  checksum: 10c0/da966e5275ac50546e108af6bc29aaae2164d2ae96d60601b333c4a3aff91f50b6ca14929cf91f20a9cad1587b356323e300cea3ff6588a6a816988485f445f1
+  languageName: node
+  linkType: hard
+
+"dns-packet@npm:^1.3.1":
+  version: 1.3.4
+  resolution: "dns-packet@npm:1.3.4"
+  dependencies:
+    ip: "npm:^1.1.0"
+    safe-buffer: "npm:^5.0.1"
+  checksum: 10c0/ee06478da192f9014ab43c7e9118c77b9e353a8d5c06b0d2cba367b3501dd7453bcfed89354a8890cf740491379dcf4b28153d064d051e55c30cfbdf92b88608
+  languageName: node
+  linkType: hard
+
+"dns-txt@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "dns-txt@npm:2.0.2"
+  dependencies:
+    buffer-indexof: "npm:^1.0.0"
+  checksum: 10c0/71703e65156a2d626216157e6c4fddd844e7e790b6cd3cec830ef8eed80e7ea2697e5f4f2f3eb3aae809be3c91e370cad7a5d91b05ce6b6fcd5e191e7e3d31ca
+  languageName: node
+  linkType: hard
+
+"doctrine@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "doctrine@npm:2.1.0"
+  dependencies:
+    esutils: "npm:^2.0.2"
+  checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac
+  languageName: node
+  linkType: hard
+
+"doctrine@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "doctrine@npm:3.0.0"
+  dependencies:
+    esutils: "npm:^2.0.2"
+  checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520
+  languageName: node
+  linkType: hard
+
+"dom-accessibility-api@npm:^0.5.6":
+  version: 0.5.16
+  resolution: "dom-accessibility-api@npm:0.5.16"
+  checksum: 10c0/b2c2eda4fae568977cdac27a9f0c001edf4f95a6a6191dfa611e3721db2478d1badc01db5bb4fa8a848aeee13e442a6c2a4386d65ec65a1436f24715a2f8d053
+  languageName: node
+  linkType: hard
+
+"dom-converter@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "dom-converter@npm:0.2.0"
+  dependencies:
+    utila: "npm:~0.4"
+  checksum: 10c0/e96aa63bd8c6ee3cd9ce19c3aecfc2c42e50a460e8087114794d4f5ecf3a4f052b34ea3bf2d73b5d80b4da619073b49905e6d7d788ceb7814ca4c29be5354a11
+  languageName: node
+  linkType: hard
+
+"dom-serializer@npm:0":
+  version: 0.2.2
+  resolution: "dom-serializer@npm:0.2.2"
+  dependencies:
+    domelementtype: "npm:^2.0.1"
+    entities: "npm:^2.0.0"
+  checksum: 10c0/5cb595fb77e1a23eca56742f47631e6f4af66ce1982c7ed28b3d0ef21f1f50304c067adc29d3eaf824c572be022cee88627d0ac9b929408f24e923f3c7bed37b
+  languageName: node
+  linkType: hard
+
+"dom-serializer@npm:^1.0.1":
+  version: 1.4.1
+  resolution: "dom-serializer@npm:1.4.1"
+  dependencies:
+    domelementtype: "npm:^2.0.1"
+    domhandler: "npm:^4.2.0"
+    entities: "npm:^2.0.0"
+  checksum: 10c0/67d775fa1ea3de52035c98168ddcd59418356943b5eccb80e3c8b3da53adb8e37edb2cc2f885802b7b1765bf5022aec21dfc32910d7f9e6de4c3148f095ab5e0
+  languageName: node
+  linkType: hard
+
+"domain-browser@npm:^1.1.1":
+  version: 1.2.0
+  resolution: "domain-browser@npm:1.2.0"
+  checksum: 10c0/a955f482f4b4710fbd77c12a33e77548d63603c30c80f61a80519f27e3db1ba8530b914584cc9e9365d2038753d6b5bd1f4e6c81e432b007b0ec95b8b5e69b1b
+  languageName: node
+  linkType: hard
+
+"domelementtype@npm:1":
+  version: 1.3.1
+  resolution: "domelementtype@npm:1.3.1"
+  checksum: 10c0/6d4f5761060a21eaf3c96545501e9d188745c7e1c31b8d141bf15d8748feeadba868f4ea32877751b8678b286fb1afbe6ae905ca3fb8f0214d8322e482cdbec0
+  languageName: node
+  linkType: hard
+
+"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0":
+  version: 2.3.0
+  resolution: "domelementtype@npm:2.3.0"
+  checksum: 10c0/686f5a9ef0fff078c1412c05db73a0dce096190036f33e400a07e2a4518e9f56b1e324f5c576a0a747ef0e75b5d985c040b0d51945ce780c0dd3c625a18cd8c9
+  languageName: node
+  linkType: hard
+
+"domexception@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "domexception@npm:2.0.1"
+  dependencies:
+    webidl-conversions: "npm:^5.0.0"
+  checksum: 10c0/24a3a07b85420671bc805ead7305e0f2ec9e55f104889b64c5a9fa7d93681e514f05c65f947bd9401b3da67f77b92fe7861bd15f4d0d418c4d32e34a2cd55d38
+  languageName: node
+  linkType: hard
+
+"domexception@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "domexception@npm:4.0.0"
+  dependencies:
+    webidl-conversions: "npm:^7.0.0"
+  checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294
+  languageName: node
+  linkType: hard
+
+"domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "domhandler@npm:4.3.1"
+  dependencies:
+    domelementtype: "npm:^2.2.0"
+  checksum: 10c0/5c199c7468cb052a8b5ab80b13528f0db3d794c64fc050ba793b574e158e67c93f8336e87fd81e9d5ee43b0e04aea4d8b93ed7be4899cb726a1601b3ba18538b
+  languageName: node
+  linkType: hard
+
+"dompurify@npm:^2.4.9":
+  version: 2.4.9
+  resolution: "dompurify@npm:2.4.9"
+  checksum: 10c0/cb847f5eacd9ff326dfc4566875709d050dc78c58837cc3afb83386992f6e7002295358cb9f75d66a9b638fe6da71b7d02ffa82f121713f78f7f3891394dece8
+  languageName: node
+  linkType: hard
+
+"domutils@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "domutils@npm:1.7.0"
+  dependencies:
+    dom-serializer: "npm:0"
+    domelementtype: "npm:1"
+  checksum: 10c0/437fcd2d6d6be03f488152e73c6f953e289c58496baa22be9626b2b46f9cfd40486ae77d144487ff6b102929a3231cdb9a8bf8ef485fb7b7c30c985daedc77eb
+  languageName: node
+  linkType: hard
+
+"domutils@npm:^2.5.2, domutils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "domutils@npm:2.8.0"
+  dependencies:
+    dom-serializer: "npm:^1.0.1"
+    domelementtype: "npm:^2.2.0"
+    domhandler: "npm:^4.2.0"
+  checksum: 10c0/d58e2ae01922f0dd55894e61d18119924d88091837887bf1438f2327f32c65eb76426bd9384f81e7d6dcfb048e0f83c19b222ad7101176ad68cdc9c695b563db
+  languageName: node
+  linkType: hard
+
+"dot-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "dot-case@npm:3.0.4"
+  dependencies:
+    no-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/5b859ea65097a7ea870e2c91b5768b72ddf7fa947223fd29e167bcdff58fe731d941c48e47a38ec8aa8e43044c8fbd15cd8fa21689a526bc34b6548197cd5b05
+  languageName: node
+  linkType: hard
+
+"dot-prop@npm:^5.2.0":
+  version: 5.3.0
+  resolution: "dot-prop@npm:5.3.0"
+  dependencies:
+    is-obj: "npm:^2.0.0"
+  checksum: 10c0/93f0d343ef87fe8869320e62f2459f7e70f49c6098d948cc47e060f4a3f827d0ad61e83cb82f2bd90cd5b9571b8d334289978a43c0f98fea4f0e99ee8faa0599
+  languageName: node
+  linkType: hard
+
+"dotenv-expand@npm:5.1.0":
+  version: 5.1.0
+  resolution: "dotenv-expand@npm:5.1.0"
+  checksum: 10c0/24ac633de853ef474d0421cc639328b7134109c8dc2baaa5e3afb7495af5e9237136d7e6971e55668e4dce915487eb140967cdd2b3e99aa439e0f6bf8b56faeb
+  languageName: node
+  linkType: hard
+
+"dotenv@npm:8.2.0":
+  version: 8.2.0
+  resolution: "dotenv@npm:8.2.0"
+  checksum: 10c0/b6a07a2c400b13ad4e59c34e4682256e6bb846469781a3963b36861ee608ed312e6125c4a7635a9edcf957bb294a6966e218f0e26b82ff0bda9184211d4bc141
+  languageName: node
+  linkType: hard
+
+"duplexer@npm:^0.1.1, duplexer@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "duplexer@npm:0.1.2"
+  checksum: 10c0/c57bcd4bdf7e623abab2df43a7b5b23d18152154529d166c1e0da6bee341d84c432d157d7e97b32fecb1bf3a8b8857dd85ed81a915789f550637ed25b8e64fc2
+  languageName: node
+  linkType: hard
+
+"duplexify@npm:^3.4.2, duplexify@npm:^3.6.0":
+  version: 3.7.1
+  resolution: "duplexify@npm:3.7.1"
+  dependencies:
+    end-of-stream: "npm:^1.0.0"
+    inherits: "npm:^2.0.1"
+    readable-stream: "npm:^2.0.0"
+    stream-shift: "npm:^1.0.0"
+  checksum: 10c0/59d1440c1b4e3a4db35ae96933392703ce83518db1828d06b9b6322920d6cbbf0b7159e88be120385fe459e77f1eb0c7622f26e9ec1f47c9ff05c2b35747dbd3
+  languageName: node
+  linkType: hard
+
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39
+  languageName: node
+  linkType: hard
+
+"ee-first@npm:1.1.1":
+  version: 1.1.1
+  resolution: "ee-first@npm:1.1.1"
+  checksum: 10c0/b5bb125ee93161bc16bfe6e56c6b04de5ad2aa44234d8f644813cc95d861a6910903132b05093706de2b706599367c4130eb6d170f6b46895686b95f87d017b7
+  languageName: node
+  linkType: hard
+
+"ejs@npm:^2.6.1":
+  version: 2.7.4
+  resolution: "ejs@npm:2.7.4"
+  checksum: 10c0/d5700120ce5dd10e0853085003862f5d78c198326ed634838aa7f8b0bf1efd65ad9fa0f2bac0053af05afeb21fb015595166b2c4fc83c7ef8f481e469a01ad52
+  languageName: node
+  linkType: hard
+
+"electron-to-chromium@npm:^1.3.564":
+  version: 1.4.763
+  resolution: "electron-to-chromium@npm:1.4.763"
+  checksum: 10c0/8787092e2c237699d145860564635391eb856febad3d2ab171a12c671788d1aee323a42822daf0fc8ee49d615b85776470c97ecf212edeb64794f1ffc171f842
+  languageName: node
+  linkType: hard
+
+"electron-to-chromium@npm:^1.4.668":
+  version: 1.4.724
+  resolution: "electron-to-chromium@npm:1.4.724"
+  checksum: 10c0/bc7a3f153d952325bac09c1e67325bfc6d686130541550d1b7429cf72a1202256eed09299c4d8010684aa3683332336f05324acf03bc0be7c7060f4e0820c267
+  languageName: node
+  linkType: hard
+
+"elliptic@npm:^6.5.3, elliptic@npm:^6.5.5":
+  version: 6.5.5
+  resolution: "elliptic@npm:6.5.5"
+  dependencies:
+    bn.js: "npm:^4.11.9"
+    brorand: "npm:^1.1.0"
+    hash.js: "npm:^1.0.0"
+    hmac-drbg: "npm:^1.0.1"
+    inherits: "npm:^2.0.4"
+    minimalistic-assert: "npm:^1.0.1"
+    minimalistic-crypto-utils: "npm:^1.0.1"
+  checksum: 10c0/3e591e93783a1b66f234ebf5bd3a8a9a8e063a75073a35a671e03e3b25253b6e33ac121f7efe9b8808890fffb17b40596cc19d01e6e8d1fa13b9a56ff65597c8
+  languageName: node
+  linkType: hard
+
+"emittery@npm:^0.13.1":
+  version: 0.13.1
+  resolution: "emittery@npm:0.13.1"
+  checksum: 10c0/1573d0ae29ab34661b6c63251ff8f5facd24ccf6a823f19417ae8ba8c88ea450325788c67f16c99edec8de4b52ce93a10fe441ece389fd156e88ee7dab9bfa35
+  languageName: node
+  linkType: hard
+
+"emittery@npm:^0.7.1":
+  version: 0.7.2
+  resolution: "emittery@npm:0.7.2"
+  checksum: 10c0/a90d8b59a14de5f3c2bf9d9884867ab6f62d1da1363b660e1429543286f627372c07b70d78465e739f4a616ba1e6638f63c831ef0da146b89c7935f1e5a96ad5
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^7.0.1":
+  version: 7.0.3
+  resolution: "emoji-regex@npm:7.0.3"
+  checksum: 10c0/a8917d695c3a3384e4b7230a6a06fd2de6b3db3709116792e8b7b36ddbb3db4deb28ad3e983e70d4f2a1f9063b5dab9025e4e26e9ca08278da4fbb73e213743f
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "emoji-regex@npm:8.0.0"
+  checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010
+  languageName: node
+  linkType: hard
+
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639
+  languageName: node
+  linkType: hard
+
+"emojis-list@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "emojis-list@npm:3.0.0"
+  checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b
+  languageName: node
+  linkType: hard
+
+"encodeurl@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "encodeurl@npm:1.0.2"
+  checksum: 10c0/f6c2387379a9e7c1156c1c3d4f9cb7bb11cf16dd4c1682e1f6746512564b053df5781029b6061296832b59fb22f459dbe250386d217c2f6e203601abb2ee0bec
+  languageName: node
+  linkType: hard
+
+"encoding@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "encoding@npm:0.1.13"
+  dependencies:
+    iconv-lite: "npm:^0.6.2"
+  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+  languageName: node
+  linkType: hard
+
+"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0":
+  version: 1.4.4
+  resolution: "end-of-stream@npm:1.4.4"
+  dependencies:
+    once: "npm:^1.4.0"
+  checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975
+  languageName: node
+  linkType: hard
+
+"enhanced-resolve@npm:^4.3.0":
+  version: 4.5.0
+  resolution: "enhanced-resolve@npm:4.5.0"
+  dependencies:
+    graceful-fs: "npm:^4.1.2"
+    memory-fs: "npm:^0.5.0"
+    tapable: "npm:^1.0.0"
+  checksum: 10c0/d95fc630606ea35bed21c4a029bbb1681919571a2d1d2011c7fc42a26a9e48ed3d74a89949ce331e1fd3229850a303e3218b887b92951330f16bdfbb93a10e64
+  languageName: node
+  linkType: hard
+
+"enhanced-resolve@npm:^5.16.0":
+  version: 5.16.0
+  resolution: "enhanced-resolve@npm:5.16.0"
+  dependencies:
+    graceful-fs: "npm:^4.2.4"
+    tapable: "npm:^2.2.0"
+  checksum: 10c0/dd69669cbb638ccacefd03e04d5e195ee6a99b7f5f8012f86d2df7781834de357923e06064ea621137c4ce0b37cc12b872b4e6d1ac6ab15fe98e7f1dfbbb08c4
+  languageName: node
+  linkType: hard
+
+"enquirer@npm:^2.3.5":
+  version: 2.4.1
+  resolution: "enquirer@npm:2.4.1"
+  dependencies:
+    ansi-colors: "npm:^4.1.1"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10c0/43850479d7a51d36a9c924b518dcdc6373b5a8ae3401097d336b7b7e258324749d0ad37a1fcaa5706f04799baa05585cd7af19ebdf7667673e7694435fcea918
+  languageName: node
+  linkType: hard
+
+"entities@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "entities@npm:2.2.0"
+  checksum: 10c0/7fba6af1f116300d2ba1c5673fc218af1961b20908638391b4e1e6d5850314ee2ac3ec22d741b3a8060479911c99305164aed19b6254bde75e7e6b1b2c3f3aa3
+  languageName: node
+  linkType: hard
+
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
+  languageName: node
+  linkType: hard
+
+"env-paths@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "env-paths@npm:2.2.1"
+  checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4
+  languageName: node
+  linkType: hard
+
+"envinfo@npm:^7.7.3":
+  version: 7.11.1
+  resolution: "envinfo@npm:7.11.1"
+  bin:
+    envinfo: dist/cli.js
+  checksum: 10c0/4550cce03d4d8a7b137d548faaf9c920356474231636cb4a6e74ae75db3b9cb04aa0a052ee391e2363af5db697166c207ba76e106338d758c6126830b3e16d75
+  languageName: node
+  linkType: hard
+
+"err-code@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "err-code@npm:2.0.3"
+  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+  languageName: node
+  linkType: hard
+
+"errno@npm:^0.1.3, errno@npm:~0.1.7":
+  version: 0.1.8
+  resolution: "errno@npm:0.1.8"
+  dependencies:
+    prr: "npm:~1.0.1"
+  bin:
+    errno: cli.js
+  checksum: 10c0/83758951967ec57bf00b5f5b7dc797e6d65a6171e57ea57adcf1bd1a0b477fd9b5b35fae5be1ff18f4090ed156bce1db749fe7e317aac19d485a5d150f6a4936
+  languageName: node
+  linkType: hard
+
+"error-ex@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "error-ex@npm:1.3.2"
+  dependencies:
+    is-arrayish: "npm:^0.2.1"
+  checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce
+  languageName: node
+  linkType: hard
+
+"error-stack-parser@npm:^2.0.6":
+  version: 2.1.4
+  resolution: "error-stack-parser@npm:2.1.4"
+  dependencies:
+    stackframe: "npm:^1.3.4"
+  checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9
+  languageName: node
+  linkType: hard
+
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
+  version: 1.23.3
+  resolution: "es-abstract@npm:1.23.3"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.1"
+    data-view-byte-offset: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    es-to-primitive: "npm:^1.2.1"
+    function.prototype.name: "npm:^1.1.6"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
+    globalthis: "npm:^1.0.3"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.2"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
+    is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.1"
+    is-negative-zero: "npm:^2.0.3"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.3"
+    is-string: "npm:^1.0.7"
+    is-typed-array: "npm:^1.1.13"
+    is-weakref: "npm:^1.0.2"
+    object-inspect: "npm:^1.13.1"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.2"
+    safe-array-concat: "npm:^1.1.2"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.trim: "npm:^1.2.9"
+    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimstart: "npm:^1.0.8"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.6"
+    unbox-primitive: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666
+  languageName: node
+  linkType: hard
+
+"es-array-method-boxes-properly@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-array-method-boxes-properly@npm:1.0.0"
+  checksum: 10c0/4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d
+  languageName: node
+  linkType: hard
+
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4
+  languageName: node
+  linkType: hard
+
+"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.15":
+  version: 1.0.19
+  resolution: "es-iterator-helpers@npm:1.0.19"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.3"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    globalthis: "npm:^1.0.3"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    internal-slot: "npm:^1.0.7"
+    iterator.prototype: "npm:^1.1.2"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.17":
+  version: 1.0.18
+  resolution: "es-iterator-helpers@npm:1.0.18"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.0"
+    es-errors: "npm:^1.3.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    function-bind: "npm:^1.1.2"
+    get-intrinsic: "npm:^1.2.4"
+    globalthis: "npm:^1.0.3"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    internal-slot: "npm:^1.0.7"
+    iterator.prototype: "npm:^1.1.2"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10c0/93be402e01fa3d8bf62fcadd2fb3055126ffcfe8846911b10b85918ef46775252696c84e6191ec8125bedb61e92242ad1a54a86118436ba19814720cb9ff4aed
+  languageName: node
+  linkType: hard
+
+"es-module-lexer@npm:^1.2.1":
+  version: 1.5.0
+  resolution: "es-module-lexer@npm:1.5.0"
+  checksum: 10c0/d199853404f3381801eb102befb84a8fc48f93ed86b852c2461c2c4ad4bbbc91128f3d974ff9b8718628260ae3f36e661295ab3e419222868aa31269284e34c9
+  languageName: node
+  linkType: hard
+
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+  checksum: 10c0/1fed3d102eb27ab8d983337bb7c8b159dd2a1e63ff833ec54eea1311c96d5b08223b433060ba240541ca8adba9eee6b0a60cdbf2f80634b784febc9cc8b687b4
+  languageName: node
+  linkType: hard
+
+"es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a
+  languageName: node
+  linkType: hard
+
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
+  languageName: node
+  linkType: hard
+
+"es-to-primitive@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "es-to-primitive@npm:1.2.1"
+  dependencies:
+    is-callable: "npm:^1.1.4"
+    is-date-object: "npm:^1.0.1"
+    is-symbol: "npm:^1.0.2"
+  checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1
+  languageName: node
+  linkType: hard
+
+"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
+  version: 0.10.64
+  resolution: "es5-ext@npm:0.10.64"
+  dependencies:
+    es6-iterator: "npm:^2.0.3"
+    es6-symbol: "npm:^3.1.3"
+    esniff: "npm:^2.0.1"
+    next-tick: "npm:^1.1.0"
+  checksum: 10c0/4459b6ae216f3c615db086e02437bdfde851515a101577fd61b19f9b3c1ad924bab4d197981eb7f0ccb915f643f2fc10ff76b97a680e96cbb572d15a27acd9a3
+  languageName: node
+  linkType: hard
+
+"es6-iterator@npm:2.0.3, es6-iterator@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es6-iterator@npm:2.0.3"
+  dependencies:
+    d: "npm:1"
+    es5-ext: "npm:^0.10.35"
+    es6-symbol: "npm:^3.1.1"
+  checksum: 10c0/91f20b799dba28fb05bf623c31857fc1524a0f1c444903beccaf8929ad196c8c9ded233e5ac7214fc63a92b3f25b64b7f2737fcca8b1f92d2d96cf3ac902f5d8
+  languageName: node
+  linkType: hard
+
+"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3":
+  version: 3.1.4
+  resolution: "es6-symbol@npm:3.1.4"
+  dependencies:
+    d: "npm:^1.0.2"
+    ext: "npm:^1.7.0"
+  checksum: 10c0/777bf3388db5d7919e09a0fd175aa5b8a62385b17cb2227b7a137680cba62b4d9f6193319a102642aa23d5840d38a62e4784f19cfa5be4a2210a3f0e9b23d15d
+  languageName: node
+  linkType: hard
+
+"es6-weak-map@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es6-weak-map@npm:2.0.3"
+  dependencies:
+    d: "npm:1"
+    es5-ext: "npm:^0.10.46"
+    es6-iterator: "npm:^2.0.3"
+    es6-symbol: "npm:^3.1.1"
+  checksum: 10c0/460932be9542473dbbddd183e21c15a66cfec1b2c17dae2b514e190d6fb2896b7eb683783d4b36da036609d2e1c93d2815f21b374dfccaf02a8978694c2f7b67
+  languageName: node
+  linkType: hard
+
+"esbuild-loader@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "esbuild-loader@npm:4.1.0"
+  dependencies:
+    esbuild: "npm:^0.20.0"
+    get-tsconfig: "npm:^4.7.0"
+    loader-utils: "npm:^2.0.4"
+    webpack-sources: "npm:^1.4.3"
+  peerDependencies:
+    webpack: ^4.40.0 || ^5.0.0
+  checksum: 10c0/6752f48a88c85524ef316b5c7251e44f206da7aac4c63a02e8b4e8ff915d7215a7713710d41575dc749d0ac56cb0becf3f5b2cf543df875f4027b6009d73d7bc
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.20.0":
+  version: 0.20.2
+  resolution: "esbuild@npm:0.20.2"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.20.2"
+    "@esbuild/android-arm": "npm:0.20.2"
+    "@esbuild/android-arm64": "npm:0.20.2"
+    "@esbuild/android-x64": "npm:0.20.2"
+    "@esbuild/darwin-arm64": "npm:0.20.2"
+    "@esbuild/darwin-x64": "npm:0.20.2"
+    "@esbuild/freebsd-arm64": "npm:0.20.2"
+    "@esbuild/freebsd-x64": "npm:0.20.2"
+    "@esbuild/linux-arm": "npm:0.20.2"
+    "@esbuild/linux-arm64": "npm:0.20.2"
+    "@esbuild/linux-ia32": "npm:0.20.2"
+    "@esbuild/linux-loong64": "npm:0.20.2"
+    "@esbuild/linux-mips64el": "npm:0.20.2"
+    "@esbuild/linux-ppc64": "npm:0.20.2"
+    "@esbuild/linux-riscv64": "npm:0.20.2"
+    "@esbuild/linux-s390x": "npm:0.20.2"
+    "@esbuild/linux-x64": "npm:0.20.2"
+    "@esbuild/netbsd-x64": "npm:0.20.2"
+    "@esbuild/openbsd-x64": "npm:0.20.2"
+    "@esbuild/sunos-x64": "npm:0.20.2"
+    "@esbuild/win32-arm64": "npm:0.20.2"
+    "@esbuild/win32-ia32": "npm:0.20.2"
+    "@esbuild/win32-x64": "npm:0.20.2"
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 10c0/66398f9fb2c65e456a3e649747b39af8a001e47963b25e86d9c09d2a48d61aa641b27da0ce5cad63df95ad246105e1d83e7fee0e1e22a0663def73b1c5101112
+  languageName: node
+  linkType: hard
+
+"escalade@npm:^3.0.2, escalade@npm:^3.1.1":
+  version: 3.1.2
+  resolution: "escalade@npm:3.1.2"
+  checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287
+  languageName: node
+  linkType: hard
+
+"escape-html@npm:~1.0.3":
+  version: 1.0.3
+  resolution: "escape-html@npm:1.0.3"
+  checksum: 10c0/524c739d776b36c3d29fa08a22e03e8824e3b2fd57500e5e44ecf3cc4707c34c60f9ca0781c0e33d191f2991161504c295e98f68c78fe7baa6e57081ec6ac0a3
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:2.0.0, escape-string-regexp@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "escape-string-regexp@npm:2.0.0"
+  checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "escape-string-regexp@npm:1.0.5"
+  checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371
+  languageName: node
+  linkType: hard
+
+"escape-string-regexp@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "escape-string-regexp@npm:4.0.0"
+  checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9
+  languageName: node
+  linkType: hard
+
+"escodegen@npm:^1.8.1":
+  version: 1.14.3
+  resolution: "escodegen@npm:1.14.3"
+  dependencies:
+    esprima: "npm:^4.0.1"
+    estraverse: "npm:^4.2.0"
+    esutils: "npm:^2.0.2"
+    optionator: "npm:^0.8.1"
+    source-map: "npm:~0.6.1"
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 10c0/30d337803e8f44308c90267bf6192399e4b44792497c77a7506b68ab802ba6a48ebbe1ce77b219aba13dfd2de5f5e1c267e35be1ed87b2a9c3315e8b283e302a
+  languageName: node
+  linkType: hard
+
+"escodegen@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
+  dependencies:
+    esprima: "npm:^4.0.1"
+    estraverse: "npm:^5.2.0"
+    esutils: "npm:^2.0.2"
+    source-map: "npm:~0.6.1"
+  dependenciesMeta:
+    source-map:
+      optional: true
+  bin:
+    escodegen: bin/escodegen.js
+    esgenerate: bin/esgenerate.js
+  checksum: 10c0/e1450a1f75f67d35c061bf0d60888b15f62ab63aef9df1901cffc81cffbbb9e8b3de237c5502cf8613a017c1df3a3003881307c78835a1ab54d8c8d2206e01d3
+  languageName: node
+  linkType: hard
+
+"eslint-config-prettier@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
+  peerDependencies:
+    eslint: ">=7.0.0"
+  bin:
+    eslint-config-prettier: bin/cli.js
+  checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
+  languageName: node
+  linkType: hard
+
+"eslint-config-react-app@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "eslint-config-react-app@npm:6.0.0"
+  dependencies:
+    confusing-browser-globals: "npm:^1.0.10"
+  peerDependencies:
+    "@typescript-eslint/eslint-plugin": ^4.0.0
+    "@typescript-eslint/parser": ^4.0.0
+    babel-eslint: ^10.0.0
+    eslint: ^7.5.0
+    eslint-plugin-flowtype: ^5.2.0
+    eslint-plugin-import: ^2.22.0
+    eslint-plugin-jest: ^24.0.0
+    eslint-plugin-jsx-a11y: ^6.3.1
+    eslint-plugin-react: ^7.20.3
+    eslint-plugin-react-hooks: ^4.0.8
+    eslint-plugin-testing-library: ^3.9.0
+  peerDependenciesMeta:
+    eslint-plugin-jest:
+      optional: true
+    eslint-plugin-testing-library:
+      optional: true
+  checksum: 10c0/3141500eb3b7a1edfbade684cd07cb0199d60c7f432021842932e0c935285ae94b198f6cdc344c4f7ac7b7a1690bb4312c0b2ee4ca28a523d570df768ee177bf
+  languageName: node
+  linkType: hard
+
+"eslint-import-resolver-node@npm:^0.3.9":
+  version: 0.3.9
+  resolution: "eslint-import-resolver-node@npm:0.3.9"
+  dependencies:
+    debug: "npm:^3.2.7"
+    is-core-module: "npm:^2.13.0"
+    resolve: "npm:^1.22.4"
+  checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61
+  languageName: node
+  linkType: hard
+
+"eslint-module-utils@npm:^2.8.0":
+  version: 2.8.1
+  resolution: "eslint-module-utils@npm:2.8.1"
+  dependencies:
+    debug: "npm:^3.2.7"
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+  checksum: 10c0/1aeeb97bf4b688d28de136ee57c824480c37691b40fa825c711a4caf85954e94b99c06ac639d7f1f6c1d69223bd21bcb991155b3e589488e958d5b83dfd0f882
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-flowtype@npm:^5.2.0":
+  version: 5.10.0
+  resolution: "eslint-plugin-flowtype@npm:5.10.0"
+  dependencies:
+    lodash: "npm:^4.17.15"
+    string-natural-compare: "npm:^3.0.1"
+  peerDependencies:
+    eslint: ^7.1.0
+  checksum: 10c0/9b5d7d3ba0c9c174cd166dd948d8222efca67b78cedcf8ccaadf3a9593af039fcbcedeed0ef006877db5238aa1d7a7ee390e30954af664bf30b06a915b41acf1
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-import@npm:^2.22.1":
+  version: 2.29.1
+  resolution: "eslint-plugin-import@npm:2.29.1"
+  dependencies:
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlastindex: "npm:^1.2.3"
+    array.prototype.flat: "npm:^1.3.2"
+    array.prototype.flatmap: "npm:^1.3.2"
+    debug: "npm:^3.2.7"
+    doctrine: "npm:^2.1.0"
+    eslint-import-resolver-node: "npm:^0.3.9"
+    eslint-module-utils: "npm:^2.8.0"
+    hasown: "npm:^2.0.0"
+    is-core-module: "npm:^2.13.1"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^3.1.2"
+    object.fromentries: "npm:^2.0.7"
+    object.groupby: "npm:^1.0.1"
+    object.values: "npm:^1.1.7"
+    semver: "npm:^6.3.1"
+    tsconfig-paths: "npm:^3.15.0"
+  peerDependencies:
+    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+  checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-jest@npm:^24.1.0":
+  version: 24.7.0
+  resolution: "eslint-plugin-jest@npm:24.7.0"
+  dependencies:
+    "@typescript-eslint/experimental-utils": "npm:^4.0.1"
+  peerDependencies:
+    "@typescript-eslint/eslint-plugin": ">= 4"
+    eslint: ">=5"
+  peerDependenciesMeta:
+    "@typescript-eslint/eslint-plugin":
+      optional: true
+  checksum: 10c0/e93d92d83b3ee3c1b1252d696668a1c8e3bb4cfefc1acc506103636c2a35cd7d62ebb8eca6a75755b404b23e9506a0a742ad9493cdf1e3ab50e86b69fe2fbda8
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-jsx-a11y@npm:^6.3.1":
+  version: 6.8.0
+  resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.23.2"
+    aria-query: "npm:^5.3.0"
+    array-includes: "npm:^3.1.7"
+    array.prototype.flatmap: "npm:^1.3.2"
+    ast-types-flow: "npm:^0.0.8"
+    axe-core: "npm:=4.7.0"
+    axobject-query: "npm:^3.2.1"
+    damerau-levenshtein: "npm:^1.0.8"
+    emoji-regex: "npm:^9.2.2"
+    es-iterator-helpers: "npm:^1.0.15"
+    hasown: "npm:^2.0.0"
+    jsx-ast-utils: "npm:^3.3.5"
+    language-tags: "npm:^1.0.9"
+    minimatch: "npm:^3.1.2"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
+  peerDependencies:
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  checksum: 10c0/199b883e526e6f9d7c54cb3f094abc54f11a1ec816db5fb6cae3b938eb0e503acc10ccba91ca7451633a9d0b9abc0ea03601844a8aba5fe88c5e8897c9ac8f49
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-react-hooks@npm:^4.2.0":
+  version: 4.6.2
+  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
+  peerDependencies:
+    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+  checksum: 10c0/4844e58c929bc05157fb70ba1e462e34f1f4abcbc8dd5bbe5b04513d33e2699effb8bca668297976ceea8e7ebee4e8fc29b9af9d131bcef52886feaa2308b2cc
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-react@npm:^7.21.5, eslint-plugin-react@npm:^7.34.1":
+  version: 7.34.1
+  resolution: "eslint-plugin-react@npm:7.34.1"
+  dependencies:
+    array-includes: "npm:^3.1.7"
+    array.prototype.findlast: "npm:^1.2.4"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.toreversed: "npm:^1.1.2"
+    array.prototype.tosorted: "npm:^1.1.3"
+    doctrine: "npm:^2.1.0"
+    es-iterator-helpers: "npm:^1.0.17"
+    estraverse: "npm:^5.3.0"
+    jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
+    minimatch: "npm:^3.1.2"
+    object.entries: "npm:^1.1.7"
+    object.fromentries: "npm:^2.0.7"
+    object.hasown: "npm:^1.1.3"
+    object.values: "npm:^1.1.7"
+    prop-types: "npm:^15.8.1"
+    resolve: "npm:^2.0.0-next.5"
+    semver: "npm:^6.3.1"
+    string.prototype.matchall: "npm:^4.0.10"
+  peerDependencies:
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  checksum: 10c0/7c61b1314d37a4ac2f2474f9571f801f1a1a5d81dcd4abbb5d07145406518722fb792367267757ee116bde254be9753242d6b93c9619110398b3fe1746e4848c
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-simple-import-sort@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "eslint-plugin-simple-import-sort@npm:12.0.0"
+  peerDependencies:
+    eslint: ">=5.0.0"
+  checksum: 10c0/5405f01e4ca5b3c9a2a1b019e39fa858bb081872eb9602fb85d2e4913356fec0a9b3f997e957b1df0c370908ec124114148491e442d57e911b8249728d474398
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-sonarjs@npm:^0.25.0":
+  version: 0.25.0
+  resolution: "eslint-plugin-sonarjs@npm:0.25.0"
+  peerDependencies:
+    eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10c0/5fc9264f7fda28a2f58b4dcd928d86a9981eca80242e275f11bcd8d8fcecd11da3ee6d709f46e8c4aa644340f939bce46ae0501ff20e2301920d38152935907a
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-testing-library@npm:^3.9.2":
+  version: 3.10.2
+  resolution: "eslint-plugin-testing-library@npm:3.10.2"
+  dependencies:
+    "@typescript-eslint/experimental-utils": "npm:^3.10.1"
+  peerDependencies:
+    eslint: ^5 || ^6 || ^7
+  checksum: 10c0/f9bcb896c9fa6745883f506360b9765b8ef55ff8d553665f04389c82ca245316642f1464c0ae3ce37cd0223e9967d8a60ffc41499f5bf7422f5c29c024467bdb
+  languageName: node
+  linkType: hard
+
+"eslint-plugin-unused-imports@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "eslint-plugin-unused-imports@npm:3.1.0"
+  dependencies:
+    eslint-rule-composer: "npm:^0.3.0"
+  peerDependencies:
+    "@typescript-eslint/eslint-plugin": 6 - 7
+    eslint: 8
+  peerDependenciesMeta:
+    "@typescript-eslint/eslint-plugin":
+      optional: true
+  checksum: 10c0/712268fc10e7a5b169070c5ec2655733f4cdcf079848b2812ebe716b429a16cb87f315d3c0004cf128ba3874f68dd938eec8394a03587484e97e146494b48cda
+  languageName: node
+  linkType: hard
+
+"eslint-rule-composer@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "eslint-rule-composer@npm:0.3.0"
+  checksum: 10c0/1f0c40d209e1503a955101a0dbba37e7fc67c8aaa47a5b9ae0b0fcbae7022c86e52b3df2b1b9ffd658e16cd80f31fff92e7222460a44d8251e61d49e0af79a07
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.0.0, eslint-scope@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "eslint-scope@npm:5.1.1"
+  dependencies:
+    esrecurse: "npm:^4.3.0"
+    estraverse: "npm:^4.1.1"
+  checksum: 10c0/d30ef9dc1c1cbdece34db1539a4933fe3f9b14e1ffb27ecc85987902ee663ad7c9473bbd49a9a03195a373741e62e2f807c4938992e019b511993d163450e70a
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "eslint-scope@npm:4.0.3"
+  dependencies:
+    esrecurse: "npm:^4.1.0"
+    estraverse: "npm:^4.1.1"
+  checksum: 10c0/a2a3fe5845938ce7cfd2e658c309a9bb27a7f9ce94f0cc447ed5f9fa95b16451556d7e1db4c8e5d2aaa02d02850f5346d23091bbe94f7097412ce846504b4dcc
+  languageName: node
+  linkType: hard
+
+"eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
+  dependencies:
+    esrecurse: "npm:^4.3.0"
+    estraverse: "npm:^5.2.0"
+  checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116
+  languageName: node
+  linkType: hard
+
+"eslint-utils@npm:^2.0.0, eslint-utils@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "eslint-utils@npm:2.1.0"
+  dependencies:
+    eslint-visitor-keys: "npm:^1.1.0"
+  checksum: 10c0/69521c5d6569384b24093125d037ba238d3d6e54367f7143af9928f5286369e912c26cad5016d730c0ffb9797ac9e83831059d7f1d863f7dc84330eb02414611
+  languageName: node
+  linkType: hard
+
+"eslint-utils@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "eslint-utils@npm:3.0.0"
+  dependencies:
+    eslint-visitor-keys: "npm:^2.0.0"
+  peerDependencies:
+    eslint: ">=5"
+  checksum: 10c0/45aa2b63667a8d9b474c98c28af908d0a592bed1a4568f3145cd49fb5d9510f545327ec95561625290313fe126e6d7bdfe3fdbdb6f432689fab6b9497d3bfb52
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^1.0.0, eslint-visitor-keys@npm:^1.1.0, eslint-visitor-keys@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "eslint-visitor-keys@npm:1.3.0"
+  checksum: 10c0/10c91fdbbe36810dd4308e57f9a8bc7177188b2a70247e54e3af1fa05ebc66414ae6fd4ce3c6c6821591f43a556e9037bc6b071122e099b5f8b7d2f76df553e3
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "eslint-visitor-keys@npm:2.1.0"
+  checksum: 10c0/9f0e3a2db751d84067d15977ac4b4472efd6b303e369e6ff241a99feac04da758f46d5add022c33d06b53596038dbae4b4aceb27c7e68b8dfc1055b35e495787
+  languageName: node
+  linkType: hard
+
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
+  languageName: node
+  linkType: hard
+
+"eslint-webpack-plugin@npm:^2.5.2":
+  version: 2.7.0
+  resolution: "eslint-webpack-plugin@npm:2.7.0"
+  dependencies:
+    "@types/eslint": "npm:^7.29.0"
+    arrify: "npm:^2.0.1"
+    jest-worker: "npm:^27.5.1"
+    micromatch: "npm:^4.0.5"
+    normalize-path: "npm:^3.0.0"
+    schema-utils: "npm:^3.1.1"
+  peerDependencies:
+    eslint: ^7.0.0 || ^8.0.0
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/ecf4a032b6a2f3460af123ee2d1c56b04f504eedf94cff4b8ef9146dbf8856864c20a994b2b63a59e3713433232e0a1270c1d72f98ad61a48af154b205dfeb97
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^7.11.0":
+  version: 7.32.0
+  resolution: "eslint@npm:7.32.0"
+  dependencies:
+    "@babel/code-frame": "npm:7.12.11"
+    "@eslint/eslintrc": "npm:^0.4.3"
+    "@humanwhocodes/config-array": "npm:^0.5.0"
+    ajv: "npm:^6.10.0"
+    chalk: "npm:^4.0.0"
+    cross-spawn: "npm:^7.0.2"
+    debug: "npm:^4.0.1"
+    doctrine: "npm:^3.0.0"
+    enquirer: "npm:^2.3.5"
+    escape-string-regexp: "npm:^4.0.0"
+    eslint-scope: "npm:^5.1.1"
+    eslint-utils: "npm:^2.1.0"
+    eslint-visitor-keys: "npm:^2.0.0"
+    espree: "npm:^7.3.1"
+    esquery: "npm:^1.4.0"
+    esutils: "npm:^2.0.2"
+    fast-deep-equal: "npm:^3.1.3"
+    file-entry-cache: "npm:^6.0.1"
+    functional-red-black-tree: "npm:^1.0.1"
+    glob-parent: "npm:^5.1.2"
+    globals: "npm:^13.6.0"
+    ignore: "npm:^4.0.6"
+    import-fresh: "npm:^3.0.0"
+    imurmurhash: "npm:^0.1.4"
+    is-glob: "npm:^4.0.0"
+    js-yaml: "npm:^3.13.1"
+    json-stable-stringify-without-jsonify: "npm:^1.0.1"
+    levn: "npm:^0.4.1"
+    lodash.merge: "npm:^4.6.2"
+    minimatch: "npm:^3.0.4"
+    natural-compare: "npm:^1.4.0"
+    optionator: "npm:^0.9.1"
+    progress: "npm:^2.0.0"
+    regexpp: "npm:^3.1.0"
+    semver: "npm:^7.2.1"
+    strip-ansi: "npm:^6.0.0"
+    strip-json-comments: "npm:^3.1.0"
+    table: "npm:^6.0.9"
+    text-table: "npm:^0.2.0"
+    v8-compile-cache: "npm:^2.0.3"
+  bin:
+    eslint: bin/eslint.js
+  checksum: 10c0/84409f7767556179cb11529f1215f335c7dfccf90419df6147f949f14c347a960c7b569e80ed84011a0b6d10da1ef5046edbbb9b11c3e59aa6696d5217092e93
+  languageName: node
+  linkType: hard
+
+"eslint@npm:^8.57.0":
+  version: 8.57.0
+  resolution: "eslint@npm:8.57.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.2.0"
+    "@eslint-community/regexpp": "npm:^4.6.1"
+    "@eslint/eslintrc": "npm:^2.1.4"
+    "@eslint/js": "npm:8.57.0"
+    "@humanwhocodes/config-array": "npm:^0.11.14"
+    "@humanwhocodes/module-importer": "npm:^1.0.1"
+    "@nodelib/fs.walk": "npm:^1.2.8"
+    "@ungap/structured-clone": "npm:^1.2.0"
+    ajv: "npm:^6.12.4"
+    chalk: "npm:^4.0.0"
+    cross-spawn: "npm:^7.0.2"
+    debug: "npm:^4.3.2"
+    doctrine: "npm:^3.0.0"
+    escape-string-regexp: "npm:^4.0.0"
+    eslint-scope: "npm:^7.2.2"
+    eslint-visitor-keys: "npm:^3.4.3"
+    espree: "npm:^9.6.1"
+    esquery: "npm:^1.4.2"
+    esutils: "npm:^2.0.2"
+    fast-deep-equal: "npm:^3.1.3"
+    file-entry-cache: "npm:^6.0.1"
+    find-up: "npm:^5.0.0"
+    glob-parent: "npm:^6.0.2"
+    globals: "npm:^13.19.0"
+    graphemer: "npm:^1.4.0"
+    ignore: "npm:^5.2.0"
+    imurmurhash: "npm:^0.1.4"
+    is-glob: "npm:^4.0.0"
+    is-path-inside: "npm:^3.0.3"
+    js-yaml: "npm:^4.1.0"
+    json-stable-stringify-without-jsonify: "npm:^1.0.1"
+    levn: "npm:^0.4.1"
+    lodash.merge: "npm:^4.6.2"
+    minimatch: "npm:^3.1.2"
+    natural-compare: "npm:^1.4.0"
+    optionator: "npm:^0.9.3"
+    strip-ansi: "npm:^6.0.1"
+    text-table: "npm:^0.2.0"
+  bin:
+    eslint: bin/eslint.js
+  checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529
+  languageName: node
+  linkType: hard
+
+"esniff@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "esniff@npm:2.0.1"
+  dependencies:
+    d: "npm:^1.0.1"
+    es5-ext: "npm:^0.10.62"
+    event-emitter: "npm:^0.3.5"
+    type: "npm:^2.7.2"
+  checksum: 10c0/7efd8d44ac20e5db8cb0ca77eb65eca60628b2d0f3a1030bcb05e71cc40e6e2935c47b87dba3c733db12925aa5b897f8e0e7a567a2c274206f184da676ea2e65
+  languageName: node
+  linkType: hard
+
+"espree@npm:^7.3.0, espree@npm:^7.3.1":
+  version: 7.3.1
+  resolution: "espree@npm:7.3.1"
+  dependencies:
+    acorn: "npm:^7.4.0"
+    acorn-jsx: "npm:^5.3.1"
+    eslint-visitor-keys: "npm:^1.3.0"
+  checksum: 10c0/f4e81b903f03eaf0e6925cea20571632da427deb6e14ca37e481f72c11f36d7bb4945fe8a2ff15ab22d078d3cd93ee65355fa94de9c27485c356481775f25d85
+  languageName: node
+  linkType: hard
+
+"espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
+  dependencies:
+    acorn: "npm:^8.9.0"
+    acorn-jsx: "npm:^5.3.2"
+    eslint-visitor-keys: "npm:^3.4.1"
+  checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460
+  languageName: node
+  linkType: hard
+
+"esprima@npm:1.2.2":
+  version: 1.2.2
+  resolution: "esprima@npm:1.2.2"
+  bin:
+    esparse: ./bin/esparse.js
+    esvalidate: ./bin/esvalidate.js
+  checksum: 10c0/a5a8fd359651dd8228736d7352eb7636c7765e1ec6ff8fff3f6641622039a9f51fa501969a1a4777ba4187cf9942a8d7e0367dccaff768b782bdb1a71d046abf
+  languageName: node
+  linkType: hard
+
+"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "esprima@npm:4.0.1"
+  bin:
+    esparse: ./bin/esparse.js
+    esvalidate: ./bin/esvalidate.js
+  checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3
+  languageName: node
+  linkType: hard
+
+"esquery@npm:^1.4.0, esquery@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "esquery@npm:1.5.0"
+  dependencies:
+    estraverse: "npm:^5.1.0"
+  checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213
+  languageName: node
+  linkType: hard
+
+"esrecurse@npm:^4.1.0, esrecurse@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "esrecurse@npm:4.3.0"
+  dependencies:
+    estraverse: "npm:^5.2.0"
+  checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5
+  languageName: node
+  linkType: hard
+
+"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0":
+  version: 4.3.0
+  resolution: "estraverse@npm:4.3.0"
+  checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d
+  languageName: node
+  linkType: hard
+
+"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "estraverse@npm:5.3.0"
+  checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "estree-walker@npm:0.6.1"
+  checksum: 10c0/6dabc855faa04a1ffb17b6a9121b6008ba75ab5a163ad9dc3d7fca05cfda374c5f5e91418d783496620ca75e99a73c40874d8b75f23b4117508cc8bde78e7b41
+  languageName: node
+  linkType: hard
+
+"estree-walker@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "estree-walker@npm:1.0.1"
+  checksum: 10c0/fa9e5f8c1bbe8d01e314c0f03067b64a4f22d4c58410fc5237060d0c15b81e58c23921c41acc60abbdab490f1fdfcbd6408ede2d03ca704454272e0244d61a55
+  languageName: node
+  linkType: hard
+
+"esutils@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "esutils@npm:2.0.3"
+  checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7
+  languageName: node
+  linkType: hard
+
+"etag@npm:~1.8.1":
+  version: 1.8.1
+  resolution: "etag@npm:1.8.1"
+  checksum: 10c0/12be11ef62fb9817314d790089a0a49fae4e1b50594135dcb8076312b7d7e470884b5100d249b28c18581b7fd52f8b485689ffae22a11ed9ec17377a33a08f84
+  languageName: node
+  linkType: hard
+
+"event-emitter@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "event-emitter@npm:0.3.5"
+  dependencies:
+    d: "npm:1"
+    es5-ext: "npm:~0.10.14"
+  checksum: 10c0/75082fa8ffb3929766d0f0a063bfd6046bd2a80bea2666ebaa0cfd6f4a9116be6647c15667bea77222afc12f5b4071b68d393cf39fdaa0e8e81eda006160aff0
+  languageName: node
+  linkType: hard
+
+"eventemitter3@npm:^4.0.0":
+  version: 4.0.7
+  resolution: "eventemitter3@npm:4.0.7"
+  checksum: 10c0/5f6d97cbcbac47be798e6355e3a7639a84ee1f7d9b199a07017f1d2f1e2fe236004d14fa5dfaeba661f94ea57805385e326236a6debbc7145c8877fbc0297c6b
+  languageName: node
+  linkType: hard
+
+"events@npm:^3.0.0, events@npm:^3.2.0":
+  version: 3.3.0
+  resolution: "events@npm:3.3.0"
+  checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6
+  languageName: node
+  linkType: hard
+
+"eventsource@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "eventsource@npm:2.0.2"
+  checksum: 10c0/0b8c70b35e45dd20f22ff64b001be9d530e33b92ca8bdbac9e004d0be00d957ab02ef33c917315f59bf2f20b178c56af85c52029bc8e6cc2d61c31d87d943573
+  languageName: node
+  linkType: hard
+
+"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "evp_bytestokey@npm:1.0.3"
+  dependencies:
+    md5.js: "npm:^1.3.4"
+    node-gyp: "npm:latest"
+    safe-buffer: "npm:^5.1.1"
+  checksum: 10c0/77fbe2d94a902a80e9b8f5a73dcd695d9c14899c5e82967a61b1fc6cbbb28c46552d9b127cff47c45fcf684748bdbcfa0a50410349109de87ceb4b199ef6ee99
+  languageName: node
+  linkType: hard
+
+"exec-sh@npm:^0.3.2":
+  version: 0.3.6
+  resolution: "exec-sh@npm:0.3.6"
+  checksum: 10c0/de29ed40c263989ea151cfc8561c9a41a443185d1998b0ff7aee248323af3b46db3a1dc5341816297d0c02dca472b188640490aa4ba3cae017f531f98102607d
+  languageName: node
+  linkType: hard
+
+"execa@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "execa@npm:1.0.0"
+  dependencies:
+    cross-spawn: "npm:^6.0.0"
+    get-stream: "npm:^4.0.0"
+    is-stream: "npm:^1.1.0"
+    npm-run-path: "npm:^2.0.0"
+    p-finally: "npm:^1.0.0"
+    signal-exit: "npm:^3.0.0"
+    strip-eof: "npm:^1.0.0"
+  checksum: 10c0/cc71707c9aa4a2552346893ee63198bf70a04b5a1bc4f8a0ef40f1d03c319eae80932c59191f037990d7d102193e83a38ec72115fff814ec2fb3099f3661a590
+  languageName: node
+  linkType: hard
+
+"execa@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "execa@npm:4.1.0"
+  dependencies:
+    cross-spawn: "npm:^7.0.0"
+    get-stream: "npm:^5.0.0"
+    human-signals: "npm:^1.1.1"
+    is-stream: "npm:^2.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^4.0.0"
+    onetime: "npm:^5.1.0"
+    signal-exit: "npm:^3.0.2"
+    strip-final-newline: "npm:^2.0.0"
+  checksum: 10c0/02211601bb1c52710260edcc68fb84c3c030dc68bafc697c90ada3c52cc31375337de8c24826015b8382a58d63569ffd203b79c94fef217d65503e3e8d2c52ba
+  languageName: node
+  linkType: hard
+
+"execa@npm:^5.0.0":
+  version: 5.1.1
+  resolution: "execa@npm:5.1.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.3"
+    get-stream: "npm:^6.0.0"
+    human-signals: "npm:^2.1.0"
+    is-stream: "npm:^2.0.0"
+    merge-stream: "npm:^2.0.0"
+    npm-run-path: "npm:^4.0.1"
+    onetime: "npm:^5.1.2"
+    signal-exit: "npm:^3.0.3"
+    strip-final-newline: "npm:^2.0.0"
+  checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f
+  languageName: node
+  linkType: hard
+
+"exit@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "exit@npm:0.1.2"
+  checksum: 10c0/71d2ad9b36bc25bb8b104b17e830b40a08989be7f7d100b13269aaae7c3784c3e6e1e88a797e9e87523993a25ba27c8958959a554535370672cfb4d824af8989
+  languageName: node
+  linkType: hard
+
+"expand-brackets@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "expand-brackets@npm:2.1.4"
+  dependencies:
+    debug: "npm:^2.3.3"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    posix-character-classes: "npm:^0.1.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10c0/3e2fb95d2d7d7231486493fd65db913927b656b6fcdfcce41e139c0991a72204af619ad4acb1be75ed994ca49edb7995ef241dbf8cf44dc3c03d211328428a87
+  languageName: node
+  linkType: hard
+
+"expect@npm:^26.6.0, expect@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "expect@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    ansi-styles: "npm:^4.0.0"
+    jest-get-type: "npm:^26.3.0"
+    jest-matcher-utils: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-regex-util: "npm:^26.0.0"
+  checksum: 10c0/e84ab6c96e99eaf92586e5c554317413352082b66be952ba338bf690e15106c0b6350ac99d0d66237d675cc75963811255120d47172a8e764b1d6a9ae2b6b1b4
+  languageName: node
+  linkType: hard
+
+"expect@npm:^29.0.0, expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "expect@npm:29.7.0"
+  dependencies:
+    "@jest/expect-utils": "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10c0/2eddeace66e68b8d8ee5f7be57f3014b19770caaf6815c7a08d131821da527fb8c8cb7b3dcd7c883d2d3d8d184206a4268984618032d1e4b16dc8d6596475d41
+  languageName: node
+  linkType: hard
+
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579
+  languageName: node
+  linkType: hard
+
+"express@npm:^4.17.1":
+  version: 4.19.2
+  resolution: "express@npm:4.19.2"
+  dependencies:
+    accepts: "npm:~1.3.8"
+    array-flatten: "npm:1.1.1"
+    body-parser: "npm:1.20.2"
+    content-disposition: "npm:0.5.4"
+    content-type: "npm:~1.0.4"
+    cookie: "npm:0.6.0"
+    cookie-signature: "npm:1.0.6"
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    finalhandler: "npm:1.2.0"
+    fresh: "npm:0.5.2"
+    http-errors: "npm:2.0.0"
+    merge-descriptors: "npm:1.0.1"
+    methods: "npm:~1.1.2"
+    on-finished: "npm:2.4.1"
+    parseurl: "npm:~1.3.3"
+    path-to-regexp: "npm:0.1.7"
+    proxy-addr: "npm:~2.0.7"
+    qs: "npm:6.11.0"
+    range-parser: "npm:~1.2.1"
+    safe-buffer: "npm:5.2.1"
+    send: "npm:0.18.0"
+    serve-static: "npm:1.15.0"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:2.0.1"
+    type-is: "npm:~1.6.18"
+    utils-merge: "npm:1.0.1"
+    vary: "npm:~1.1.2"
+  checksum: 10c0/e82e2662ea9971c1407aea9fc3c16d6b963e55e3830cd0ef5e00b533feda8b770af4e3be630488ef8a752d7c75c4fcefb15892868eeaafe7353cb9e3e269fdcb
+  languageName: node
+  linkType: hard
+
+"ext@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "ext@npm:1.7.0"
+  dependencies:
+    type: "npm:^2.7.2"
+  checksum: 10c0/a8e5f34e12214e9eee3a4af3b5c9d05ba048f28996450975b369fc86e5d0ef13b6df0615f892f5396a9c65d616213c25ec5b0ad17ef42eac4a500512a19da6c7
+  languageName: node
+  linkType: hard
+
+"extend-shallow@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "extend-shallow@npm:2.0.1"
+  dependencies:
+    is-extendable: "npm:^0.1.0"
+  checksum: 10c0/ee1cb0a18c9faddb42d791b2d64867bd6cfd0f3affb711782eb6e894dd193e2934a7f529426aac7c8ddb31ac5d38000a00aa2caf08aa3dfc3e1c8ff6ba340bd9
+  languageName: node
+  linkType: hard
+
+"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "extend-shallow@npm:3.0.2"
+  dependencies:
+    assign-symbols: "npm:^1.0.0"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10c0/f39581b8f98e3ad94995e33214fff725b0297cf09f2725b6f624551cfb71e0764accfd0af80becc0182af5014d2a57b31b85ec999f9eb8a6c45af81752feac9a
+  languageName: node
+  linkType: hard
+
+"extglob@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "extglob@npm:2.0.4"
+  dependencies:
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^1.0.0"
+    expand-brackets: "npm:^2.1.4"
+    extend-shallow: "npm:^2.0.1"
+    fragment-cache: "npm:^0.2.1"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10c0/e1a891342e2010d046143016c6c03d58455c2c96c30bf5570ea07929984ee7d48fad86b363aee08f7a8a638f5c3a66906429b21ecb19bc8e90df56a001cd282c
+  languageName: node
+  linkType: hard
+
+"fantasticon@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "fantasticon@npm:1.2.3"
+  dependencies:
+    change-case: "npm:^4.1.2"
+    cli-color: "npm:^2.0.0"
+    commander: "npm:^7.2.0"
+    glob: "npm:^7.2.0"
+    handlebars: "npm:^4.7.7"
+    slugify: "npm:^1.6.0"
+    svg2ttf: "npm:^6.0.3"
+    svgicons2svgfont: "npm:^10.0.3"
+    ttf2eot: "npm:^2.0.0"
+    ttf2woff: "npm:^3.0.0"
+    ttf2woff2: "npm:^4.0.4"
+  bin:
+    fantasticon: bin/fantasticon
+  checksum: 10c0/e2a328258574f033daa0af0523d467fa2709e482316c00e47010b06e5108274b09a1d0d76324f6ab879c7365108ba72eb768aadb45da6e28afecd506cb507c3a
+  languageName: node
+  linkType: hard
+
+"fast-content-type-parse@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "fast-content-type-parse@npm:1.1.0"
+  checksum: 10c0/882bf990fa5d64be1825ce183818db43900ece0d7ef184cb9409bae8ed1001acbe536a657b1496382cb3e308e71ab39cc399bbdae70cba1745eecaeca4e55384
+  languageName: node
+  linkType: hard
+
+"fast-decode-uri-component@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "fast-decode-uri-component@npm:1.0.1"
+  checksum: 10c0/039d50c2e99d64f999c3f2126c23fbf75a04a4117e218a149ca0b1d2aeb8c834b7b19d643b9d35d4eabce357189a6a94085f78cf48869e6e26cc59b036284bc3
+  languageName: node
+  linkType: hard
+
+"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
+  version: 3.1.3
+  resolution: "fast-deep-equal@npm:3.1.3"
+  checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.9":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.4"
+  checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845
+  languageName: node
+  linkType: hard
+
+"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "fast-json-stable-stringify@npm:2.1.0"
+  checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b
+  languageName: node
+  linkType: hard
+
+"fast-json-stringify@npm:^2.5.2":
   version: 2.7.13
   resolution: "fast-json-stringify@npm:2.7.13"
   dependencies:
-    ajv: "npm:^6.11.0"
-    deepmerge: "npm:^4.2.2"
-    rfdc: "npm:^1.2.0"
-    string-similarity: "npm:^4.0.1"
-  checksum: 10c0/9c63e9e575bd75153afe456bd5c1d8afbfade79c79578f89fc0b8d599cdd65f3e731c826241caf472e11a915e6351a4c4c3f8295096be3fb01a79d2dbbbb22ed
+    ajv: "npm:^6.11.0"
+    deepmerge: "npm:^4.2.2"
+    rfdc: "npm:^1.2.0"
+    string-similarity: "npm:^4.0.1"
+  checksum: 10c0/9c63e9e575bd75153afe456bd5c1d8afbfade79c79578f89fc0b8d599cdd65f3e731c826241caf472e11a915e6351a4c4c3f8295096be3fb01a79d2dbbbb22ed
+  languageName: node
+  linkType: hard
+
+"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6":
+  version: 2.0.6
+  resolution: "fast-levenshtein@npm:2.0.6"
+  checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
+  languageName: node
+  linkType: hard
+
+"fast-redact@npm:^3.0.0":
+  version: 3.5.0
+  resolution: "fast-redact@npm:3.5.0"
+  checksum: 10c0/7e2ce4aad6e7535e0775bf12bd3e4f2e53d8051d8b630e0fa9e67f68cb0b0e6070d2f7a94b1d0522ef07e32f7c7cda5755e2b677a6538f1e9070ca053c42343a
+  languageName: node
+  linkType: hard
+
+"fast-safe-stringify@npm:^2.0.8":
+  version: 2.1.1
+  resolution: "fast-safe-stringify@npm:2.1.1"
+  checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+  languageName: node
+  linkType: hard
+
+"fastest-levenshtein@npm:^1.0.12":
+  version: 1.0.16
+  resolution: "fastest-levenshtein@npm:1.0.16"
+  checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
+  languageName: node
+  linkType: hard
+
+"fastify-plugin@npm:^4.0.0":
+  version: 4.5.1
+  resolution: "fastify-plugin@npm:4.5.1"
+  checksum: 10c0/f58f79cd9d3c88fd7f79a3270276c6339fc57bbe72ef14d20b73779193c404e317ac18e8eae2c5071b3909ebee45d7eb6871da4e65464ac64ed0d9746b4e9b9f
+  languageName: node
+  linkType: hard
+
+"fastify@npm:^3.29.5":
+  version: 3.29.5
+  resolution: "fastify@npm:3.29.5"
+  dependencies:
+    "@fastify/ajv-compiler": "npm:^1.0.0"
+    "@fastify/error": "npm:^2.0.0"
+    abstract-logging: "npm:^2.0.0"
+    avvio: "npm:^7.1.2"
+    fast-content-type-parse: "npm:^1.0.0"
+    fast-json-stringify: "npm:^2.5.2"
+    find-my-way: "npm:^4.5.0"
+    flatstr: "npm:^1.0.12"
+    light-my-request: "npm:^4.2.0"
+    pino: "npm:^6.13.0"
+    process-warning: "npm:^1.0.0"
+    proxy-addr: "npm:^2.0.7"
+    rfdc: "npm:^1.1.4"
+    secure-json-parse: "npm:^2.0.0"
+    semver: "npm:^7.3.2"
+    tiny-lru: "npm:^8.0.1"
+  checksum: 10c0/83a4850c38b1ac8934eff07030f2d0b5ed37b190cbaf05d22b3ca93f00e4735dfe62e48f183bcc5af76b6697512a32e692e6e1765cf51c69819216629f125b3b
+  languageName: node
+  linkType: hard
+
+"fastq@npm:^1.6.0, fastq@npm:^1.6.1":
+  version: 1.17.1
+  resolution: "fastq@npm:1.17.1"
+  dependencies:
+    reusify: "npm:^1.0.4"
+  checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34
+  languageName: node
+  linkType: hard
+
+"faye-websocket@npm:^0.11.3, faye-websocket@npm:^0.11.4":
+  version: 0.11.4
+  resolution: "faye-websocket@npm:0.11.4"
+  dependencies:
+    websocket-driver: "npm:>=0.5.1"
+  checksum: 10c0/c6052a0bb322778ce9f89af92890f6f4ce00d5ec92418a35e5f4c6864a4fe736fec0bcebd47eac7c0f0e979b01530746b1c85c83cb04bae789271abf19737420
+  languageName: node
+  linkType: hard
+
+"fb-watchman@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "fb-watchman@npm:2.0.2"
+  dependencies:
+    bser: "npm:2.1.1"
+  checksum: 10c0/feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
+  languageName: node
+  linkType: hard
+
+"figgy-pudding@npm:^3.5.1":
+  version: 3.5.2
+  resolution: "figgy-pudding@npm:3.5.2"
+  checksum: 10c0/b21c7adaeb8485ef3c50e056b5dc8c3a6461818343aba141e0d7927aad47a0cb9f1d207ffdf494c380cd60d7c848c46a5ce5cb06987d10e9226fcec419c8af90
+  languageName: node
+  linkType: hard
+
+"file-entry-cache@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "file-entry-cache@npm:6.0.1"
+  dependencies:
+    flat-cache: "npm:^3.0.4"
+  checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
+  languageName: node
+  linkType: hard
+
+"file-extension-icon-js@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "file-extension-icon-js@npm:1.1.6"
+  dependencies:
+    "@testing-library/jest-dom": "npm:^5.11.9"
+    "@testing-library/react": "npm:^11.2.5"
+    "@testing-library/user-event": "npm:^12.7.2"
+    react: "npm:^17.0.1"
+    react-dom: "npm:^17.0.1"
+    react-scripts: "npm:4.0.3"
+    web-vitals: "npm:^1.1.0"
+  checksum: 10c0/cffd9a3df28153ba69d76ef1aaf305530c6b909a612ef539b7728df7c9cd7fdd429295a72de6d874fdebfc15310eeaaf7357b2c889ef939513ff918d357d14e4
+  languageName: node
+  linkType: hard
+
+"file-loader@npm:6.1.1":
+  version: 6.1.1
+  resolution: "file-loader@npm:6.1.1"
+  dependencies:
+    loader-utils: "npm:^2.0.0"
+    schema-utils: "npm:^3.0.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/dfd3c4695d35fd2bf9e1d6f7113fb3e108ef188a58abc81a242133edffa6316334163570b9297a0bbaa6106c0d037a83205d2baf6cdf278df8e88817ae209e38
+  languageName: node
+  linkType: hard
+
+"file-loader@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "file-loader@npm:6.2.0"
+  dependencies:
+    loader-utils: "npm:^2.0.0"
+    schema-utils: "npm:^3.0.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
+  languageName: node
+  linkType: hard
+
+"file-uri-to-path@npm:1.0.0":
+  version: 1.0.0
+  resolution: "file-uri-to-path@npm:1.0.0"
+  checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
+  languageName: node
+  linkType: hard
+
+"filesize@npm:6.1.0":
+  version: 6.1.0
+  resolution: "filesize@npm:6.1.0"
+  checksum: 10c0/bb9c90268aa4b6eace09fbabcb1b7337bca636fd1a1281801c375497d327ad1d3b7b30d5d52285eb9f96907a788919d54b4020915ec7ae87aa0203676b83900a
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "fill-range@npm:4.0.0"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+    to-regex-range: "npm:^2.1.0"
+  checksum: 10c0/ccd57b7c43d7e28a1f8a60adfa3c401629c08e2f121565eece95e2386ebc64dedc7128d8c3448342aabf19db0c55a34f425f148400c7a7be9a606ba48749e089
+  languageName: node
+  linkType: hard
+
+"fill-range@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "fill-range@npm:7.0.1"
+  dependencies:
+    to-regex-range: "npm:^5.0.1"
+  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+  languageName: node
+  linkType: hard
+
+"finalhandler@npm:1.2.0":
+  version: 1.2.0
+  resolution: "finalhandler@npm:1.2.0"
+  dependencies:
+    debug: "npm:2.6.9"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    on-finished: "npm:2.4.1"
+    parseurl: "npm:~1.3.3"
+    statuses: "npm:2.0.1"
+    unpipe: "npm:~1.0.0"
+  checksum: 10c0/64b7e5ff2ad1fcb14931cd012651631b721ce657da24aedb5650ddde9378bf8e95daa451da43398123f5de161a81e79ff5affe4f9f2a6d2df4a813d6d3e254b7
+  languageName: node
+  linkType: hard
+
+"find-cache-dir@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "find-cache-dir@npm:2.1.0"
+  dependencies:
+    commondir: "npm:^1.0.1"
+    make-dir: "npm:^2.0.0"
+    pkg-dir: "npm:^3.0.0"
+  checksum: 10c0/556117fd0af14eb88fb69250f4bba9e905e7c355c6136dff0e161b9cbd1f5285f761b778565a278da73a130f42eccc723d7ad4c002ae547ed1d698d39779dabb
+  languageName: node
+  linkType: hard
+
+"find-cache-dir@npm:^3.3.1":
+  version: 3.3.2
+  resolution: "find-cache-dir@npm:3.3.2"
+  dependencies:
+    commondir: "npm:^1.0.1"
+    make-dir: "npm:^3.0.2"
+    pkg-dir: "npm:^4.1.0"
+  checksum: 10c0/92747cda42bff47a0266b06014610981cfbb71f55d60f2c8216bc3108c83d9745507fb0b14ecf6ab71112bed29cd6fb1a137ee7436179ea36e11287e3159e587
+  languageName: node
+  linkType: hard
+
+"find-my-way@npm:^4.5.0":
+  version: 4.5.1
+  resolution: "find-my-way@npm:4.5.1"
+  dependencies:
+    fast-decode-uri-component: "npm:^1.0.1"
+    fast-deep-equal: "npm:^3.1.3"
+    safe-regex2: "npm:^2.0.0"
+    semver-store: "npm:^0.3.0"
+  checksum: 10c0/3e56f50befde96d4b0a0a8118bd7fe283184e54ed61ac359ce62e7229229ab8b4a5aebe02edfcc126f0b6eef38660b59347293d61752bc845aae823cace8042a
+  languageName: node
+  linkType: hard
+
+"find-up@npm:4.1.0, find-up@npm:^4.0.0, find-up@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "find-up@npm:4.1.0"
+  dependencies:
+    locate-path: "npm:^5.0.0"
+    path-exists: "npm:^4.0.0"
+  checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "find-up@npm:3.0.0"
+  dependencies:
+    locate-path: "npm:^3.0.0"
+  checksum: 10c0/2c2e7d0a26db858e2f624f39038c74739e38306dee42b45f404f770db357947be9d0d587f1cac72d20c114deb38aa57316e879eb0a78b17b46da7dab0a3bd6e3
+  languageName: node
+  linkType: hard
+
+"find-up@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "find-up@npm:5.0.0"
+  dependencies:
+    locate-path: "npm:^6.0.0"
+    path-exists: "npm:^4.0.0"
+  checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
+  languageName: node
+  linkType: hard
+
+"flat-cache@npm:^3.0.4":
+  version: 3.2.0
+  resolution: "flat-cache@npm:3.2.0"
+  dependencies:
+    flatted: "npm:^3.2.9"
+    keyv: "npm:^4.5.3"
+    rimraf: "npm:^3.0.2"
+  checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
+  languageName: node
+  linkType: hard
+
+"flat@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "flat@npm:5.0.2"
+  bin:
+    flat: cli.js
+  checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
+  languageName: node
+  linkType: hard
+
+"flatstr@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "flatstr@npm:1.0.12"
+  checksum: 10c0/f99cf801fd3606e8b4aa96b93ec09caab42bc304526ff55a80db03db0ef73c9a014e983a6d72009c4f1bc50e2483d137041fae18a325dc0d851d045c4d6929a9
+  languageName: node
+  linkType: hard
+
+"flatted@npm:^3.2.9":
+  version: 3.3.1
+  resolution: "flatted@npm:3.3.1"
+  checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf
+  languageName: node
+  linkType: hard
+
+"flatten@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "flatten@npm:1.0.3"
+  checksum: 10c0/9f9b1f3dcd05be057bb83ec27f2513da5306e7bfc0cf8bd839ab423eb1b0f99683a25c97b48fafd5959819159659ce9f1397623a46f89a8577ba095fcf5fb753
+  languageName: node
+  linkType: hard
+
+"flush-write-stream@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "flush-write-stream@npm:1.1.1"
+  dependencies:
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^2.3.6"
+  checksum: 10c0/2cd4f65b728d5f388197a03dafabc6a5e4f0c2ed1a2d912e288f7aa1c2996dd90875e55b50cf32c78dca55ad2e2dfae5d3db09b223838388033d87cf5920dd87
+  languageName: node
+  linkType: hard
+
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071
+  languageName: node
+  linkType: hard
+
+"for-each@npm:^0.3.3":
+  version: 0.3.3
+  resolution: "for-each@npm:0.3.3"
+  dependencies:
+    is-callable: "npm:^1.1.3"
+  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+  languageName: node
+  linkType: hard
+
+"for-in@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "for-in@npm:1.0.2"
+  checksum: 10c0/42bb609d564b1dc340e1996868b67961257fd03a48d7fdafd4f5119530b87f962be6b4d5b7e3a3fc84c9854d149494b1d358e0b0ce9837e64c4c6603a49451d6
+  languageName: node
+  linkType: hard
+
+"foreground-child@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
+  dependencies:
+    cross-spawn: "npm:^7.0.0"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+  languageName: node
+  linkType: hard
+
+"fork-ts-checker-webpack-plugin@npm:4.1.6":
+  version: 4.1.6
+  resolution: "fork-ts-checker-webpack-plugin@npm:4.1.6"
+  dependencies:
+    "@babel/code-frame": "npm:^7.5.5"
+    chalk: "npm:^2.4.1"
+    micromatch: "npm:^3.1.10"
+    minimatch: "npm:^3.0.4"
+    semver: "npm:^5.6.0"
+    tapable: "npm:^1.0.0"
+    worker-rpc: "npm:^0.1.0"
+  checksum: 10c0/2dddbe0d3bf2b84f4a5daada41091003decf881cffdef3bab72a699d0bfe3003e2d312405b304894153b5cfd0d0180d47f547e256525cdeb20f95de3df14a223
+  languageName: node
+  linkType: hard
+
+"form-data@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "form-data@npm:3.0.1"
+  dependencies:
+    asynckit: "npm:^0.4.0"
+    combined-stream: "npm:^1.0.8"
+    mime-types: "npm:^2.1.12"
+  checksum: 10c0/1ccc3ae064a080a799923f754d49fcebdd90515a8924f0f54de557540b50e7f1fe48ba5f2bd0435a5664aa2d49729107e6aaf2155a9abf52339474c5638b4485
+  languageName: node
+  linkType: hard
+
+"form-data@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "form-data@npm:4.0.0"
+  dependencies:
+    asynckit: "npm:^0.4.0"
+    combined-stream: "npm:^1.0.8"
+    mime-types: "npm:^2.1.12"
+  checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
+  languageName: node
+  linkType: hard
+
+"forwarded@npm:0.2.0":
+  version: 0.2.0
+  resolution: "forwarded@npm:0.2.0"
+  checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
+  languageName: node
+  linkType: hard
+
+"fragment-cache@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "fragment-cache@npm:0.2.1"
+  dependencies:
+    map-cache: "npm:^0.2.2"
+  checksum: 10c0/5891d1c1d1d5e1a7fb3ccf28515c06731476fa88f7a50f4ede8a0d8d239a338448e7f7cc8b73db48da19c229fa30066104fe6489862065a4f1ed591c42fbeabf
+  languageName: node
+  linkType: hard
+
+"fresh@npm:0.5.2":
+  version: 0.5.2
+  resolution: "fresh@npm:0.5.2"
+  checksum: 10c0/c6d27f3ed86cc5b601404822f31c900dd165ba63fff8152a3ef714e2012e7535027063bc67ded4cb5b3a49fa596495d46cacd9f47d6328459cf570f08b7d9e5a
+  languageName: node
+  linkType: hard
+
+"from2@npm:^2.1.0":
+  version: 2.3.0
+  resolution: "from2@npm:2.3.0"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    readable-stream: "npm:^2.0.0"
+  checksum: 10c0/f87f7a2e4513244d551454a7f8324ef1f7837864a8701c536417286ec19ff4915606b1dfa8909a21b7591ebd8440ffde3642f7c303690b9a4d7c832d62248aa1
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "fs-extra@npm:7.0.1"
+  dependencies:
+    graceful-fs: "npm:^4.1.2"
+    jsonfile: "npm:^4.0.0"
+    universalify: "npm:^0.1.0"
+  checksum: 10c0/1943bb2150007e3739921b8d13d4109abdc3cc481e53b97b7ea7f77eda1c3c642e27ae49eac3af074e3496ea02fde30f411ef410c760c70a38b92e656e5da784
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "fs-extra@npm:8.1.0"
+  dependencies:
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^4.0.0"
+    universalify: "npm:^0.1.0"
+  checksum: 10c0/259f7b814d9e50d686899550c4f9ded85c46c643f7fe19be69504888e007fcbc08f306fae8ec495b8b998635e997c9e3e175ff2eeed230524ef1c1684cc96423
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^9.0.1":
+  version: 9.1.0
+  resolution: "fs-extra@npm:9.1.0"
+  dependencies:
+    at-least-node: "npm:^1.0.0"
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "fs-minipass@npm:2.1.0"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
+  languageName: node
+  linkType: hard
+
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
+  languageName: node
+  linkType: hard
+
+"fs-write-stream-atomic@npm:^1.0.8":
+  version: 1.0.10
+  resolution: "fs-write-stream-atomic@npm:1.0.10"
+  dependencies:
+    graceful-fs: "npm:^4.1.2"
+    iferr: "npm:^0.1.5"
+    imurmurhash: "npm:^0.1.4"
+    readable-stream: "npm:1 || 2"
+  checksum: 10c0/293b2b4ed346d35a28f8637a20cb2aef31be86503da501c42c2eda8fefed328bac16ce0e5daa7019f9329d73930c58031eaea2ce0c70f1680943fbfb7cff808b
+  languageName: node
+  linkType: hard
+
+"fs.realpath@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "fs.realpath@npm:1.0.0"
+  checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
+  languageName: node
+  linkType: hard
+
+"fsevents@npm:^1.2.7":
+  version: 1.2.13
+  resolution: "fsevents@npm:1.2.13"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    nan: "npm:^2.12.1"
+  checksum: 10c0/4427ff08db9ee7327f2c3ad58ec56f9096a917eed861bfffaa2e2be419479cdf37d00750869ab9ecbf5f59f32ad999bd59577d73fc639193e6c0ce52bb253e02
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@npm:^2.1.2, fsevents@npm:^2.1.3, fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
+  dependencies:
+    node-gyp: "npm:latest"
+  checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin<compat/fsevents>":
+  version: 1.2.13
+  resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin<compat/fsevents>::version=1.2.13&hash=d11327"
+  dependencies:
+    bindings: "npm:^1.5.0"
+    nan: "npm:^2.12.1"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"fsevents@patch:fsevents@npm%3A^2.1.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A^2.1.3#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
+  dependencies:
+    node-gyp: "npm:latest"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
+"function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
+  languageName: node
+  linkType: hard
+
+"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "function.prototype.name@npm:1.1.6"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    define-properties: "npm:^1.2.0"
+    es-abstract: "npm:^1.22.1"
+    functions-have-names: "npm:^1.2.3"
+  checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
+  languageName: node
+  linkType: hard
+
+"functional-red-black-tree@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "functional-red-black-tree@npm:1.0.1"
+  checksum: 10c0/5959eed0375803d9924f47688479bb017e0c6816a0e5ac151e22ba6bfe1d12c41de2f339188885e0aa8eeea2072dad509d8e4448467e816bde0a2ca86a0670d3
+  languageName: node
+  linkType: hard
+
+"functions-have-names@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "functions-have-names@npm:1.2.3"
+  checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
+  languageName: node
+  linkType: hard
+
+"gauge@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "gauge@npm:4.0.4"
+  dependencies:
+    aproba: "npm:^1.0.3 || ^2.0.0"
+    color-support: "npm:^1.1.3"
+    console-control-strings: "npm:^1.1.0"
+    has-unicode: "npm:^2.0.1"
+    signal-exit: "npm:^3.0.7"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+    wide-align: "npm:^1.1.5"
+  checksum: 10c0/ef10d7981113d69225135f994c9f8c4369d945e64a8fc721d655a3a38421b738c9fe899951721d1b47b73c41fdb5404ac87cc8903b2ecbed95d2800363e7e58c
+  languageName: node
+  linkType: hard
+
+"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2":
+  version: 1.0.0-beta.2
+  resolution: "gensync@npm:1.0.0-beta.2"
+  checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
+  languageName: node
+  linkType: hard
+
+"geometry-interfaces@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "geometry-interfaces@npm:1.1.4"
+  checksum: 10c0/08825b2296cce77ac9f7de01de4e2d3fc4db8ee13b48fd6e52c637ee2f4aba43b0026e16156cf07b6769ca3ec71e0aa4b1c482d8392e5422ad2cc9cd794e14d7
+  languageName: node
+  linkType: hard
+
+"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "get-caller-file@npm:2.0.5"
+  checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
+  languageName: node
+  linkType: hard
+
+"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    function-bind: "npm:^1.1.2"
+    has-proto: "npm:^1.0.1"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7
+  languageName: node
+  linkType: hard
+
+"get-own-enumerable-property-symbols@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "get-own-enumerable-property-symbols@npm:3.0.2"
+  checksum: 10c0/103999855f3d1718c631472437161d76962cbddcd95cc642a34c07bfb661ed41b6c09a9c669ccdff89ee965beb7126b80eec7b2101e20e31e9cc6c4725305e10
+  languageName: node
+  linkType: hard
+
+"get-package-type@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "get-package-type@npm:0.1.0"
+  checksum: 10c0/e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "get-stream@npm:4.1.0"
+  dependencies:
+    pump: "npm:^3.0.0"
+  checksum: 10c0/294d876f667694a5ca23f0ca2156de67da950433b6fb53024833733975d32582896dbc7f257842d331809979efccf04d5e0b6b75ad4d45744c45f193fd497539
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^5.0.0":
+  version: 5.2.0
+  resolution: "get-stream@npm:5.2.0"
+  dependencies:
+    pump: "npm:^3.0.0"
+  checksum: 10c0/43797ffd815fbb26685bf188c8cfebecb8af87b3925091dd7b9a9c915993293d78e3c9e1bce125928ff92f2d0796f3889b92b5ec6d58d1041b574682132e0a80
+  languageName: node
+  linkType: hard
+
+"get-stream@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "get-stream@npm:6.0.1"
+  checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
+  languageName: node
+  linkType: hard
+
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
+  dependencies:
+    call-bind: "npm:^1.0.5"
+    es-errors: "npm:^1.3.0"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc
+  languageName: node
+  linkType: hard
+
+"get-tsconfig@npm:^4.7.0":
+  version: 4.7.3
+  resolution: "get-tsconfig@npm:4.7.3"
+  dependencies:
+    resolve-pkg-maps: "npm:^1.0.0"
+  checksum: 10c0/b15ca9d5d0887ebfccadc9fe88b6ff3827a5691ec90e7608a5e9c74bef959c14aba62f6bb88ac7f50322395731789a2cf654244f00e10f4f76349911b6846d6f
+  languageName: node
+  linkType: hard
+
+"get-value@npm:^2.0.3, get-value@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "get-value@npm:2.0.6"
+  checksum: 10c0/f069c132791b357c8fc4adfe9e2929b0a2c6e95f98ca7bc6fcbc27f8a302e552f86b4ae61ec56d9e9ac2544b93b6a39743d479866a37b43fcc104088ba74f0d9
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "glob-parent@npm:3.1.0"
+  dependencies:
+    is-glob: "npm:^3.1.0"
+    path-dirname: "npm:^1.0.0"
+  checksum: 10c0/bfa89ce5ae1dfea4c2ece7b61d2ea230d87fcbec7472915cfdb3f4caf688a91ecb0dc86ae39b1e17505adce7e64cae3b971d64dc66091f3a0131169fd631b00d
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
+  version: 5.1.2
+  resolution: "glob-parent@npm:5.1.2"
+  dependencies:
+    is-glob: "npm:^4.0.1"
+  checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
+  languageName: node
+  linkType: hard
+
+"glob-parent@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "glob-parent@npm:6.0.2"
+  dependencies:
+    is-glob: "npm:^4.0.3"
+  checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
+  languageName: node
+  linkType: hard
+
+"glob-to-regexp@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "glob-to-regexp@npm:0.4.1"
+  checksum: 10c0/0486925072d7a916f052842772b61c3e86247f0a80cc0deb9b5a3e8a1a9faad5b04fb6f58986a09f34d3e96cd2a22a24b7e9882fb1cf904c31e9a310de96c429
+  languageName: node
+  linkType: hard
+
+"glob@npm:^10.2.2, glob@npm:^10.3.10":
+  version: 10.3.12
+  resolution: "glob@npm:10.3.12"
+  dependencies:
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^2.3.6"
+    minimatch: "npm:^9.0.1"
+    minipass: "npm:^7.0.4"
+    path-scurry: "npm:^1.10.2"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10c0/f60cefdc1cf3f958b2bb5823e1b233727f04916d489dc4641d76914f016e6704421e06a83cbb68b0cb1cb9382298b7a88075b844ad2127fc9727ea22b18b0711
+  languageName: node
+  linkType: hard
+
+"glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^3.1.1"
+    once: "npm:^1.3.0"
+    path-is-absolute: "npm:^1.0.0"
+  checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
+  languageName: node
+  linkType: hard
+
+"glob@npm:^8.0.1":
+  version: 8.1.0
+  resolution: "glob@npm:8.1.0"
+  dependencies:
+    fs.realpath: "npm:^1.0.0"
+    inflight: "npm:^1.0.4"
+    inherits: "npm:2"
+    minimatch: "npm:^5.0.1"
+    once: "npm:^1.3.0"
+  checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f
+  languageName: node
+  linkType: hard
+
+"global-modules@npm:2.0.0":
+  version: 2.0.0
+  resolution: "global-modules@npm:2.0.0"
+  dependencies:
+    global-prefix: "npm:^3.0.0"
+  checksum: 10c0/43b770fe24aa6028f4b9770ea583a47f39750be15cf6e2578f851e4ccc9e4fa674b8541928c0b09c21461ca0763f0d36e4068cec86c914b07fd6e388e66ba5b9
+  languageName: node
+  linkType: hard
+
+"global-prefix@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "global-prefix@npm:3.0.0"
+  dependencies:
+    ini: "npm:^1.3.5"
+    kind-of: "npm:^6.0.2"
+    which: "npm:^1.3.1"
+  checksum: 10c0/510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269
+  languageName: node
+  linkType: hard
+
+"globals@npm:^11.1.0":
+  version: 11.12.0
+  resolution: "globals@npm:11.12.0"
+  checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
+  languageName: node
+  linkType: hard
+
+"globals@npm:^13.19.0, globals@npm:^13.6.0, globals@npm:^13.9.0":
+  version: 13.24.0
+  resolution: "globals@npm:13.24.0"
+  dependencies:
+    type-fest: "npm:^0.20.2"
+  checksum: 10c0/d3c11aeea898eb83d5ec7a99508600fbe8f83d2cf00cbb77f873dbf2bcb39428eff1b538e4915c993d8a3b3473fa71eeebfe22c9bb3a3003d1e26b1f2c8a42cd
+  languageName: node
+  linkType: hard
+
+"globalthis@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "globalthis@npm:1.0.3"
+  dependencies:
+    define-properties: "npm:^1.1.3"
+  checksum: 10c0/0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
+  languageName: node
+  linkType: hard
+
+"globby@npm:11.0.1":
+  version: 11.0.1
+  resolution: "globby@npm:11.0.1"
+  dependencies:
+    array-union: "npm:^2.1.0"
+    dir-glob: "npm:^3.0.1"
+    fast-glob: "npm:^3.1.1"
+    ignore: "npm:^5.1.4"
+    merge2: "npm:^1.3.0"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/b5966bb6e8fa88a02924a0ee71c619ad57b98660269ddecd5e939a42f4fc056e7958659bde539454e2deaeac79bbdeab01831783f05efd4b14305b5bfff44c09
+  languageName: node
+  linkType: hard
+
+"globby@npm:^11.0.3, globby@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "globby@npm:11.1.0"
+  dependencies:
+    array-union: "npm:^2.1.0"
+    dir-glob: "npm:^3.0.1"
+    fast-glob: "npm:^3.2.9"
+    ignore: "npm:^5.2.0"
+    merge2: "npm:^1.4.1"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
+  languageName: node
+  linkType: hard
+
+"globby@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "globby@npm:6.1.0"
+  dependencies:
+    array-union: "npm:^1.0.1"
+    glob: "npm:^7.0.3"
+    object-assign: "npm:^4.0.1"
+    pify: "npm:^2.0.0"
+    pinkie-promise: "npm:^2.0.0"
+  checksum: 10c0/656ad1f0d02c6ef378c07589519ed3ec27fe988ea177195c05b8aff280320f3d67b91fa0baa6f7e49288f9bf1f92fc84f783a79ac3ed66278f3fa082e627ed84
+  languageName: node
+  linkType: hard
+
+"gopd@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "gopd@npm:1.0.1"
+  dependencies:
+    get-intrinsic: "npm:^1.1.3"
+  checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
+  languageName: node
+  linkType: hard
+
+"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
+  languageName: node
+  linkType: hard
+
+"graphemer@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "graphemer@npm:1.4.0"
+  checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
+  languageName: node
+  linkType: hard
+
+"growly@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "growly@npm:1.3.0"
+  checksum: 10c0/3043bd5c064e87f89e8c9b66894ed09fd882c7fa645621a543b45b72f040c7241e25061207a858ab191be2fbdac34795ff57c2a40962b154a6b2908a5e509252
+  languageName: node
+  linkType: hard
+
+"gzip-size@npm:5.1.1":
+  version: 5.1.1
+  resolution: "gzip-size@npm:5.1.1"
+  dependencies:
+    duplexer: "npm:^0.1.1"
+    pify: "npm:^4.0.1"
+  checksum: 10c0/1c346d3ab83b85687a9aa644928250b31e0fc42cf16ca152225a09465f7465b220849b3854b39a457681fabb37ab318b2c0f73be8991ecedf2073e082d1f6dd9
+  languageName: node
+  linkType: hard
+
+"gzip-size@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "gzip-size@npm:6.0.0"
+  dependencies:
+    duplexer: "npm:^0.1.2"
+  checksum: 10c0/4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
+  languageName: node
+  linkType: hard
+
+"handle-thing@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "handle-thing@npm:2.0.1"
+  checksum: 10c0/7ae34ba286a3434f1993ebd1cc9c9e6b6d8ea672182db28b1afc0a7119229552fa7031e3e5f3cd32a76430ece4e94b7da6f12af2eb39d6239a7693e4bd63a998
+  languageName: node
+  linkType: hard
+
+"handlebars@npm:^4.7.7":
+  version: 4.7.8
+  resolution: "handlebars@npm:4.7.8"
+  dependencies:
+    minimist: "npm:^1.2.5"
+    neo-async: "npm:^2.6.2"
+    source-map: "npm:^0.6.1"
+    uglify-js: "npm:^3.1.4"
+    wordwrap: "npm:^1.0.0"
+  dependenciesMeta:
+    uglify-js:
+      optional: true
+  bin:
+    handlebars: bin/handlebars
+  checksum: 10c0/7aff423ea38a14bb379316f3857fe0df3c5d66119270944247f155ba1f08e07a92b340c58edaa00cfe985c21508870ee5183e0634dcb53dd405f35c93ef7f10d
+  languageName: node
+  linkType: hard
+
+"harmony-reflect@npm:^1.4.6":
+  version: 1.6.2
+  resolution: "harmony-reflect@npm:1.6.2"
+  checksum: 10c0/fa5b251fbeff0e2d925f0bfb5ffe39e0627639e998c453562d6a39e41789c15499649dc022178c807cf99bfb97e7b974bbbc031ba82078a26be7b098b9bc2b1a
+  languageName: node
+  linkType: hard
+
+"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-bigints@npm:1.0.2"
+  checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
+  languageName: node
+  linkType: hard
+
+"has-flag@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "has-flag@npm:3.0.0"
+  checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
+  languageName: node
+  linkType: hard
+
+"has-flag@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "has-flag@npm:4.0.0"
+  checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
+  languageName: node
+  linkType: hard
+
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
+  dependencies:
+    es-define-property: "npm:^1.0.0"
+  checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236
+  languageName: node
+  linkType: hard
+
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205
+  languageName: node
+  linkType: hard
+
+"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-symbols@npm:1.0.3"
+  checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
+  languageName: node
+  linkType: hard
+
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
+  dependencies:
+    has-symbols: "npm:^1.0.3"
+  checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c
+  languageName: node
+  linkType: hard
+
+"has-unicode@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "has-unicode@npm:2.0.1"
+  checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c
+  languageName: node
+  linkType: hard
+
+"has-value@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "has-value@npm:0.3.1"
+  dependencies:
+    get-value: "npm:^2.0.3"
+    has-values: "npm:^0.1.4"
+    isobject: "npm:^2.0.0"
+  checksum: 10c0/7a7c2e9d07bc9742c81806150adb154d149bc6155267248c459cd1ce2a64b0759980d26213260e4b7599c8a3754551179f155ded88d0533a0d2bc7bc29028432
+  languageName: node
+  linkType: hard
+
+"has-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-value@npm:1.0.0"
+  dependencies:
+    get-value: "npm:^2.0.6"
+    has-values: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+  checksum: 10c0/17cdccaf50f8aac80a109dba2e2ee5e800aec9a9d382ef9deab66c56b34269e4c9ac720276d5ffa722764304a1180ae436df077da0dd05548cfae0209708ba4d
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "has-values@npm:0.1.4"
+  checksum: 10c0/a8f00ad862c20289798c35243d5bd0b0a97dd44b668c2204afe082e0265f2d0bf3b89fc8cc0ef01a52b49f10aa35cf85c336ee3a5f1cac96ed490f5e901cdbf2
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-values@npm:1.0.0"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    kind-of: "npm:^4.0.0"
+  checksum: 10c0/a6f2a1cc6b2e43eacc68e62e71ad6890def7f4b13d2ef06b4ad3ee156c23e470e6df144b9b467701908e17633411f1075fdff0cab45fb66c5e0584d89b25f35e
+  languageName: node
+  linkType: hard
+
+"has@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "has@npm:1.0.4"
+  checksum: 10c0/82c1220573dc1f0a014a5d6189ae52a1f820f99dfdc00323c3a725b5002dcb7f04e44f460fea7af068474b2dd7c88cbe1846925c84017be9e31e1708936d305b
+  languageName: node
+  linkType: hard
+
+"hash-base@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "hash-base@npm:3.1.0"
+  dependencies:
+    inherits: "npm:^2.0.4"
+    readable-stream: "npm:^3.6.0"
+    safe-buffer: "npm:^5.2.0"
+  checksum: 10c0/663eabcf4173326fbb65a1918a509045590a26cc7e0964b754eef248d281305c6ec9f6b31cb508d02ffca383ab50028180ce5aefe013e942b44a903ac8dc80d0
+  languageName: node
+  linkType: hard
+
+"hash-base@npm:~3.0":
+  version: 3.0.4
+  resolution: "hash-base@npm:3.0.4"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.0.1"
+  checksum: 10c0/a13357dccb3827f0bb0b56bf928da85c428dc8670f6e4a1c7265e4f1653ce02d69030b40fd01b0f1d218a995a066eea279cded9cec72d207b593bcdfe309c2f0
+  languageName: node
+  linkType: hard
+
+"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
+  version: 1.1.7
+  resolution: "hash.js@npm:1.1.7"
+  dependencies:
+    inherits: "npm:^2.0.3"
+    minimalistic-assert: "npm:^1.0.1"
+  checksum: 10c0/41ada59494eac5332cfc1ce6b7ebdd7b88a3864a6d6b08a3ea8ef261332ed60f37f10877e0c825aaa4bddebf164fbffa618286aeeec5296675e2671cbfa746c4
+  languageName: node
+  linkType: hard
+
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
+  dependencies:
+    function-bind: "npm:^1.1.2"
+  checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9
+  languageName: node
+  linkType: hard
+
+"he@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "he@npm:1.2.0"
+  bin:
+    he: bin/he
+  checksum: 10c0/a27d478befe3c8192f006cdd0639a66798979dfa6e2125c6ac582a19a5ebfec62ad83e8382e6036170d873f46e4536a7e795bf8b95bf7c247f4cc0825ccc8c17
+  languageName: node
+  linkType: hard
+
+"header-case@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "header-case@npm:2.0.4"
+  dependencies:
+    capital-case: "npm:^1.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/c9f295d9d8e38fa50679281fd70d80726962256e888a76c8e72e526453da7a1832dcb427caa716c1ad5d79841d4537301b90156fa30298fefd3d68f4ea2181bb
+  languageName: node
+  linkType: hard
+
+"hex-color-regex@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "hex-color-regex@npm:1.1.0"
+  checksum: 10c0/43f0b8bbeb3906b6b2ddfb5ce6cbc28fb4f1e7b5129d0485e006ea20f92dc65f97b3b12591dd6a993de2ca10cb64a16a6a380a37481fc09432e7be0037be8f9c
+  languageName: node
+  linkType: hard
+
+"highlight.js@npm:^11.9.0":
+  version: 11.9.0
+  resolution: "highlight.js@npm:11.9.0"
+  checksum: 10c0/27cfa8717dc9d200aecbdb383eb122d5f45ce715d2f468583785d36fbfe5076ce033abb02486dc13b407171721cda6f474ed3f3a5a8e8c3d91367fa5f51ee374
+  languageName: node
+  linkType: hard
+
+"hmac-drbg@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "hmac-drbg@npm:1.0.1"
+  dependencies:
+    hash.js: "npm:^1.0.3"
+    minimalistic-assert: "npm:^1.0.0"
+    minimalistic-crypto-utils: "npm:^1.0.1"
+  checksum: 10c0/f3d9ba31b40257a573f162176ac5930109816036c59a09f901eb2ffd7e5e705c6832bedfff507957125f2086a0ab8f853c0df225642a88bf1fcaea945f20600d
+  languageName: node
+  linkType: hard
+
+"hoopy@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "hoopy@npm:0.1.4"
+  checksum: 10c0/4ef749e1a13d46cae52014b9de452635637086c333fc67245369a1262dee806386354a4ed845d507e59e5a0d3aef55246c0ec66f5bf2908d40eb77e7dff2a254
+  languageName: node
+  linkType: hard
+
+"hosted-git-info@npm:^2.1.4":
+  version: 2.8.9
+  resolution: "hosted-git-info@npm:2.8.9"
+  checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70
+  languageName: node
+  linkType: hard
+
+"hpack.js@npm:^2.1.6":
+  version: 2.1.6
+  resolution: "hpack.js@npm:2.1.6"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    obuf: "npm:^1.0.0"
+    readable-stream: "npm:^2.0.1"
+    wbuf: "npm:^1.1.0"
+  checksum: 10c0/55b9e824430bab82a19d079cb6e33042d7d0640325678c9917fcc020c61d8a08ca671b6c942c7f0aae9bb6e4b67ffb50734a72f9e21d66407c3138c1983b70f0
+  languageName: node
+  linkType: hard
+
+"hsl-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "hsl-regex@npm:1.0.0"
+  checksum: 10c0/ddc29f4943c4a1768e611fadaebf6913d039640267f1fad2ac06f4dbdbe5cbe535d77dd19804898834671dd82751a4401c1b4d2ecade25d158ea23665d263e84
+  languageName: node
+  linkType: hard
+
+"hsla-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "hsla-regex@npm:1.0.0"
+  checksum: 10c0/307874844a055af7a8f225e3908e1f7a2d96aa28e86abcb7ce1837cd86acf32d1f3c71ae105416d4c8623c8f9220b1bc799598851b0826274faa047710985f76
+  languageName: node
+  linkType: hard
+
+"html-encoding-sniffer@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "html-encoding-sniffer@npm:2.0.1"
+  dependencies:
+    whatwg-encoding: "npm:^1.0.5"
+  checksum: 10c0/6dc3aa2d35a8f0c8c7906ffb665dd24a88f7004f913fafdd3541d24a4da6182ab30c4a0a81387649a1234ecb90182c4136220ed12ae3dc1a57ed68e533dea416
+  languageName: node
+  linkType: hard
+
+"html-encoding-sniffer@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "html-encoding-sniffer@npm:3.0.0"
+  dependencies:
+    whatwg-encoding: "npm:^2.0.0"
+  checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
+  languageName: node
+  linkType: hard
+
+"html-entities@npm:^1.2.1, html-entities@npm:^1.3.1":
+  version: 1.4.0
+  resolution: "html-entities@npm:1.4.0"
+  checksum: 10c0/eb2de616fb5948e681157805687672ea90e67c8a4f21a3215888ab422a984cab61fec96860708dca3bde0ae52577515683c8e28157ac8637220bb6a57a031b85
+  languageName: node
+  linkType: hard
+
+"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "html-escaper@npm:2.0.2"
+  checksum: 10c0/208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
+  languageName: node
+  linkType: hard
+
+"html-minifier-terser@npm:^5.0.1":
+  version: 5.1.1
+  resolution: "html-minifier-terser@npm:5.1.1"
+  dependencies:
+    camel-case: "npm:^4.1.1"
+    clean-css: "npm:^4.2.3"
+    commander: "npm:^4.1.1"
+    he: "npm:^1.2.0"
+    param-case: "npm:^3.0.3"
+    relateurl: "npm:^0.2.7"
+    terser: "npm:^4.6.3"
+  bin:
+    html-minifier-terser: cli.js
+  checksum: 10c0/b38e678aa8065358c31ab58ada6efa1563e6e8d74c198ed1a1240b9d4ffcec077e2c5ce42b87f4fdefd7dd9041f82beb5cbd804c4f4179afc6f0f6e89b63f5f6
+  languageName: node
+  linkType: hard
+
+"html-webpack-plugin@npm:4.5.0":
+  version: 4.5.0
+  resolution: "html-webpack-plugin@npm:4.5.0"
+  dependencies:
+    "@types/html-minifier-terser": "npm:^5.0.0"
+    "@types/tapable": "npm:^1.0.5"
+    "@types/webpack": "npm:^4.41.8"
+    html-minifier-terser: "npm:^5.0.1"
+    loader-utils: "npm:^1.2.3"
+    lodash: "npm:^4.17.15"
+    pretty-error: "npm:^2.1.1"
+    tapable: "npm:^1.1.3"
+    util.promisify: "npm:1.0.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/2c9f5879120e7f6d235186aa9217ded316880c509c0ad6d550d70bacedf626136673d66828b8ebe1071bc382548b2b2e695467523868e1cd921d0affb114d936
+  languageName: node
+  linkType: hard
+
+"htmlparser2@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "htmlparser2@npm:6.1.0"
+  dependencies:
+    domelementtype: "npm:^2.0.1"
+    domhandler: "npm:^4.0.0"
+    domutils: "npm:^2.5.2"
+    entities: "npm:^2.0.0"
+  checksum: 10c0/3058499c95634f04dc66be8c2e0927cd86799413b2d6989d8ae542ca4dbf5fa948695d02c27d573acf44843af977aec6d9a7bdd0f6faa6b2d99e2a729b2a31b6
+  languageName: node
+  linkType: hard
+
+"http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+  languageName: node
+  linkType: hard
+
+"http-deceiver@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "http-deceiver@npm:1.2.7"
+  checksum: 10c0/8bb9b716f5fc55f54a451da7f49b9c695c3e45498a789634daec26b61e4add7c85613a4a9e53726c39d09de7a163891ecd6eb5809adb64500a840fd86fe81d03
+  languageName: node
+  linkType: hard
+
+"http-errors@npm:2.0.0":
+  version: 2.0.0
+  resolution: "http-errors@npm:2.0.0"
+  dependencies:
+    depd: "npm:2.0.0"
+    inherits: "npm:2.0.4"
+    setprototypeof: "npm:1.2.0"
+    statuses: "npm:2.0.1"
+    toidentifier: "npm:1.0.1"
+  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
+  languageName: node
+  linkType: hard
+
+"http-errors@npm:~1.6.2":
+  version: 1.6.3
+  resolution: "http-errors@npm:1.6.3"
+  dependencies:
+    depd: "npm:~1.1.2"
+    inherits: "npm:2.0.3"
+    setprototypeof: "npm:1.1.0"
+    statuses: "npm:>= 1.4.0 < 2"
+  checksum: 10c0/17ec4046ee974477778bfdd525936c254b872054703ec2caa4d6f099566b8adade636ae6aeeacb39302c5cd6e28fb407ebd937f500f5010d0b6850750414ff78
+  languageName: node
+  linkType: hard
+
+"http-parser-js@npm:>=0.5.1":
+  version: 0.5.8
+  resolution: "http-parser-js@npm:0.5.8"
+  checksum: 10c0/4ed89f812c44f84c4ae5d43dd3a0c47942b875b63be0ed2ccecbe6b0018af867d806495fc6e12474aff868721163699c49246585bddea4f0ecc6d2b02e19faf1
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "http-proxy-agent@npm:4.0.1"
+  dependencies:
+    "@tootallnate/once": "npm:1"
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10c0/4fa4774d65b5331814b74ac05cefea56854fc0d5989c80b13432c1b0d42a14c9f4342ca3ad9f0359a52e78da12b1744c9f8a28e50042136ea9171675d972a5fd
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "http-proxy-agent@npm:5.0.0"
+  dependencies:
+    "@tootallnate/once": "npm:2"
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
+  languageName: node
+  linkType: hard
+
+"http-proxy-agent@npm:^7.0.0":
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    debug: "npm:^4.3.4"
+  checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921
+  languageName: node
+  linkType: hard
+
+"http-proxy-middleware@npm:0.19.1":
+  version: 0.19.1
+  resolution: "http-proxy-middleware@npm:0.19.1"
+  dependencies:
+    http-proxy: "npm:^1.17.0"
+    is-glob: "npm:^4.0.0"
+    lodash: "npm:^4.17.11"
+    micromatch: "npm:^3.1.10"
+  checksum: 10c0/b0c466dd54fac365e93f43138cba256063040557ae24fc92944b06fac35e879b882085e36fe276e48f5a27848b1600cd3ae59a845cb18714f5c0f205523783b1
+  languageName: node
+  linkType: hard
+
+"http-proxy@npm:^1.17.0":
+  version: 1.18.1
+  resolution: "http-proxy@npm:1.18.1"
+  dependencies:
+    eventemitter3: "npm:^4.0.0"
+    follow-redirects: "npm:^1.0.0"
+    requires-port: "npm:^1.0.0"
+  checksum: 10c0/148dfa700a03fb421e383aaaf88ac1d94521dfc34072f6c59770528c65250983c2e4ec996f2f03aa9f3fe46cd1270a593126068319311e3e8d9e610a37533e94
+  languageName: node
+  linkType: hard
+
+"https-browserify@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "https-browserify@npm:1.0.0"
+  checksum: 10c0/e17b6943bc24ea9b9a7da5714645d808670af75a425f29baffc3284962626efdc1eb3aa9bbffaa6e64028a6ad98af5b09fabcb454a8f918fb686abfdc9e9b8ae
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "https-proxy-agent@npm:5.0.1"
+  dependencies:
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^7.0.1":
+  version: 7.0.4
+  resolution: "https-proxy-agent@npm:7.0.4"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:4"
+  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "human-signals@npm:1.1.1"
+  checksum: 10c0/18810ed239a7a5e23fb6c32d0fd4be75d7cd337a07ad59b8dbf0794cb0761e6e628349ee04c409e605fe55344716eab5d0a47a62ba2a2d0d367c89a2b4247b1e
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "human-signals@npm:2.1.0"
+  checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
+  languageName: node
+  linkType: hard
+
+"humanize-ms@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "humanize-ms@npm:1.2.1"
+  dependencies:
+    ms: "npm:^2.0.0"
+  checksum: 10c0/f34a2c20161d02303c2807badec2f3b49cbfbbb409abd4f95a07377ae01cfe6b59e3d15ac609cffcd8f2521f0eb37b7e1091acf65da99aa2a4f1ad63c21e7e7a
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:0.4.24":
+  version: 0.4.24
+  resolution: "iconv-lite@npm:0.4.24"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3"
+  checksum: 10c0/c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4
+  languageName: node
+  linkType: hard
+
+"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
+  version: 0.6.3
+  resolution: "iconv-lite@npm:0.6.3"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
+  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+  languageName: node
+  linkType: hard
+
+"icss-utils@npm:^4.0.0, icss-utils@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "icss-utils@npm:4.1.1"
+  dependencies:
+    postcss: "npm:^7.0.14"
+  checksum: 10c0/22803c243bb097c2290b4e7c20ed14746f3e00e04856f953b751c7e6bb8c81620764bcf98d200a92d167af0884d19143c089d02e2bc609abcdeb86f465328797
+  languageName: node
+  linkType: hard
+
+"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "icss-utils@npm:5.1.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
+  languageName: node
+  linkType: hard
+
+"identity-obj-proxy@npm:3.0.0":
+  version: 3.0.0
+  resolution: "identity-obj-proxy@npm:3.0.0"
+  dependencies:
+    harmony-reflect: "npm:^1.4.6"
+  checksum: 10c0/a3fc4de0042d7b45bf8652d5596c80b42139d8625c9cd6a8834e29e1b6dce8fccabd1228e08744b78677a19ceed7201a32fed8ca3dc3e4852e8fee24360a6cfc
+  languageName: node
+  linkType: hard
+
+"ieee754@npm:^1.1.4":
+  version: 1.2.1
+  resolution: "ieee754@npm:1.2.1"
+  checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
+  languageName: node
+  linkType: hard
+
+"iferr@npm:^0.1.5":
+  version: 0.1.5
+  resolution: "iferr@npm:0.1.5"
+  checksum: 10c0/e0669b1757d0501b43a158321945d1cc1fe56f28a972df2f88a5818f05c8853c7669ba5d6cfbbf9a1a312850699de6e528626df108d559005df7e15d16ee334c
+  languageName: node
+  linkType: hard
+
+"ignore@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "ignore@npm:4.0.6"
+  checksum: 10c0/836ee7dc7fd9436096e2dba429359dbb9fa0e33d309e2b2d81692f375f6ca82024fc00567f798613d50c6b989e9cd2ad2b065acf116325cde177f02c86b7d4e0
+  languageName: node
+  linkType: hard
+
+"ignore@npm:^5.1.4, ignore@npm:^5.1.8, ignore@npm:^5.2.0":
+  version: 5.3.1
+  resolution: "ignore@npm:5.3.1"
+  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+  languageName: node
+  linkType: hard
+
+"immer@npm:8.0.1":
+  version: 8.0.1
+  resolution: "immer@npm:8.0.1"
+  checksum: 10c0/5bda1b1e382b08e5c88bf84b710050d20b87455cc52b90b00ae2208932132bea6d780e05ea1cf73757214b7916a3b1f8ce21702e7ef40d90d187c896bcadb43e
+  languageName: node
+  linkType: hard
+
+"immutable@npm:^4.0.0":
+  version: 4.3.5
+  resolution: "immutable@npm:4.3.5"
+  checksum: 10c0/63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
+  languageName: node
+  linkType: hard
+
+"import-cwd@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "import-cwd@npm:2.1.0"
+  dependencies:
+    import-from: "npm:^2.1.0"
+  checksum: 10c0/d530fe3e70b42ad1db6d6b01db888dc6f0275a3106122e8bde60240694e0833bf7f070f56130da9bf5026fb65d5fcaca5821ae07956437187ed9aeb74bf6621b
+  languageName: node
+  linkType: hard
+
+"import-fresh@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "import-fresh@npm:2.0.0"
+  dependencies:
+    caller-path: "npm:^2.0.0"
+    resolve-from: "npm:^3.0.0"
+  checksum: 10c0/116c55ee5215a7839062285b60df85dbedde084c02111dc58c1b9d03ff7876627059f4beb16cdc090a3db21fea9022003402aa782139dc8d6302589038030504
+  languageName: node
+  linkType: hard
+
+"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1":
+  version: 3.3.0
+  resolution: "import-fresh@npm:3.3.0"
+  dependencies:
+    parent-module: "npm:^1.0.0"
+    resolve-from: "npm:^4.0.0"
+  checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
+  languageName: node
+  linkType: hard
+
+"import-from@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "import-from@npm:2.1.0"
+  dependencies:
+    resolve-from: "npm:^3.0.0"
+  checksum: 10c0/b7cb61873ba0d7df0cfba4904180e705dec1817766c9b39931b792be8e561188765dc49fba3d883e20873529619e9cff52a514c351a7d36db7c744c4ea2a2000
+  languageName: node
+  linkType: hard
+
+"import-local@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "import-local@npm:2.0.0"
+  dependencies:
+    pkg-dir: "npm:^3.0.0"
+    resolve-cwd: "npm:^2.0.0"
+  bin:
+    import-local-fixture: fixtures/cli.js
+  checksum: 10c0/68f2d9203d3760a836db97e917ea1793e865e0c5dd3749380ccaf52be907553febb0828f14c3169e66ba1a458d931b3cc5597cc9b623c7f79b395b0c3892601e
+  languageName: node
+  linkType: hard
+
+"import-local@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "import-local@npm:3.1.0"
+  dependencies:
+    pkg-dir: "npm:^4.2.0"
+    resolve-cwd: "npm:^3.0.0"
+  bin:
+    import-local-fixture: fixtures/cli.js
+  checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
+  languageName: node
+  linkType: hard
+
+"imurmurhash@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "imurmurhash@npm:0.1.4"
+  checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
+  languageName: node
+  linkType: hard
+
+"indent-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "indent-string@npm:4.0.0"
+  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+  languageName: node
+  linkType: hard
+
+"indexes-of@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "indexes-of@npm:1.0.1"
+  checksum: 10c0/1ea1d2d00173fa38f728acfa00303657e1115361481e52f6cbae47c5d603219006c9357abf6bc323f1fb0fbe937e363bbb19e5c66c12578eea6ec6b7e892bdba
+  languageName: node
+  linkType: hard
+
+"infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "infer-owner@npm:1.0.4"
+  checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
+  languageName: node
+  linkType: hard
+
+"inflight@npm:^1.0.4":
+  version: 1.0.6
+  resolution: "inflight@npm:1.0.6"
+  dependencies:
+    once: "npm:^1.3.0"
+    wrappy: "npm:1"
+  checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
+  languageName: node
+  linkType: hard
+
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
+  version: 2.0.4
+  resolution: "inherits@npm:2.0.4"
+  checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
+  languageName: node
+  linkType: hard
+
+"inherits@npm:2.0.3":
+  version: 2.0.3
+  resolution: "inherits@npm:2.0.3"
+  checksum: 10c0/6e56402373149ea076a434072671f9982f5fad030c7662be0332122fe6c0fa490acb3cc1010d90b6eff8d640b1167d77674add52dfd1bb85d545cf29e80e73e7
+  languageName: node
+  linkType: hard
+
+"ini@npm:^1.3.5":
+  version: 1.3.8
+  resolution: "ini@npm:1.3.8"
+  checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a
+  languageName: node
+  linkType: hard
+
+"internal-ip@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "internal-ip@npm:4.3.0"
+  dependencies:
+    default-gateway: "npm:^4.2.0"
+    ipaddr.js: "npm:^1.9.0"
+  checksum: 10c0/c0ad0b95981c8f21a2d4f115212af38c894a6a6d0a2a3cac4d73d1b5beb214fdfce7b5e66f087e8d575977d4df630886914412d1bc9c2678e5870210154ad65b
+  languageName: node
+  linkType: hard
+
+"internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    hasown: "npm:^2.0.0"
+    side-channel: "npm:^1.0.4"
+  checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c
+  languageName: node
+  linkType: hard
+
+"interpret@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "interpret@npm:3.1.1"
+  checksum: 10c0/6f3c4d0aa6ec1b43a8862375588a249e3c917739895cbe67fe12f0a76260ea632af51e8e2431b50fbcd0145356dc28ca147be08dbe6a523739fd55c0f91dc2a5
+  languageName: node
+  linkType: hard
+
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc
+  languageName: node
+  linkType: hard
+
+"ip-regex@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "ip-regex@npm:2.1.0"
+  checksum: 10c0/3ce2d8307fa0373ca357eba7504e66e73b8121805fd9eba6a343aeb077c64c30659fa876b11ac7a75635b7529d2ce87723f208a5b9d51571513b5c68c0cc1541
+  languageName: node
+  linkType: hard
+
+"ip@npm:^1.1.0, ip@npm:^1.1.5":
+  version: 1.1.9
+  resolution: "ip@npm:1.1.9"
+  checksum: 10c0/5af58bfe2110c9978acfd77a2ffcdf9d33a6ce1c72f49edbaf16958f7a8eb979b5163e43bb18938caf3aaa55cdacde4e470874c58ca3b4b112ea7a30461a0c27
+  languageName: node
+  linkType: hard
+
+"ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.0":
+  version: 1.9.1
+  resolution: "ipaddr.js@npm:1.9.1"
+  checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
+  languageName: node
+  linkType: hard
+
+"is-absolute-url@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "is-absolute-url@npm:2.1.0"
+  checksum: 10c0/2c324c3118752d82c18afadffbea14d35224e76f37a2ee80e05b209386c46d19bef77b58ede41f7b3be552cde16c6cdb0d884807175a6eb40e8c61281dc67c2f
+  languageName: node
+  linkType: hard
+
+"is-absolute-url@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "is-absolute-url@npm:3.0.3"
+  checksum: 10c0/04c415974c32e73a83d3a21a9bea18fc4e2c14fbe6bbd64832cf1e67a75ade2af0e900f552f0b8a447f1305f5ffc9d143ccd8d005dbe715d198c359d342b86f0
+  languageName: node
+  linkType: hard
+
+"is-accessor-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-accessor-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/d034034074c5ffeb6c868e091083182279db1a956f49f8d1494cecaa0f8b99d706556ded2a9b20d9aa290549106eef8204d67d8572902e06dcb1add6db6b524d
+  languageName: node
+  linkType: hard
+
+"is-arguments@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-arguments@npm:1.1.1"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/5ff1f341ee4475350adfc14b2328b38962564b7c2076be2f5bac7bd9b61779efba99b9f844a7b82ba7654adccf8e8eb19d1bb0cc6d1c1a085e498f6793d4328f
+  languageName: node
+  linkType: hard
+
+"is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    get-intrinsic: "npm:^1.2.1"
+  checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860
+  languageName: node
+  linkType: hard
+
+"is-arrayish@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "is-arrayish@npm:0.2.1"
+  checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
+  languageName: node
+  linkType: hard
+
+"is-arrayish@npm:^0.3.1":
+  version: 0.3.2
+  resolution: "is-arrayish@npm:0.3.2"
+  checksum: 10c0/f59b43dc1d129edb6f0e282595e56477f98c40278a2acdc8b0a5c57097c9eff8fe55470493df5775478cf32a4dc8eaf6d3a749f07ceee5bc263a78b2434f6a54
+  languageName: node
+  linkType: hard
+
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
+  languageName: node
+  linkType: hard
+
+"is-bigint@npm:^1.0.1":
+  version: 1.0.4
+  resolution: "is-bigint@npm:1.0.4"
+  dependencies:
+    has-bigints: "npm:^1.0.1"
+  checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
+  languageName: node
+  linkType: hard
+
+"is-binary-path@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-binary-path@npm:1.0.1"
+  dependencies:
+    binary-extensions: "npm:^1.0.0"
+  checksum: 10c0/16e456fa3782eaf3d8e28d382b750507e3d54ff6694df8a1b2c6498da321e2ead311de9c42e653d8fb3213de72bac204b5f97e4a110cda8a72f17b1c1b4eb643
+  languageName: node
+  linkType: hard
+
+"is-binary-path@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "is-binary-path@npm:2.1.0"
+  dependencies:
+    binary-extensions: "npm:^2.0.0"
+  checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
+  languageName: node
+  linkType: hard
+
+"is-boolean-object@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "is-boolean-object@npm:1.1.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
+  languageName: node
+  linkType: hard
+
+"is-buffer@npm:^1.1.5":
+  version: 1.1.6
+  resolution: "is-buffer@npm:1.1.6"
+  checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234
+  languageName: node
+  linkType: hard
+
+"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
+  version: 1.2.7
+  resolution: "is-callable@npm:1.2.7"
+  checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
+  languageName: node
+  linkType: hard
+
+"is-ci@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-ci@npm:2.0.0"
+  dependencies:
+    ci-info: "npm:^2.0.0"
+  bin:
+    is-ci: bin.js
+  checksum: 10c0/17de4e2cd8f993c56c86472dd53dd9e2c7f126d0ee55afe610557046cdd64de0e8feadbad476edc9eeff63b060523b8673d9094ed2ab294b59efb5a66dd05a9a
+  languageName: node
+  linkType: hard
+
+"is-color-stop@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "is-color-stop@npm:1.1.0"
+  dependencies:
+    css-color-names: "npm:^0.0.4"
+    hex-color-regex: "npm:^1.1.0"
+    hsl-regex: "npm:^1.0.0"
+    hsla-regex: "npm:^1.0.0"
+    rgb-regex: "npm:^1.0.1"
+    rgba-regex: "npm:^1.0.0"
+  checksum: 10c0/12d9a9d6b3da07bd69f678d6dbe897fccbd573ead12057f60c4773129e34ea2b658f29c1fb8ef84c548e8ac62061c04c16e23ffcb00d01900fa1f72b7ab3b569
+  languageName: node
+  linkType: hard
+
+"is-core-module@npm:^2.0.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1":
+  version: 2.13.1
+  resolution: "is-core-module@npm:2.13.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+  languageName: node
+  linkType: hard
+
+"is-data-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10c0/ad3acc372e3227f87eb8cdba112c343ca2a67f1885aecf64f02f901cb0858a1fc9488ad42135ab102e9d9e71a62b3594740790bb103a9ba5da830a131a89e3e8
+  languageName: node
+  linkType: hard
+
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: "npm:^1.1.13"
+  checksum: 10c0/a3e6ec84efe303da859107aed9b970e018e2bee7ffcb48e2f8096921a493608134240e672a2072577e5f23a729846241d9634806e8a0e51d9129c56d5f65442d
+  languageName: node
+  linkType: hard
+
+"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "is-date-object@npm:1.0.5"
+  dependencies:
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
+  languageName: node
+  linkType: hard
+
+"is-descriptor@npm:^0.1.0":
+  version: 0.1.7
+  resolution: "is-descriptor@npm:0.1.7"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10c0/f5960b9783f508aec570465288cb673d4b3cc4aae4e6de970c3afd9a8fc1351edcb85d78b2cce2ec5251893a423f73263cab3bb94cf365a8d71b5d510a116392
+  languageName: node
+  linkType: hard
+
+"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "is-descriptor@npm:1.0.3"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10c0/b4ee667ea787d3a0be4e58536087fd0587de2b0b6672fbfe288f5b8d831ac4b79fd987f31d6c2d4e5543a42c97a87428bc5215ce292a1a47070147793878226f
+  languageName: node
+  linkType: hard
+
+"is-directory@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "is-directory@npm:0.3.1"
+  checksum: 10c0/1c39c7d1753b04e9483b89fb88908b8137ab4743b6f481947e97ccf93ecb384a814c8d3f0b95b082b149c5aa19c3e9e4464e2791d95174bce95998c26bb1974b
+  languageName: node
+  linkType: hard
+
+"is-docker@npm:^2.0.0":
+  version: 2.2.1
+  resolution: "is-docker@npm:2.2.1"
+  bin:
+    is-docker: cli.js
+  checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "is-extendable@npm:0.1.1"
+  checksum: 10c0/dd5ca3994a28e1740d1e25192e66eed128e0b2ff161a7ea348e87ae4f616554b486854de423877a2a2c171d5f7cd6e8093b91f54533bc88a59ee1c9838c43879
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-extendable@npm:1.0.1"
+  dependencies:
+    is-plain-object: "npm:^2.0.4"
+  checksum: 10c0/1d6678a5be1563db6ecb121331c819c38059703f0179f52aa80c242c223ee9c6b66470286636c0e63d7163e4d905c0a7d82a096e0b5eaeabb51b9f8d0af0d73f
+  languageName: node
+  linkType: hard
+
+"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "is-extglob@npm:2.1.1"
+  checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
+  languageName: node
+  linkType: hard
+
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+  checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
+  languageName: node
+  linkType: hard
+
+"is-fullwidth-code-point@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-fullwidth-code-point@npm:2.0.0"
+  checksum: 10c0/e58f3e4a601fc0500d8b2677e26e9fe0cd450980e66adb29d85b6addf7969731e38f8e43ed2ec868a09c101a55ac3d8b78902209269f38c5286bc98f5bc1b4d9
+  languageName: node
+  linkType: hard
+
+"is-fullwidth-code-point@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-fullwidth-code-point@npm:3.0.0"
+  checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
+  languageName: node
+  linkType: hard
+
+"is-generator-fn@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "is-generator-fn@npm:2.1.0"
+  checksum: 10c0/2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
+  languageName: node
+  linkType: hard
+
+"is-generator-function@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
+  languageName: node
+  linkType: hard
+
+"is-glob@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "is-glob@npm:3.1.0"
+  dependencies:
+    is-extglob: "npm:^2.1.0"
+  checksum: 10c0/ba816a35dcf5285de924a8a4654df7b183a86381d73ea3bbf3df3cc61b3ba61fdddf90ee205709a2235b210ee600ee86e5e8600093cf291a662607fd032e2ff4
+  languageName: node
+  linkType: hard
+
+"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
+  version: 4.0.3
+  resolution: "is-glob@npm:4.0.3"
+  dependencies:
+    is-extglob: "npm:^2.1.1"
+  checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
+  languageName: node
+  linkType: hard
+
+"is-lambda@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-lambda@npm:1.0.1"
+  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+  languageName: node
+  linkType: hard
+
+"is-map@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: 10c0/2c4d431b74e00fdda7162cd8e4b763d6f6f217edf97d4f8538b94b8702b150610e2c64961340015fe8df5b1fcee33ccd2e9b62619c4a8a3a155f8de6d6d355fc
+  languageName: node
+  linkType: hard
+
+"is-module@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-module@npm:1.0.0"
+  checksum: 10c0/795a3914bcae7c26a1c23a1e5574c42eac13429625045737bf3e324ce865c0601d61aee7a5afbca1bee8cb300c7d9647e7dc98860c9bdbc3b7fdc51d8ac0bffc
+  languageName: node
+  linkType: hard
+
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
+  languageName: node
+  linkType: hard
+
+"is-number-object@npm:^1.0.4":
+  version: 1.0.7
+  resolution: "is-number-object@npm:1.0.7"
+  dependencies:
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-number@npm:3.0.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10c0/e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "is-number@npm:7.0.0"
+  checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
+  languageName: node
+  linkType: hard
+
+"is-obj@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-obj@npm:1.0.1"
+  checksum: 10c0/5003acba0af7aa47dfe0760e545a89bbac89af37c12092c3efadc755372cdaec034f130e7a3653a59eb3c1843cfc72ca71eaf1a6c3bafe5a0bab3611a47f9945
+  languageName: node
+  linkType: hard
+
+"is-obj@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-obj@npm:2.0.0"
+  checksum: 10c0/85044ed7ba8bd169e2c2af3a178cacb92a97aa75de9569d02efef7f443a824b5e153eba72b9ae3aca6f8ce81955271aa2dc7da67a8b720575d3e38104208cb4e
+  languageName: node
+  linkType: hard
+
+"is-path-cwd@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "is-path-cwd@npm:2.2.0"
+  checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a
+  languageName: node
+  linkType: hard
+
+"is-path-in-cwd@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "is-path-in-cwd@npm:2.1.0"
+  dependencies:
+    is-path-inside: "npm:^2.1.0"
+  checksum: 10c0/674a4282fb3732cf4b4e9ea31e06380d8b074fb8106c4c1742a9f0f3d5650bf059b2c45e5c4cfa7abe847ca88474de63abec323a7fe1eb14f8ec4de2fa951d3a
+  languageName: node
+  linkType: hard
+
+"is-path-inside@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "is-path-inside@npm:2.1.0"
+  dependencies:
+    path-is-inside: "npm:^1.0.2"
+  checksum: 10c0/50272b9aa301964c0bc4032d5c968e63c516d15bd7800cd06845df97bee637451fcd92a8001b37e309563eff2dffae5fa6d635a0c1d162dc257489c86b1fda51
+  languageName: node
+  linkType: hard
+
+"is-path-inside@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "is-path-inside@npm:3.0.3"
+  checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
+  languageName: node
+  linkType: hard
+
+"is-plain-obj@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "is-plain-obj@npm:1.1.0"
+  checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c
+  languageName: node
+  linkType: hard
+
+"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "is-plain-object@npm:2.0.4"
+  dependencies:
+    isobject: "npm:^3.0.1"
+  checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
+  languageName: node
+  linkType: hard
+
+"is-plain-object@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "is-plain-object@npm:5.0.0"
+  checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
+  languageName: node
+  linkType: hard
+
+"is-potential-custom-element-name@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-potential-custom-element-name@npm:1.0.1"
+  checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
+  languageName: node
+  linkType: hard
+
+"is-promise@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "is-promise@npm:2.2.2"
+  checksum: 10c0/2dba959812380e45b3df0fb12e7cb4d4528c989c7abb03ececb1d1fd6ab1cbfee956ca9daa587b9db1d8ac3c1e5738cf217bdb3dfd99df8c691be4c00ae09069
+  languageName: node
+  linkType: hard
+
+"is-regex@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "is-regex@npm:1.1.4"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
+  languageName: node
+  linkType: hard
+
+"is-regexp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-regexp@npm:1.0.0"
+  checksum: 10c0/34cacda1901e00f6e44879378f1d2fa96320ea956c1bec27713130aaf1d44f6e7bd963eed28945bfe37e600cb27df1cf5207302680dad8bdd27b9baff8ecf611
+  languageName: node
+  linkType: hard
+
+"is-resolvable@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "is-resolvable@npm:1.1.0"
+  checksum: 10c0/17d5bf39d9268173adf834c23effb6b4e926d809b528a851d87e6fb944e9606ed2c94dfaf1b1b675f922c2990fbc402d754136d8557c90a931ac7fd2f1e4cf07
+  languageName: node
+  linkType: hard
+
+"is-root@npm:2.1.0":
+  version: 2.1.0
+  resolution: "is-root@npm:2.1.0"
+  checksum: 10c0/83d3f5b052c3f28fbdbdf0d564bdd34fa14933f5694c78704f85cd1871255bc017fbe3fe2bc2fff2d227c6be5927ad2149b135c0a7c0060e7ac4e610d81a4f01
+  languageName: node
+  linkType: hard
+
+"is-set@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 10c0/f73732e13f099b2dc879c2a12341cfc22ccaca8dd504e6edae26484bd5707a35d503fba5b4daad530a9b088ced1ae6c9d8200fd92e09b428fe14ea79ce8080b7
+  languageName: node
+  linkType: hard
+
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+  checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-stream@npm:1.1.0"
+  checksum: 10c0/b8ae7971e78d2e8488d15f804229c6eed7ed36a28f8807a1815938771f4adff0e705218b7dab968270433f67103e4fef98062a0beea55d64835f705ee72c7002
+  languageName: node
+  linkType: hard
+
+"is-stream@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "is-stream@npm:2.0.1"
+  checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
+  languageName: node
+  linkType: hard
+
+"is-string@npm:^1.0.5, is-string@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "is-string@npm:1.0.7"
+  dependencies:
+    has-tostringtag: "npm:^1.0.0"
+  checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
+  languageName: node
+  linkType: hard
+
+"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "is-symbol@npm:1.0.4"
+  dependencies:
+    has-symbols: "npm:^1.0.2"
+  checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
+  languageName: node
+  linkType: hard
+
+"is-typed-array@npm:^1.1.13":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
+  dependencies:
+    which-typed-array: "npm:^1.1.14"
+  checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca
+  languageName: node
+  linkType: hard
+
+"is-typedarray@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-typedarray@npm:1.0.0"
+  checksum: 10c0/4c096275ba041a17a13cca33ac21c16bc4fd2d7d7eb94525e7cd2c2f2c1a3ab956e37622290642501ff4310601e413b675cf399ad6db49855527d2163b3eeeec
+  languageName: node
+  linkType: hard
+
+"is-weakmap@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-weakmap@npm:2.0.2"
+  checksum: 10c0/443c35bb86d5e6cc5929cd9c75a4024bb0fff9586ed50b092f94e700b89c43a33b186b76dbc6d54f3d3d09ece689ab38dcdc1af6a482cbe79c0f2da0a17f1299
+  languageName: node
+  linkType: hard
+
+"is-weakref@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-weakref@npm:1.0.2"
+  dependencies:
+    call-bind: "npm:^1.0.2"
+  checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
+  languageName: node
+  linkType: hard
+
+"is-weakset@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-weakset@npm:2.0.3"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10c0/8ad6141b6a400e7ce7c7442a13928c676d07b1f315ab77d9912920bf5f4170622f43126f111615788f26c3b1871158a6797c862233124507db0bcc33a9537d1a
+  languageName: node
+  linkType: hard
+
+"is-windows@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-windows@npm:1.0.2"
+  checksum: 10c0/b32f418ab3385604a66f1b7a3ce39d25e8881dee0bd30816dc8344ef6ff9df473a732bcc1ec4e84fe99b2f229ae474f7133e8e93f9241686cfcf7eebe53ba7a5
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "is-wsl@npm:1.1.0"
+  checksum: 10c0/7ad0012f21092d6f586c7faad84755a8ef0da9b9ec295e4dc82313cce4e1a93a3da3c217265016461f9b141503fe55fa6eb1fd5457d3f05e8d1bdbb48e50c13a
+  languageName: node
+  linkType: hard
+
+"is-wsl@npm:^2.1.1, is-wsl@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "is-wsl@npm:2.2.0"
+  dependencies:
+    is-docker: "npm:^2.0.0"
+  checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e
+  languageName: node
+  linkType: hard
+
+"isarray@npm:0.0.1":
+  version: 0.0.1
+  resolution: "isarray@npm:0.0.1"
+  checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
+  languageName: node
+  linkType: hard
+
+"isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "isarray@npm:1.0.0"
+  checksum: 10c0/18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d
+  languageName: node
+  linkType: hard
+
+"isarray@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "isarray@npm:2.0.5"
+  checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "isexe@npm:2.0.0"
+  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+  languageName: node
+  linkType: hard
+
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "isobject@npm:2.1.0"
+  dependencies:
+    isarray: "npm:1.0.0"
+  checksum: 10c0/c4cafec73b3b2ee11be75dff8dafd283b5728235ac099b07d7873d5182553a707768e208327bbc12931b9422d8822280bf88d894a0024ff5857b3efefb480e7b
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^3.0.0, isobject@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "isobject@npm:3.0.1"
+  checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
+  version: 3.2.2
+  resolution: "istanbul-lib-coverage@npm:3.2.2"
+  checksum: 10c0/6c7ff2106769e5f592ded1fb418f9f73b4411fd5a084387a5410538332b6567cd1763ff6b6cadca9b9eb2c443cce2f7ea7d7f1b8d315f9ce58539793b1e0922b
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "istanbul-lib-instrument@npm:4.0.3"
+  dependencies:
+    "@babel/core": "npm:^7.7.5"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    semver: "npm:^6.3.0"
+  checksum: 10c0/7f1005566a912e33e847576b2c1072d48a7c556810a54d912f3e2f0bd966171e68b30c40b0c1ce6ee9b8864de422d0c10e2d0dfd2d25b48723950cc78cd437c2
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^5.0.4":
+  version: 5.2.1
+  resolution: "istanbul-lib-instrument@npm:5.2.1"
+  dependencies:
+    "@babel/core": "npm:^7.12.3"
+    "@babel/parser": "npm:^7.14.7"
+    "@istanbuljs/schema": "npm:^0.1.2"
+    istanbul-lib-coverage: "npm:^3.2.0"
+    semver: "npm:^6.3.0"
+  checksum: 10c0/8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^6.0.0":
+  version: 6.0.2
+  resolution: "istanbul-lib-instrument@npm:6.0.2"
+  dependencies:
+    "@babel/core": "npm:^7.23.9"
+    "@babel/parser": "npm:^7.23.9"
+    "@istanbuljs/schema": "npm:^0.1.3"
+    istanbul-lib-coverage: "npm:^3.2.0"
+    semver: "npm:^7.5.4"
+  checksum: 10c0/405c6ac037bf8c7ee7495980b0cd5544b2c53078c10534d0c9ceeb92a9ea7dcf8510f58ccfce31336458a8fa6ccef27b570bbb602abaa8c1650f5496a807477c
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-report@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
+  dependencies:
+    istanbul-lib-coverage: "npm:^3.0.0"
+    make-dir: "npm:^4.0.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10c0/84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-source-maps@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "istanbul-lib-source-maps@npm:4.0.1"
+  dependencies:
+    debug: "npm:^4.1.1"
+    istanbul-lib-coverage: "npm:^3.0.0"
+    source-map: "npm:^0.6.1"
+  checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
+  languageName: node
+  linkType: hard
+
+"istanbul-reports@npm:^3.0.2, istanbul-reports@npm:^3.1.3":
+  version: 3.1.7
+  resolution: "istanbul-reports@npm:3.1.7"
+  dependencies:
+    html-escaper: "npm:^2.0.0"
+    istanbul-lib-report: "npm:^3.0.0"
+  checksum: 10c0/a379fadf9cf8dc5dfe25568115721d4a7eb82fbd50b005a6672aff9c6989b20cc9312d7865814e0859cd8df58cbf664482e1d3604be0afde1f7fc3ccc1394a51
+  languageName: node
+  linkType: hard
+
+"iterator.prototype@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "iterator.prototype@npm:1.1.2"
+  dependencies:
+    define-properties: "npm:^1.2.1"
+    get-intrinsic: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    reflect.getprototypeof: "npm:^1.0.4"
+    set-function-name: "npm:^2.0.1"
+  checksum: 10c0/a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "jackspeak@npm:2.3.6"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+    "@pkgjs/parseargs": "npm:^0.11.0"
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+  languageName: node
+  linkType: hard
+
+"jest-changed-files@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-changed-files@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    execa: "npm:^4.0.0"
+    throat: "npm:^5.0.0"
+  checksum: 10c0/6b679ba45c3fe08f659b59e2c22b6b773436e498aa57e62694ea1f185ed3d4e439bc1831dedca3df7b28d1562eec31ae9d79c65c8caea1dd5e620419da20013d
+  languageName: node
+  linkType: hard
+
+"jest-changed-files@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-changed-files@npm:29.7.0"
+  dependencies:
+    execa: "npm:^5.0.0"
+    jest-util: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+  checksum: 10c0/e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
+  languageName: node
+  linkType: hard
+
+"jest-circus@npm:26.6.0":
+  version: 26.6.0
+  resolution: "jest-circus@npm:26.6.0"
+  dependencies:
+    "@babel/traverse": "npm:^7.1.0"
+    "@jest/environment": "npm:^26.6.0"
+    "@jest/test-result": "npm:^26.6.0"
+    "@jest/types": "npm:^26.6.0"
+    "@types/babel__traverse": "npm:^7.0.4"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    co: "npm:^4.6.0"
+    dedent: "npm:^0.7.0"
+    expect: "npm:^26.6.0"
+    is-generator-fn: "npm:^2.0.0"
+    jest-each: "npm:^26.6.0"
+    jest-matcher-utils: "npm:^26.6.0"
+    jest-message-util: "npm:^26.6.0"
+    jest-runner: "npm:^26.6.0"
+    jest-runtime: "npm:^26.6.0"
+    jest-snapshot: "npm:^26.6.0"
+    jest-util: "npm:^26.6.0"
+    pretty-format: "npm:^26.6.0"
+    stack-utils: "npm:^2.0.2"
+    throat: "npm:^5.0.0"
+  checksum: 10c0/c4633d4d9280450a4b420a6fa1451dfc8a504b2045875edda08d970a2c005b3b521694d895dce30208cd0263ce62deed49fdaa5bf30205964a6ec1e87ef63c68
+  languageName: node
+  linkType: hard
+
+"jest-circus@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-circus@npm:29.7.0"
+  dependencies:
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/expect": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    co: "npm:^4.6.0"
+    dedent: "npm:^1.0.0"
+    is-generator-fn: "npm:^2.0.0"
+    jest-each: "npm:^29.7.0"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+    pretty-format: "npm:^29.7.0"
+    pure-rand: "npm:^6.0.0"
+    slash: "npm:^3.0.0"
+    stack-utils: "npm:^2.0.3"
+  checksum: 10c0/8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
+  languageName: node
+  linkType: hard
+
+"jest-cli@npm:^26.6.0":
+  version: 26.6.3
+  resolution: "jest-cli@npm:26.6.3"
+  dependencies:
+    "@jest/core": "npm:^26.6.3"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    chalk: "npm:^4.0.0"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.4"
+    import-local: "npm:^3.0.2"
+    is-ci: "npm:^2.0.0"
+    jest-config: "npm:^26.6.3"
+    jest-util: "npm:^26.6.2"
+    jest-validate: "npm:^26.6.2"
+    prompts: "npm:^2.0.1"
+    yargs: "npm:^15.4.1"
+  bin:
+    jest: bin/jest.js
+  checksum: 10c0/3f62c26b300549115bcfc0393d7d49467d414d200bb211a8843fd48d0296ddbfc5e6fe808c64ad2039127657b662e3ba3db44166341bd5db2d089bf09cf82a2c
+  languageName: node
+  linkType: hard
+
+"jest-cli@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-cli@npm:29.7.0"
+  dependencies:
+    "@jest/core": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    create-jest: "npm:^29.7.0"
+    exit: "npm:^0.1.2"
+    import-local: "npm:^3.0.2"
+    jest-config: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    yargs: "npm:^17.3.1"
+  peerDependencies:
+    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+  peerDependenciesMeta:
+    node-notifier:
+      optional: true
+  bin:
+    jest: bin/jest.js
+  checksum: 10c0/a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
+  languageName: node
+  linkType: hard
+
+"jest-config@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "jest-config@npm:26.6.3"
+  dependencies:
+    "@babel/core": "npm:^7.1.0"
+    "@jest/test-sequencer": "npm:^26.6.3"
+    "@jest/types": "npm:^26.6.2"
+    babel-jest: "npm:^26.6.3"
+    chalk: "npm:^4.0.0"
+    deepmerge: "npm:^4.2.2"
+    glob: "npm:^7.1.1"
+    graceful-fs: "npm:^4.2.4"
+    jest-environment-jsdom: "npm:^26.6.2"
+    jest-environment-node: "npm:^26.6.2"
+    jest-get-type: "npm:^26.3.0"
+    jest-jasmine2: "npm:^26.6.3"
+    jest-regex-util: "npm:^26.0.0"
+    jest-resolve: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jest-validate: "npm:^26.6.2"
+    micromatch: "npm:^4.0.2"
+    pretty-format: "npm:^26.6.2"
+  peerDependencies:
+    ts-node: ">=9.0.0"
+  peerDependenciesMeta:
+    ts-node:
+      optional: true
+  checksum: 10c0/7ca34c8d4fa48d9af081e05a2a7a54df5ad03df14dc1edca52f162c65f54fbd3745c14512b3f9dd42b753bd90d4aec4b86a7e1fdd410780bc79d27be3af5a36e
+  languageName: node
+  linkType: hard
+
+"jest-config@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-config@npm:29.7.0"
+  dependencies:
+    "@babel/core": "npm:^7.11.6"
+    "@jest/test-sequencer": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    babel-jest: "npm:^29.7.0"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    deepmerge: "npm:^4.2.2"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    jest-circus: "npm:^29.7.0"
+    jest-environment-node: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-runner: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    parse-json: "npm:^5.2.0"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-json-comments: "npm:^3.1.1"
+  peerDependencies:
+    "@types/node": "*"
+    ts-node: ">=9.0.0"
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    ts-node:
+      optional: true
+  checksum: 10c0/bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
+  languageName: node
+  linkType: hard
+
+"jest-diff@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-diff@npm:26.6.2"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    diff-sequences: "npm:^26.6.2"
+    jest-get-type: "npm:^26.3.0"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/3a9c88c8f308487059788ab1199e12f9b4657168964a2307573760b4d41ab5b851e5bef70125ef5ceddc1e201d6753d6ceae88994c197990dd9307cb7d94b9a1
+  languageName: node
+  linkType: hard
+
+"jest-diff@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-diff@npm:29.7.0"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    diff-sequences: "npm:^29.6.3"
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10c0/89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
+  languageName: node
+  linkType: hard
+
+"jest-docblock@npm:^26.0.0":
+  version: 26.0.0
+  resolution: "jest-docblock@npm:26.0.0"
+  dependencies:
+    detect-newline: "npm:^3.0.0"
+  checksum: 10c0/769c9379a906b98afd9fa2feca3a271a06bec62e26bb99e7bba4182ead955b677cbedeaa7b129653dd21ee9473604c40836651f7c4c1265e37ca2a68e01e0f8b
+  languageName: node
+  linkType: hard
+
+"jest-docblock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-docblock@npm:29.7.0"
+  dependencies:
+    detect-newline: "npm:^3.0.0"
+  checksum: 10c0/d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
+  languageName: node
+  linkType: hard
+
+"jest-each@npm:^26.6.0, jest-each@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-each@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^26.3.0"
+    jest-util: "npm:^26.6.2"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/93fca8619afba3e9f77903929a5f4ba84a4b4ab22852d062a24e7029038456b2d5bef5761afa1c3ac52a59434484f101d44beae35f3b7e5ec1a8aa695a1c879a
+  languageName: node
+  linkType: hard
+
+"jest-each@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-each@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10c0/f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
+  languageName: node
+  linkType: hard
+
+"jest-environment-jsdom@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-environment-jsdom@npm:26.6.2"
+  dependencies:
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/fake-timers": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jsdom: "npm:^16.4.0"
+  checksum: 10c0/5bbcc49240d59e966adb690ae73bdd7cd650b401a2420837c4770dbd148ddb2d417bcfb9fe0b4f5e85fda5d5d2e93e62788b699350eb6bd924cbf6bc9c833080
+  languageName: node
+  linkType: hard
+
+"jest-environment-jsdom@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-jsdom@npm:29.7.0"
+  dependencies:
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/jsdom": "npm:^20.0.0"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jsdom: "npm:^20.0.0"
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 10c0/139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
+  languageName: node
+  linkType: hard
+
+"jest-environment-node@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-environment-node@npm:26.6.2"
+  dependencies:
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/fake-timers": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+  checksum: 10c0/887382992bfd8110337cdc6e8a931f647d78363aa1ed777a2d9ff0f2edc468e6cc9e9b9a5d26c772534d0bd8ec41d860e433beb2d6f3c8a8a2cab3007ceec126
+  languageName: node
+  linkType: hard
+
+"jest-environment-node@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-node@npm:29.7.0"
+  dependencies:
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-mock: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+  checksum: 10c0/61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
+  languageName: node
+  linkType: hard
+
+"jest-get-type@npm:^26.3.0":
+  version: 26.3.0
+  resolution: "jest-get-type@npm:26.3.0"
+  checksum: 10c0/112fc7f962d1c4625a51b6ccfe6e9c8e54ab80816bf8dbf2b1bf25d12c0f75c74ebad0c2f37622aea81019a2087451bfb12a46619ed6717e64ee875ea2de5520
+  languageName: node
+  linkType: hard
+
+"jest-get-type@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-get-type@npm:29.6.3"
+  checksum: 10c0/552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
+  languageName: node
+  linkType: hard
+
+"jest-haste-map@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-haste-map@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    "@types/graceful-fs": "npm:^4.1.2"
+    "@types/node": "npm:*"
+    anymatch: "npm:^3.0.3"
+    fb-watchman: "npm:^2.0.0"
+    fsevents: "npm:^2.1.2"
+    graceful-fs: "npm:^4.2.4"
+    jest-regex-util: "npm:^26.0.0"
+    jest-serializer: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jest-worker: "npm:^26.6.2"
+    micromatch: "npm:^4.0.2"
+    sane: "npm:^4.0.3"
+    walker: "npm:^1.0.7"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/85a40d8ecf4bfb659613f107c963c7366cdf6dcceb0ca73dc8ca09fbe0e2a63b976940f573db6260c43011993cb804275f447f268c3bc4b680c08baed300701d
+  languageName: node
+  linkType: hard
+
+"jest-haste-map@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-haste-map@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    "@types/graceful-fs": "npm:^4.1.3"
+    "@types/node": "npm:*"
+    anymatch: "npm:^3.0.3"
+    fb-watchman: "npm:^2.0.0"
+    fsevents: "npm:^2.3.2"
+    graceful-fs: "npm:^4.2.9"
+    jest-regex-util: "npm:^29.6.3"
+    jest-util: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    micromatch: "npm:^4.0.4"
+    walker: "npm:^1.0.8"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
+  languageName: node
+  linkType: hard
+
+"jest-jasmine2@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "jest-jasmine2@npm:26.6.3"
+  dependencies:
+    "@babel/traverse": "npm:^7.1.0"
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/source-map": "npm:^26.6.2"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    co: "npm:^4.6.0"
+    expect: "npm:^26.6.2"
+    is-generator-fn: "npm:^2.0.0"
+    jest-each: "npm:^26.6.2"
+    jest-matcher-utils: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-runtime: "npm:^26.6.3"
+    jest-snapshot: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    pretty-format: "npm:^26.6.2"
+    throat: "npm:^5.0.0"
+  checksum: 10c0/9154ceb08fdfd263a1850af9008b6e5ab4d1242af45fede5a6580fc1db85cd9072a27b609590e76ae8d80e281b2ec96476528e8d37938b92061b746e88330f77
+  languageName: node
+  linkType: hard
+
+"jest-leak-detector@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-leak-detector@npm:26.6.2"
+  dependencies:
+    jest-get-type: "npm:^26.3.0"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/6062c04531126d1dfb3dee21483963dd75a975cb89a105b54cf767cc350b174ffcc9177d8750d14e30f36c475be7d96554c558bdf1f1ae6ad9b93bcea7097312
+  languageName: node
+  linkType: hard
+
+"jest-leak-detector@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-leak-detector@npm:29.7.0"
+  dependencies:
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
+  languageName: node
+  linkType: hard
+
+"jest-matcher-utils@npm:^26.6.0, jest-matcher-utils@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-matcher-utils@npm:26.6.2"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    jest-diff: "npm:^26.6.2"
+    jest-get-type: "npm:^26.3.0"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/1303fc4dfd80848483b64bafc99beb31678653ad3f34b4c23e982a16016aec1f8a7de4a583044d9c43e59ee7e68e07c57f3a8b51e40fbefe42eafad45cc725ed
+  languageName: node
+  linkType: hard
+
+"jest-matcher-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-matcher-utils@npm:29.7.0"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    jest-diff: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10c0/0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
+  languageName: node
+  linkType: hard
+
+"jest-message-util@npm:^26.6.0, jest-message-util@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-message-util@npm:26.6.2"
+  dependencies:
+    "@babel/code-frame": "npm:^7.0.0"
+    "@jest/types": "npm:^26.6.2"
+    "@types/stack-utils": "npm:^2.0.0"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.4"
+    micromatch: "npm:^4.0.2"
+    pretty-format: "npm:^26.6.2"
+    slash: "npm:^3.0.0"
+    stack-utils: "npm:^2.0.2"
+  checksum: 10c0/f6138d67154137cf3e985b2b469d0c78846cce787fed16b107c177fc9c6eb2606b7bce8e88d2a6bc830262d77469ecf26c70925cefc98dee83b5e8ed08981ff5
+  languageName: node
+  linkType: hard
+
+"jest-message-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-message-util@npm:29.7.0"
+  dependencies:
+    "@babel/code-frame": "npm:^7.12.13"
+    "@jest/types": "npm:^29.6.3"
+    "@types/stack-utils": "npm:^2.0.0"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    micromatch: "npm:^4.0.4"
+    pretty-format: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    stack-utils: "npm:^2.0.3"
+  checksum: 10c0/850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
+  languageName: node
+  linkType: hard
+
+"jest-mock@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-mock@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+  checksum: 10c0/cf77b49efe76cdedc63363ccdbae8bc68e0301fbded669e7b45647b7b7c1dce90985cf6a3a13da161f644523d7d0aad03184c6f39302ee4b52f954a1de37960f
+  languageName: node
+  linkType: hard
+
+"jest-mock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-mock@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    jest-util: "npm:^29.7.0"
+  checksum: 10c0/7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
+  languageName: node
+  linkType: hard
+
+"jest-pnp-resolver@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "jest-pnp-resolver@npm:1.2.3"
+  peerDependencies:
+    jest-resolve: "*"
+  peerDependenciesMeta:
+    jest-resolve:
+      optional: true
+  checksum: 10c0/86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
+  languageName: node
+  linkType: hard
+
+"jest-regex-util@npm:^26.0.0":
+  version: 26.0.0
+  resolution: "jest-regex-util@npm:26.0.0"
+  checksum: 10c0/988675764a08945b90f48e6f5a8640b0d9885a977f100a168061d10037d53808a6cdb7dc8cb6fe9b1332f0523b42bf3edbb6d2cc6c7f7ba582d05d432efb3e60
+  languageName: node
+  linkType: hard
+
+"jest-regex-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-regex-util@npm:29.6.3"
+  checksum: 10c0/4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
+  languageName: node
+  linkType: hard
+
+"jest-resolve-dependencies@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "jest-resolve-dependencies@npm:26.6.3"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    jest-regex-util: "npm:^26.0.0"
+    jest-snapshot: "npm:^26.6.2"
+  checksum: 10c0/d8a9392354d7775e2e7234e854069a1e0d21ea616b8de162562b57d77e296b8259952d03f10e2a3031a2369657d5950a807391455dadbafb3f4523804a2585d6
+  languageName: node
+  linkType: hard
+
+"jest-resolve-dependencies@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve-dependencies@npm:29.7.0"
+  dependencies:
+    jest-regex-util: "npm:^29.6.3"
+    jest-snapshot: "npm:^29.7.0"
+  checksum: 10c0/b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
+  languageName: node
+  linkType: hard
+
+"jest-resolve@npm:26.6.0":
+  version: 26.6.0
+  resolution: "jest-resolve@npm:26.6.0"
+  dependencies:
+    "@jest/types": "npm:^26.6.0"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.4"
+    jest-pnp-resolver: "npm:^1.2.2"
+    jest-util: "npm:^26.6.0"
+    read-pkg-up: "npm:^7.0.1"
+    resolve: "npm:^1.17.0"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/bdf4b7931c87bcb2065d1f52f6a1e27c79ab724863de489ffbdbe2211fb6442c61deff0924df342cc5c50a56c03c349e23ce0bb512a581719dd5eb31d005a044
+  languageName: node
+  linkType: hard
+
+"jest-resolve@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-resolve@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.4"
+    jest-pnp-resolver: "npm:^1.2.2"
+    jest-util: "npm:^26.6.2"
+    read-pkg-up: "npm:^7.0.1"
+    resolve: "npm:^1.18.1"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/9ead2ebe49efeb6c428c25b2da0e773844692cbd1b0b55145c950592053113e67b6121f9cfe1dcea901df3cea8c06ee38a464a37a9b611dc9f1ab376ea7be35a
+  languageName: node
+  linkType: hard
+
+"jest-resolve@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve@npm:29.7.0"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-pnp-resolver: "npm:^1.2.2"
+    jest-util: "npm:^29.7.0"
+    jest-validate: "npm:^29.7.0"
+    resolve: "npm:^1.20.0"
+    resolve.exports: "npm:^2.0.0"
+    slash: "npm:^3.0.0"
+  checksum: 10c0/59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
+  languageName: node
+  linkType: hard
+
+"jest-runner@npm:^26.6.0, jest-runner@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "jest-runner@npm:26.6.3"
+  dependencies:
+    "@jest/console": "npm:^26.6.2"
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    emittery: "npm:^0.7.1"
+    exit: "npm:^0.1.2"
+    graceful-fs: "npm:^4.2.4"
+    jest-config: "npm:^26.6.3"
+    jest-docblock: "npm:^26.0.0"
+    jest-haste-map: "npm:^26.6.2"
+    jest-leak-detector: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-resolve: "npm:^26.6.2"
+    jest-runtime: "npm:^26.6.3"
+    jest-util: "npm:^26.6.2"
+    jest-worker: "npm:^26.6.2"
+    source-map-support: "npm:^0.5.6"
+    throat: "npm:^5.0.0"
+  checksum: 10c0/81ce9ce686623c93e50b34babd12a4fdd05edf00b0478570ae57aa2384942fe6fc1c8ca8ee6715ec15561d350f45ec3c26a19304c20b91d4cf51e73b54b0d347
+  languageName: node
+  linkType: hard
+
+"jest-runner@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runner@npm:29.7.0"
+  dependencies:
+    "@jest/console": "npm:^29.7.0"
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    emittery: "npm:^0.13.1"
+    graceful-fs: "npm:^4.2.9"
+    jest-docblock: "npm:^29.7.0"
+    jest-environment-node: "npm:^29.7.0"
+    jest-haste-map: "npm:^29.7.0"
+    jest-leak-detector: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-resolve: "npm:^29.7.0"
+    jest-runtime: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    jest-watcher: "npm:^29.7.0"
+    jest-worker: "npm:^29.7.0"
+    p-limit: "npm:^3.1.0"
+    source-map-support: "npm:0.5.13"
+  checksum: 10c0/2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
+  languageName: node
+  linkType: hard
+
+"jest-runtime@npm:^26.6.0, jest-runtime@npm:^26.6.3":
+  version: 26.6.3
+  resolution: "jest-runtime@npm:26.6.3"
+  dependencies:
+    "@jest/console": "npm:^26.6.2"
+    "@jest/environment": "npm:^26.6.2"
+    "@jest/fake-timers": "npm:^26.6.2"
+    "@jest/globals": "npm:^26.6.2"
+    "@jest/source-map": "npm:^26.6.2"
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/transform": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/yargs": "npm:^15.0.0"
+    chalk: "npm:^4.0.0"
+    cjs-module-lexer: "npm:^0.6.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    exit: "npm:^0.1.2"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.4"
+    jest-config: "npm:^26.6.3"
+    jest-haste-map: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-mock: "npm:^26.6.2"
+    jest-regex-util: "npm:^26.0.0"
+    jest-resolve: "npm:^26.6.2"
+    jest-snapshot: "npm:^26.6.2"
+    jest-util: "npm:^26.6.2"
+    jest-validate: "npm:^26.6.2"
+    slash: "npm:^3.0.0"
+    strip-bom: "npm:^4.0.0"
+    yargs: "npm:^15.4.1"
+  bin:
+    jest-runtime: bin/jest-runtime.js
+  checksum: 10c0/d0fd139d01b9af87b5546586e8c3907d61e95c07d52fe29d7e247f08830a074f1d35c5417449fcfc5c1e5e210dd5c08c48e4789ca7900586e7624c202388a346
+  languageName: node
+  linkType: hard
+
+"jest-runtime@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runtime@npm:29.7.0"
+  dependencies:
+    "@jest/environment": "npm:^29.7.0"
+    "@jest/fake-timers": "npm:^29.7.0"
+    "@jest/globals": "npm:^29.7.0"
+    "@jest/source-map": "npm:^29.6.3"
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    cjs-module-lexer: "npm:^1.0.0"
+    collect-v8-coverage: "npm:^1.0.0"
+    glob: "npm:^7.1.3"
+    graceful-fs: "npm:^4.2.9"
+    jest-haste-map: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-mock: "npm:^29.7.0"
+    jest-regex-util: "npm:^29.6.3"
+    jest-resolve: "npm:^29.7.0"
+    jest-snapshot: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    slash: "npm:^3.0.0"
+    strip-bom: "npm:^4.0.0"
+  checksum: 10c0/7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
+  languageName: node
+  linkType: hard
+
+"jest-serializer@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-serializer@npm:26.6.2"
+  dependencies:
+    "@types/node": "npm:*"
+    graceful-fs: "npm:^4.2.4"
+  checksum: 10c0/1c67aa1acefdc0b244f2629aaef12a56e563a5c5cb817970d2b97bdad5e8aae187b269c8d356c42ff9711436499c4da71ec8400e6280dab110be8cc5300884b0
+  languageName: node
+  linkType: hard
+
+"jest-snapshot@npm:^26.6.0, jest-snapshot@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-snapshot@npm:26.6.2"
+  dependencies:
+    "@babel/types": "npm:^7.0.0"
+    "@jest/types": "npm:^26.6.2"
+    "@types/babel__traverse": "npm:^7.0.4"
+    "@types/prettier": "npm:^2.0.0"
+    chalk: "npm:^4.0.0"
+    expect: "npm:^26.6.2"
+    graceful-fs: "npm:^4.2.4"
+    jest-diff: "npm:^26.6.2"
+    jest-get-type: "npm:^26.3.0"
+    jest-haste-map: "npm:^26.6.2"
+    jest-matcher-utils: "npm:^26.6.2"
+    jest-message-util: "npm:^26.6.2"
+    jest-resolve: "npm:^26.6.2"
+    natural-compare: "npm:^1.4.0"
+    pretty-format: "npm:^26.6.2"
+    semver: "npm:^7.3.2"
+  checksum: 10c0/b7b829e7179411cf9a5718d9cf4214e3ac66c41fa17c2f32b7273d12a5e4e85e30504335c4a673f6537af660531fe7c475d09266d63cf19aae3d346809a9a4a2
+  languageName: node
+  linkType: hard
+
+"jest-snapshot@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-snapshot@npm:29.7.0"
+  dependencies:
+    "@babel/core": "npm:^7.11.6"
+    "@babel/generator": "npm:^7.7.2"
+    "@babel/plugin-syntax-jsx": "npm:^7.7.2"
+    "@babel/plugin-syntax-typescript": "npm:^7.7.2"
+    "@babel/types": "npm:^7.3.3"
+    "@jest/expect-utils": "npm:^29.7.0"
+    "@jest/transform": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    babel-preset-current-node-syntax: "npm:^1.0.0"
+    chalk: "npm:^4.0.0"
+    expect: "npm:^29.7.0"
+    graceful-fs: "npm:^4.2.9"
+    jest-diff: "npm:^29.7.0"
+    jest-get-type: "npm:^29.6.3"
+    jest-matcher-utils: "npm:^29.7.0"
+    jest-message-util: "npm:^29.7.0"
+    jest-util: "npm:^29.7.0"
+    natural-compare: "npm:^1.4.0"
+    pretty-format: "npm:^29.7.0"
+    semver: "npm:^7.5.3"
+  checksum: 10c0/6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
+  languageName: node
+  linkType: hard
+
+"jest-util@npm:^26.6.0, jest-util@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-util@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    graceful-fs: "npm:^4.2.4"
+    is-ci: "npm:^2.0.0"
+    micromatch: "npm:^4.0.2"
+  checksum: 10c0/ab93709840f87bdf478d082f5465467c27a20a422cbe456cc2a56961d8c950ea52511995fb6063f62a113737f3dd714b836a1fbde51abef96642a5975e835a01
+  languageName: node
+  linkType: hard
+
+"jest-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-util@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    chalk: "npm:^4.0.0"
+    ci-info: "npm:^3.2.0"
+    graceful-fs: "npm:^4.2.9"
+    picomatch: "npm:^2.2.3"
+  checksum: 10c0/bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
   languageName: node
   linkType: hard
 
-"fast-levenshtein@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4
+"jest-validate@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-validate@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    camelcase: "npm:^6.0.0"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^26.3.0"
+    leven: "npm:^3.1.0"
+    pretty-format: "npm:^26.6.2"
+  checksum: 10c0/0c8df164641e797f80011e359553411e097ea495b95b41100be00d6c827bfd854e92ef8c528fe4cac0d113055a5075d1409f2616099ec648dbd6809bb0a29c67
   languageName: node
   linkType: hard
 
-"fast-redact@npm:^3.0.0":
-  version: 3.5.0
-  resolution: "fast-redact@npm:3.5.0"
-  checksum: 10c0/7e2ce4aad6e7535e0775bf12bd3e4f2e53d8051d8b630e0fa9e67f68cb0b0e6070d2f7a94b1d0522ef07e32f7c7cda5755e2b677a6538f1e9070ca053c42343a
+"jest-validate@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-validate@npm:29.7.0"
+  dependencies:
+    "@jest/types": "npm:^29.6.3"
+    camelcase: "npm:^6.2.0"
+    chalk: "npm:^4.0.0"
+    jest-get-type: "npm:^29.6.3"
+    leven: "npm:^3.1.0"
+    pretty-format: "npm:^29.7.0"
+  checksum: 10c0/a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
   languageName: node
   linkType: hard
 
-"fast-safe-stringify@npm:^2.0.8":
-  version: 2.1.1
-  resolution: "fast-safe-stringify@npm:2.1.1"
-  checksum: 10c0/d90ec1c963394919828872f21edaa3ad6f1dddd288d2bd4e977027afff09f5db40f94e39536d4646f7e01761d704d72d51dce5af1b93717f3489ef808f5f4e4d
+"jest-watch-typeahead@npm:0.6.1":
+  version: 0.6.1
+  resolution: "jest-watch-typeahead@npm:0.6.1"
+  dependencies:
+    ansi-escapes: "npm:^4.3.1"
+    chalk: "npm:^4.0.0"
+    jest-regex-util: "npm:^26.0.0"
+    jest-watcher: "npm:^26.3.0"
+    slash: "npm:^3.0.0"
+    string-length: "npm:^4.0.1"
+    strip-ansi: "npm:^6.0.0"
+  peerDependencies:
+    jest: ^26.0.0
+  checksum: 10c0/5302752c0e2728318c887f6802a9f57cd0a9471095238fe046da0864408ae73b288c8cc93bdfbd3b2971ce68fd9bdacf02962f00030b62a02258bc044bf10404
+  languageName: node
+  linkType: hard
+
+"jest-watcher@npm:^26.3.0, jest-watcher@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-watcher@npm:26.6.2"
+  dependencies:
+    "@jest/test-result": "npm:^26.6.2"
+    "@jest/types": "npm:^26.6.2"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    jest-util: "npm:^26.6.2"
+    string-length: "npm:^4.0.1"
+  checksum: 10c0/3a0caf17f3d586ec7099a576757336e6ba5ac6f2449e66aa1416214b32188970b1fa10f83e1aef58254a30a55a6698cbbb16aa5187c8023516d8bea8833aee12
+  languageName: node
+  linkType: hard
+
+"jest-watcher@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-watcher@npm:29.7.0"
+  dependencies:
+    "@jest/test-result": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    "@types/node": "npm:*"
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.0.0"
+    emittery: "npm:^0.13.1"
+    jest-util: "npm:^29.7.0"
+    string-length: "npm:^4.0.1"
+  checksum: 10c0/ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^24.9.0":
+  version: 24.9.0
+  resolution: "jest-worker@npm:24.9.0"
+  dependencies:
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^6.1.0"
+  checksum: 10c0/ea9f4751976d08807d33598244e6c3a60ce5889cdabf1f4e6f3e57dddcf2190978e6284f0865326f64e93677cebac53220d71a52e57d1205c467c6f09efa8bc2
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^26.5.0, jest-worker@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "jest-worker@npm:26.6.2"
+  dependencies:
+    "@types/node": "npm:*"
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^7.0.0"
+  checksum: 10c0/07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^27.4.5, jest-worker@npm:^27.5.1":
+  version: 27.5.1
+  resolution: "jest-worker@npm:27.5.1"
+  dependencies:
+    "@types/node": "npm:*"
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^8.0.0"
+  checksum: 10c0/8c4737ffd03887b3c6768e4cc3ca0269c0336c1e4b1b120943958ddb035ed2a0fc6acab6dc99631720a3720af4e708ff84fb45382ad1e83c27946adf3623969b
+  languageName: node
+  linkType: hard
+
+"jest-worker@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-worker@npm:29.7.0"
+  dependencies:
+    "@types/node": "npm:*"
+    jest-util: "npm:^29.7.0"
+    merge-stream: "npm:^2.0.0"
+    supports-color: "npm:^8.0.0"
+  checksum: 10c0/5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
+  languageName: node
+  linkType: hard
+
+"jest@npm:26.6.0":
+  version: 26.6.0
+  resolution: "jest@npm:26.6.0"
+  dependencies:
+    "@jest/core": "npm:^26.6.0"
+    import-local: "npm:^3.0.2"
+    jest-cli: "npm:^26.6.0"
+  bin:
+    jest: bin/jest.js
+  checksum: 10c0/c53dba7e6e575a2625454985e474d2ee5097c0615ffe9b2355dd919c491e14a687e238ca36b8e0510868ef9c16c28f96920e0a116d8a9241ee6a4de0e9a9381c
+  languageName: node
+  linkType: hard
+
+"jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest@npm:29.7.0"
+  dependencies:
+    "@jest/core": "npm:^29.7.0"
+    "@jest/types": "npm:^29.6.3"
+    import-local: "npm:^3.0.2"
+    jest-cli: "npm:^29.7.0"
+  peerDependencies:
+    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+  peerDependenciesMeta:
+    node-notifier:
+      optional: true
+  bin:
+    jest: bin/jest.js
+  checksum: 10c0/f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
+  languageName: node
+  linkType: hard
+
+"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "js-tokens@npm:4.0.0"
+  checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
+  languageName: node
+  linkType: hard
+
+"js-yaml@npm:^3.13.1":
+  version: 3.14.1
+  resolution: "js-yaml@npm:3.14.1"
+  dependencies:
+    argparse: "npm:^1.0.7"
+    esprima: "npm:^4.0.0"
+  bin:
+    js-yaml: bin/js-yaml.js
+  checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
+  languageName: node
+  linkType: hard
+
+"js-yaml@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "js-yaml@npm:4.1.0"
+  dependencies:
+    argparse: "npm:^2.0.1"
+  bin:
+    js-yaml: bin/js-yaml.js
+  checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
+  languageName: node
+  linkType: hard
+
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96
+  languageName: node
+  linkType: hard
+
+"jsdom@npm:^16.4.0":
+  version: 16.7.0
+  resolution: "jsdom@npm:16.7.0"
+  dependencies:
+    abab: "npm:^2.0.5"
+    acorn: "npm:^8.2.4"
+    acorn-globals: "npm:^6.0.0"
+    cssom: "npm:^0.4.4"
+    cssstyle: "npm:^2.3.0"
+    data-urls: "npm:^2.0.0"
+    decimal.js: "npm:^10.2.1"
+    domexception: "npm:^2.0.1"
+    escodegen: "npm:^2.0.0"
+    form-data: "npm:^3.0.0"
+    html-encoding-sniffer: "npm:^2.0.1"
+    http-proxy-agent: "npm:^4.0.1"
+    https-proxy-agent: "npm:^5.0.0"
+    is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.0"
+    parse5: "npm:6.0.1"
+    saxes: "npm:^5.0.1"
+    symbol-tree: "npm:^3.2.4"
+    tough-cookie: "npm:^4.0.0"
+    w3c-hr-time: "npm:^1.0.2"
+    w3c-xmlserializer: "npm:^2.0.0"
+    webidl-conversions: "npm:^6.1.0"
+    whatwg-encoding: "npm:^1.0.5"
+    whatwg-mimetype: "npm:^2.3.0"
+    whatwg-url: "npm:^8.5.0"
+    ws: "npm:^7.4.6"
+    xml-name-validator: "npm:^3.0.0"
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 10c0/e9ba6ea5f5e0d18647ccedec16bc3c69c8c739732ffcb27c66ffd3cc3f876add291ca4f0b9c209ace939ce2aa3ba9e4d67b7f05317921a4d3eab02fe1cc164ef
+  languageName: node
+  linkType: hard
+
+"jsdom@npm:^20.0.0":
+  version: 20.0.3
+  resolution: "jsdom@npm:20.0.3"
+  dependencies:
+    abab: "npm:^2.0.6"
+    acorn: "npm:^8.8.1"
+    acorn-globals: "npm:^7.0.0"
+    cssom: "npm:^0.5.0"
+    cssstyle: "npm:^2.3.0"
+    data-urls: "npm:^3.0.2"
+    decimal.js: "npm:^10.4.2"
+    domexception: "npm:^4.0.0"
+    escodegen: "npm:^2.0.0"
+    form-data: "npm:^4.0.0"
+    html-encoding-sniffer: "npm:^3.0.0"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.1"
+    is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.2"
+    parse5: "npm:^7.1.1"
+    saxes: "npm:^6.0.0"
+    symbol-tree: "npm:^3.2.4"
+    tough-cookie: "npm:^4.1.2"
+    w3c-xmlserializer: "npm:^4.0.0"
+    webidl-conversions: "npm:^7.0.0"
+    whatwg-encoding: "npm:^2.0.0"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^11.0.0"
+    ws: "npm:^8.11.0"
+    xml-name-validator: "npm:^4.0.0"
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 10c0/b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
+  languageName: node
+  linkType: hard
+
+"jsdom@npm:^22.1.0":
+  version: 22.1.0
+  resolution: "jsdom@npm:22.1.0"
+  dependencies:
+    abab: "npm:^2.0.6"
+    cssstyle: "npm:^3.0.0"
+    data-urls: "npm:^4.0.0"
+    decimal.js: "npm:^10.4.3"
+    domexception: "npm:^4.0.0"
+    form-data: "npm:^4.0.0"
+    html-encoding-sniffer: "npm:^3.0.0"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.1"
+    is-potential-custom-element-name: "npm:^1.0.1"
+    nwsapi: "npm:^2.2.4"
+    parse5: "npm:^7.1.2"
+    rrweb-cssom: "npm:^0.6.0"
+    saxes: "npm:^6.0.0"
+    symbol-tree: "npm:^3.2.4"
+    tough-cookie: "npm:^4.1.2"
+    w3c-xmlserializer: "npm:^4.0.0"
+    webidl-conversions: "npm:^7.0.0"
+    whatwg-encoding: "npm:^2.0.0"
+    whatwg-mimetype: "npm:^3.0.0"
+    whatwg-url: "npm:^12.0.1"
+    ws: "npm:^8.13.0"
+    xml-name-validator: "npm:^4.0.0"
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 10c0/a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d
   languageName: node
   linkType: hard
 
-"fastest-levenshtein@npm:^1.0.12":
-  version: 1.0.16
-  resolution: "fastest-levenshtein@npm:1.0.16"
-  checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b
+"jsesc@npm:^2.5.1":
+  version: 2.5.2
+  resolution: "jsesc@npm:2.5.2"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
   languageName: node
   linkType: hard
 
-"fastify-plugin@npm:^4.0.0":
-  version: 4.5.1
-  resolution: "fastify-plugin@npm:4.5.1"
-  checksum: 10c0/f58f79cd9d3c88fd7f79a3270276c6339fc57bbe72ef14d20b73779193c404e317ac18e8eae2c5071b3909ebee45d7eb6871da4e65464ac64ed0d9746b4e9b9f
+"jsesc@npm:~0.5.0":
+  version: 0.5.0
+  resolution: "jsesc@npm:0.5.0"
+  bin:
+    jsesc: bin/jsesc
+  checksum: 10c0/f93792440ae1d80f091b65f8ceddf8e55c4bb7f1a09dee5dcbdb0db5612c55c0f6045625aa6b7e8edb2e0a4feabd80ee48616dbe2d37055573a84db3d24f96d9
   languageName: node
   linkType: hard
 
-"fastify@npm:^3.29.5":
-  version: 3.29.5
-  resolution: "fastify@npm:3.29.5"
-  dependencies:
-    "@fastify/ajv-compiler": "npm:^1.0.0"
-    "@fastify/error": "npm:^2.0.0"
-    abstract-logging: "npm:^2.0.0"
-    avvio: "npm:^7.1.2"
-    fast-content-type-parse: "npm:^1.0.0"
-    fast-json-stringify: "npm:^2.5.2"
-    find-my-way: "npm:^4.5.0"
-    flatstr: "npm:^1.0.12"
-    light-my-request: "npm:^4.2.0"
-    pino: "npm:^6.13.0"
-    process-warning: "npm:^1.0.0"
-    proxy-addr: "npm:^2.0.7"
-    rfdc: "npm:^1.1.4"
-    secure-json-parse: "npm:^2.0.0"
-    semver: "npm:^7.3.2"
-    tiny-lru: "npm:^8.0.1"
-  checksum: 10c0/83a4850c38b1ac8934eff07030f2d0b5ed37b190cbaf05d22b3ca93f00e4735dfe62e48f183bcc5af76b6697512a32e692e6e1765cf51c69819216629f125b3b
+"json-buffer@npm:3.0.1":
+  version: 3.0.1
+  resolution: "json-buffer@npm:3.0.1"
+  checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
   languageName: node
   linkType: hard
 
-"fastq@npm:^1.6.0, fastq@npm:^1.6.1":
-  version: 1.17.1
-  resolution: "fastq@npm:1.17.1"
-  dependencies:
-    reusify: "npm:^1.0.4"
-  checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34
+"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "json-parse-better-errors@npm:1.0.2"
+  checksum: 10c0/2f1287a7c833e397c9ddd361a78638e828fc523038bb3441fd4fc144cfd2c6cd4963ffb9e207e648cf7b692600f1e1e524e965c32df5152120910e4903a47dcb
   languageName: node
   linkType: hard
 
-"fb-watchman@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "fb-watchman@npm:2.0.2"
-  dependencies:
-    bser: "npm:2.1.1"
-  checksum: 10c0/feae89ac148adb8f6ae8ccd87632e62b13563e6fb114cacb5265c51f585b17e2e268084519fb2edd133872f1d47a18e6bfd7e5e08625c0d41b93149694187581
+"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "json-parse-even-better-errors@npm:2.3.1"
+  checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "file-entry-cache@npm:6.0.1"
-  dependencies:
-    flat-cache: "npm:^3.0.4"
-  checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd
+"json-schema-traverse@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "json-schema-traverse@npm:0.4.1"
+  checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
   languageName: node
   linkType: hard
 
-"file-loader@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "file-loader@npm:6.2.0"
-  dependencies:
-    loader-utils: "npm:^2.0.0"
-    schema-utils: "npm:^3.0.0"
-  peerDependencies:
-    webpack: ^4.0.0 || ^5.0.0
-  checksum: 10c0/e176a57c2037ab0f78e5755dbf293a6b7f0f8392350a120bd03cc2ce2525bea017458ba28fea14ca535ff1848055e86d1a3a216bdb2561ef33395b27260a1dd3
+"json-schema-traverse@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "json-schema-traverse@npm:1.0.0"
+  checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
   languageName: node
   linkType: hard
 
-"file-uri-to-path@npm:1.0.0":
-  version: 1.0.0
-  resolution: "file-uri-to-path@npm:1.0.0"
-  checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519
+"json-stable-stringify-without-jsonify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
+  checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"json5@npm:^1.0.1, json5@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
-    to-regex-range: "npm:^5.0.1"
-  checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f
+    minimist: "npm:^1.2.0"
+  bin:
+    json5: lib/cli.js
+  checksum: 10c0/9ee316bf21f000b00752e6c2a3b79ecf5324515a5c60ee88983a1910a45426b643a4f3461657586e8aeca87aaf96f0a519b0516d2ae527a6c3e7eed80f68717f
   languageName: node
   linkType: hard
 
-"find-my-way@npm:^4.5.0":
-  version: 4.5.1
-  resolution: "find-my-way@npm:4.5.1"
-  dependencies:
-    fast-decode-uri-component: "npm:^1.0.1"
-    fast-deep-equal: "npm:^3.1.3"
-    safe-regex2: "npm:^2.0.0"
-    semver-store: "npm:^0.3.0"
-  checksum: 10c0/3e56f50befde96d4b0a0a8118bd7fe283184e54ed61ac359ce62e7229229ab8b4a5aebe02edfcc126f0b6eef38660b59347293d61752bc845aae823cace8042a
+"json5@npm:^2.1.2, json5@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "json5@npm:2.2.3"
+  bin:
+    json5: lib/cli.js
+  checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
   languageName: node
   linkType: hard
 
-"find-up@npm:^4.0.0, find-up@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "find-up@npm:4.1.0"
-  dependencies:
-    locate-path: "npm:^5.0.0"
-    path-exists: "npm:^4.0.0"
-  checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1
+"jsonc-parser@npm:^3.2.0":
+  version: 3.2.1
+  resolution: "jsonc-parser@npm:3.2.1"
+  checksum: 10c0/ada66dec143d7f9cb0e2d0d29c69e9ce40d20f3a4cb96b0c6efb745025ac7f9ba647d7ac0990d0adfc37a2d2ae084a12009a9c833dbdbeadf648879a99b9df89
   languageName: node
   linkType: hard
 
-"find-up@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "find-up@npm:5.0.0"
+"jsonfile@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "jsonfile@npm:4.0.0"
   dependencies:
-    locate-path: "npm:^6.0.0"
-    path-exists: "npm:^4.0.0"
-  checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a
+    graceful-fs: "npm:^4.1.6"
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^3.0.4":
-  version: 3.2.0
-  resolution: "flat-cache@npm:3.2.0"
+"jsonfile@npm:^6.0.1":
+  version: 6.1.0
+  resolution: "jsonfile@npm:6.1.0"
   dependencies:
-    flatted: "npm:^3.2.9"
-    keyv: "npm:^4.5.3"
-    rimraf: "npm:^3.0.2"
-  checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75
+    graceful-fs: "npm:^4.1.6"
+    universalify: "npm:^2.0.0"
+  dependenciesMeta:
+    graceful-fs:
+      optional: true
+  checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865
   languageName: node
   linkType: hard
 
-"flat@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "flat@npm:5.0.2"
-  bin:
-    flat: cli.js
-  checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe
+"jsonpath@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "jsonpath@npm:1.1.1"
+  dependencies:
+    esprima: "npm:1.2.2"
+    static-eval: "npm:2.0.2"
+    underscore: "npm:1.12.1"
+  checksum: 10c0/4fea3f83bcb4df08c32090ba8a0d1a6d26244f6d19c4296f9b58caa01eeb7de0f8347eba40077ceee2f95acc69d032b0b48226d350339063ba580e87983f6dec
   languageName: node
   linkType: hard
 
-"flatstr@npm:^1.0.12":
-  version: 1.0.12
-  resolution: "flatstr@npm:1.0.12"
-  checksum: 10c0/f99cf801fd3606e8b4aa96b93ec09caab42bc304526ff55a80db03db0ef73c9a014e983a6d72009c4f1bc50e2483d137041fae18a325dc0d851d045c4d6929a9
+"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5":
+  version: 3.3.5
+  resolution: "jsx-ast-utils@npm:3.3.5"
+  dependencies:
+    array-includes: "npm:^3.1.6"
+    array.prototype.flat: "npm:^1.3.1"
+    object.assign: "npm:^4.1.4"
+    object.values: "npm:^1.1.6"
+  checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
   languageName: node
   linkType: hard
 
-"flatted@npm:^3.2.9":
-  version: 3.3.1
-  resolution: "flatted@npm:3.3.1"
-  checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf
+"keyv@npm:^4.5.3":
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
+  dependencies:
+    json-buffer: "npm:3.0.1"
+  checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.15.6":
-  version: 1.15.6
-  resolution: "follow-redirects@npm:1.15.6"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071
+"killable@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "killable@npm:1.0.1"
+  checksum: 10c0/1de0ffe2dd603920685d1b2027136051f095ab42be03e354a43713664e99617cf32cbdb61fc03742c329386d7cf9450edbf4593e50daeaae381e20627b477cd6
   languageName: node
   linkType: hard
 
-"for-each@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "for-each@npm:0.3.3"
+"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
+  version: 3.2.2
+  resolution: "kind-of@npm:3.2.2"
   dependencies:
-    is-callable: "npm:^1.1.3"
-  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+    is-buffer: "npm:^1.1.5"
+  checksum: 10c0/7e34bc29d4b02c997f92f080de34ebb92033a96736bbb0bb2410e033a7e5ae6571f1fa37b2d7710018f95361473b816c604234197f4f203f9cf149d8ef1574d9
   languageName: node
   linkType: hard
 
-"foreground-child@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "foreground-child@npm:3.1.1"
+"kind-of@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "kind-of@npm:4.0.0"
   dependencies:
-    cross-spawn: "npm:^7.0.0"
-    signal-exit: "npm:^4.0.1"
-  checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0
+    is-buffer: "npm:^1.1.5"
+  checksum: 10c0/d6c44c75ee36898142dfc7106afbd50593216c37f96acb81a7ab33ca1a6938ce97d5692b8fc8fccd035f83811a9d97749d68771116441a48eedd0b68e2973165
   languageName: node
   linkType: hard
 
-"form-data@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "form-data@npm:4.0.0"
-  dependencies:
-    asynckit: "npm:^0.4.0"
-    combined-stream: "npm:^1.0.8"
-    mime-types: "npm:^2.1.12"
-  checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e
+"kind-of@npm:^6.0.2":
+  version: 6.0.3
+  resolution: "kind-of@npm:6.0.3"
+  checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
   languageName: node
   linkType: hard
 
-"forwarded@npm:0.2.0":
-  version: 0.2.0
-  resolution: "forwarded@npm:0.2.0"
-  checksum: 10c0/9b67c3fac86acdbc9ae47ba1ddd5f2f81526fa4c8226863ede5600a3f7c7416ef451f6f1e240a3cc32d0fd79fcfe6beb08fd0da454f360032bde70bf80afbb33
+"kleur@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "kleur@npm:3.0.3"
+  checksum: 10c0/cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "fs-minipass@npm:2.1.0"
-  dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
+"klona@npm:^2.0.4":
+  version: 2.0.6
+  resolution: "klona@npm:2.0.6"
+  checksum: 10c0/94eed2c6c2ce99f409df9186a96340558897b3e62a85afdc1ee39103954d2ebe1c1c4e9fe2b0952771771fa96d70055ede8b27962a7021406374fdb695fd4d01
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "fs-minipass@npm:3.0.3"
-  dependencies:
-    minipass: "npm:^7.0.3"
-  checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94
+"language-subtag-registry@npm:^0.3.20":
+  version: 0.3.22
+  resolution: "language-subtag-registry@npm:0.3.22"
+  checksum: 10c0/d1e09971260a7cd3b9fdeb190d33af0b6e99c8697013537d9aaa15f7856d9d83aee128ba8078e219df0a7cf4b8dd18d1a0c188f6543b500d92a2689d2d114b70
   languageName: node
   linkType: hard
 
-"fs.realpath@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs.realpath@npm:1.0.0"
-  checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948
+"language-tags@npm:^1.0.9":
+  version: 1.0.9
+  resolution: "language-tags@npm:1.0.9"
+  dependencies:
+    language-subtag-registry: "npm:^0.3.20"
+  checksum: 10c0/9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
-  version: 2.3.3
-  resolution: "fsevents@npm:2.3.3"
+"last-call-webpack-plugin@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "last-call-webpack-plugin@npm:3.0.0"
   dependencies:
-    node-gyp: "npm:latest"
-  checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60
-  conditions: os=darwin
+    lodash: "npm:^4.17.5"
+    webpack-sources: "npm:^1.1.0"
+  checksum: 10c0/8b5b75d3cefae86418d011fbd67775af74252d0ed6911a1f5477a53815b52eac67027be9c8a6b34655e4d6ce789d458f16e20f7efbcfc10f1421f4dfdf4d121e
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
-  version: 2.3.3
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
-  dependencies:
-    node-gyp: "npm:latest"
-  conditions: os=darwin
+"leven@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "leven@npm:3.1.0"
+  checksum: 10c0/cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "function-bind@npm:1.1.2"
-  checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5
+"levn@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "levn@npm:0.4.1"
+  dependencies:
+    prelude-ls: "npm:^1.2.1"
+    type-check: "npm:~0.4.0"
+  checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "function.prototype.name@npm:1.1.6"
+"levn@npm:~0.3.0":
+  version: 0.3.0
+  resolution: "levn@npm:0.3.0"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    functions-have-names: "npm:^1.2.3"
-  checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b
+    prelude-ls: "npm:~1.1.2"
+    type-check: "npm:~0.3.2"
+  checksum: 10c0/e440df9de4233da0b389cd55bd61f0f6aaff766400bebbccd1231b81801f6dbc1d816c676ebe8d70566394b749fa624b1ed1c68070e9c94999f0bdecc64cb676
   languageName: node
   linkType: hard
 
-"functions-have-names@npm:^1.2.3":
-  version: 1.2.3
-  resolution: "functions-have-names@npm:1.2.3"
-  checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca
+"light-my-request@npm:^4.2.0":
+  version: 4.12.0
+  resolution: "light-my-request@npm:4.12.0"
+  dependencies:
+    ajv: "npm:^8.1.0"
+    cookie: "npm:^0.5.0"
+    process-warning: "npm:^1.0.0"
+    set-cookie-parser: "npm:^2.4.1"
+  checksum: 10c0/d95b9e5bec2fe32ec02d77791c2e5786358f396f27c9c15c97f224e8bb94e357e143f89b67856f20ee2f980136f2c9ac3a934177f8d10b3c184a81c578b00e6f
   languageName: node
   linkType: hard
 
-"gauge@npm:^4.0.3":
-  version: 4.0.4
-  resolution: "gauge@npm:4.0.4"
-  dependencies:
-    aproba: "npm:^1.0.3 || ^2.0.0"
-    color-support: "npm:^1.1.3"
-    console-control-strings: "npm:^1.1.0"
-    has-unicode: "npm:^2.0.1"
-    signal-exit: "npm:^3.0.7"
-    string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
-    wide-align: "npm:^1.1.5"
-  checksum: 10c0/ef10d7981113d69225135f994c9f8c4369d945e64a8fc721d655a3a38421b738c9fe899951721d1b47b73c41fdb5404ac87cc8903b2ecbed95d2800363e7e58c
+"lines-and-columns@npm:^1.1.6":
+  version: 1.2.4
+  resolution: "lines-and-columns@npm:1.2.4"
+  checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
   languageName: node
   linkType: hard
 
-"gensync@npm:^1.0.0-beta.2":
-  version: 1.0.0-beta.2
-  resolution: "gensync@npm:1.0.0-beta.2"
-  checksum: 10c0/782aba6cba65b1bb5af3b095d96249d20edbe8df32dbf4696fd49be2583faf676173bf4809386588828e4dd76a3354fcbeb577bab1c833ccd9fc4577f26103f8
+"loader-runner@npm:^2.4.0":
+  version: 2.4.0
+  resolution: "loader-runner@npm:2.4.0"
+  checksum: 10c0/1f723bd8318453c2d073d7befbf891ba6d2a02f22622688bf7d22e7ba527a0f9476c7fdfedc6bfa2b55c0389d9f406f3a5239ed1b33c9088d77cfed085086a1e
   languageName: node
   linkType: hard
 
-"geometry-interfaces@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "geometry-interfaces@npm:1.1.4"
-  checksum: 10c0/08825b2296cce77ac9f7de01de4e2d3fc4db8ee13b48fd6e52c637ee2f4aba43b0026e16156cf07b6769ca3ec71e0aa4b1c482d8392e5422ad2cc9cd794e14d7
+"loader-runner@npm:^4.2.0":
+  version: 4.3.0
+  resolution: "loader-runner@npm:4.3.0"
+  checksum: 10c0/a44d78aae0907a72f73966fe8b82d1439c8c485238bd5a864b1b9a2a3257832effa858790241e6b37876b5446a78889adf2fcc8dd897ce54c089ecc0a0ce0bf0
   languageName: node
   linkType: hard
 
-"get-caller-file@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "get-caller-file@npm:2.0.5"
-  checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde
+"loader-utils@npm:2.0.0":
+  version: 2.0.0
+  resolution: "loader-utils@npm:2.0.0"
+  dependencies:
+    big.js: "npm:^5.2.2"
+    emojis-list: "npm:^3.0.0"
+    json5: "npm:^2.1.2"
+  checksum: 10c0/206eda981e486a28536b8a142074e0e927aac4c1f61565b2be402f0434f783a6bb0cef241fabec32ce541f28633a85e0beb68abd8fe9227b76b66d717de40550
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "get-intrinsic@npm:1.2.4"
+"loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3, loader-utils@npm:^1.4.0":
+  version: 1.4.2
+  resolution: "loader-utils@npm:1.4.2"
   dependencies:
-    es-errors: "npm:^1.3.0"
-    function-bind: "npm:^1.1.2"
-    has-proto: "npm:^1.0.1"
-    has-symbols: "npm:^1.0.3"
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7
+    big.js: "npm:^5.2.2"
+    emojis-list: "npm:^3.0.0"
+    json5: "npm:^1.0.1"
+  checksum: 10c0/2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53
   languageName: node
   linkType: hard
 
-"get-package-type@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "get-package-type@npm:0.1.0"
-  checksum: 10c0/e34cdf447fdf1902a1f6d5af737eaadf606d2ee3518287abde8910e04159368c268568174b2e71102b87b26c2020486f126bfca9c4fb1ceb986ff99b52ecd1be
+"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "loader-utils@npm:2.0.4"
+  dependencies:
+    big.js: "npm:^5.2.2"
+    emojis-list: "npm:^3.0.0"
+    json5: "npm:^2.1.2"
+  checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
   languageName: node
   linkType: hard
 
-"get-stream@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "get-stream@npm:6.0.1"
-  checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341
+"locate-path@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "locate-path@npm:3.0.0"
+  dependencies:
+    p-locate: "npm:^3.0.0"
+    path-exists: "npm:^3.0.0"
+  checksum: 10c0/3db394b7829a7fe2f4fbdd25d3c4689b85f003c318c5da4052c7e56eed697da8f1bce5294f685c69ff76e32cba7a33629d94396976f6d05fb7f4c755c5e2ae8b
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "get-symbol-description@npm:1.0.2"
+"locate-path@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "locate-path@npm:5.0.0"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    es-errors: "npm:^1.3.0"
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc
+    p-locate: "npm:^4.1.0"
+  checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
   languageName: node
   linkType: hard
 
-"get-tsconfig@npm:^4.7.0":
-  version: 4.7.3
-  resolution: "get-tsconfig@npm:4.7.3"
+"locate-path@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "locate-path@npm:6.0.0"
   dependencies:
-    resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 10c0/b15ca9d5d0887ebfccadc9fe88b6ff3827a5691ec90e7608a5e9c74bef959c14aba62f6bb88ac7f50322395731789a2cf654244f00e10f4f76349911b6846d6f
+    p-locate: "npm:^5.0.0"
+  checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
-  version: 5.1.2
-  resolution: "glob-parent@npm:5.1.2"
-  dependencies:
-    is-glob: "npm:^4.0.1"
-  checksum: 10c0/cab87638e2112bee3f839ef5f6e0765057163d39c66be8ec1602f3823da4692297ad4e972de876ea17c44d652978638d2fd583c6713d0eb6591706825020c9ee
+"lodash._reinterpolate@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "lodash._reinterpolate@npm:3.0.0"
+  checksum: 10c0/cdf592374b5e9eb6d6290a9a07c7d90f6e632cca4949da2a26ae9897ab13f138f3294fd5e81de3e5d997717f6e26c06747a9ad3413c043fd36c0d87504d97da6
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "glob-parent@npm:6.0.2"
-  dependencies:
-    is-glob: "npm:^4.0.3"
-  checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8
+"lodash.debounce@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "lodash.debounce@npm:4.0.8"
+  checksum: 10c0/762998a63e095412b6099b8290903e0a8ddcb353ac6e2e0f2d7e7d03abd4275fe3c689d88960eb90b0dde4f177554d51a690f22a343932ecbc50a5d111849987
   languageName: node
   linkType: hard
 
-"glob-to-regexp@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "glob-to-regexp@npm:0.4.1"
-  checksum: 10c0/0486925072d7a916f052842772b61c3e86247f0a80cc0deb9b5a3e8a1a9faad5b04fb6f58986a09f34d3e96cd2a22a24b7e9882fb1cf904c31e9a310de96c429
+"lodash.memoize@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "lodash.memoize@npm:4.1.2"
+  checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8
   languageName: node
   linkType: hard
 
-"glob@npm:^10.2.2, glob@npm:^10.3.10":
-  version: 10.3.12
-  resolution: "glob@npm:10.3.12"
-  dependencies:
-    foreground-child: "npm:^3.1.0"
-    jackspeak: "npm:^2.3.6"
-    minimatch: "npm:^9.0.1"
-    minipass: "npm:^7.0.4"
-    path-scurry: "npm:^1.10.2"
-  bin:
-    glob: dist/esm/bin.mjs
-  checksum: 10c0/f60cefdc1cf3f958b2bb5823e1b233727f04916d489dc4641d76914f016e6704421e06a83cbb68b0cb1cb9382298b7a88075b844ad2127fc9727ea22b18b0711
+"lodash.merge@npm:^4.6.2":
+  version: 4.6.2
+  resolution: "lodash.merge@npm:4.6.2"
+  checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
   languageName: node
   linkType: hard
 
-"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
+"lodash.template@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.template@npm:4.5.0"
   dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^3.1.1"
-    once: "npm:^1.3.0"
-    path-is-absolute: "npm:^1.0.0"
-  checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe
+    lodash._reinterpolate: "npm:^3.0.0"
+    lodash.templatesettings: "npm:^4.0.0"
+  checksum: 10c0/62a02b397f72542fa9a989d9fc1a94fc1cb94ced8009fa5c37956746c0cf460279e844126c2abfbf7e235fe27e8b7ee8e6efbf6eac247a06aa05b05457fda817
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1":
-  version: 8.1.0
-  resolution: "glob@npm:8.1.0"
+"lodash.templatesettings@npm:^4.0.0":
+  version: 4.2.0
+  resolution: "lodash.templatesettings@npm:4.2.0"
   dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^5.0.1"
-    once: "npm:^1.3.0"
-  checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f
+    lodash._reinterpolate: "npm:^3.0.0"
+  checksum: 10c0/2609fea36ed061114dfed701666540efc978b069b2106cd819b415759ed281419893d40f85825240197f1a38a98e846f2452e2d31c6d5ccee1e006c9de820622
   languageName: node
   linkType: hard
 
-"globals@npm:^11.1.0":
-  version: 11.12.0
-  resolution: "globals@npm:11.12.0"
-  checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
+"lodash.truncate@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "lodash.truncate@npm:4.4.2"
+  checksum: 10c0/4e870d54e8a6c86c8687e057cec4069d2e941446ccab7f40b4d9555fa5872d917d0b6aa73bece7765500a3123f1723bcdba9ae881b679ef120bba9e1a0b0ed70
   languageName: node
   linkType: hard
 
-"globals@npm:^13.19.0":
-  version: 13.24.0
-  resolution: "globals@npm:13.24.0"
-  dependencies:
-    type-fest: "npm:^0.20.2"
-  checksum: 10c0/d3c11aeea898eb83d5ec7a99508600fbe8f83d2cf00cbb77f873dbf2bcb39428eff1b538e4915c993d8a3b3473fa71eeebfe22c9bb3a3003d1e26b1f2c8a42cd
+"lodash.uniq@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.uniq@npm:4.5.0"
+  checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e
   languageName: node
   linkType: hard
 
-"globalthis@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "globalthis@npm:1.0.3"
-  dependencies:
-    define-properties: "npm:^1.1.3"
-  checksum: 10c0/0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0
+"lodash@npm:>=3.5 <5, lodash@npm:^4.17.10, lodash@npm:^4.17.11, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5, lodash@npm:^4.7.0":
+  version: 4.17.21
+  resolution: "lodash@npm:4.17.21"
+  checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
   languageName: node
   linkType: hard
 
-"globby@npm:^11.1.0":
-  version: 11.1.0
-  resolution: "globby@npm:11.1.0"
+"loglevel@npm:^1.6.8":
+  version: 1.9.1
+  resolution: "loglevel@npm:1.9.1"
+  checksum: 10c0/152f0501cea367cf998c844a38b19f0b5af555756ad7d8650214a1f8c6a5b045e31b8cf5dae27d28339a061624ce3f618aadb333aed386cac041d6ddc5101a39
+  languageName: node
+  linkType: hard
+
+"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "loose-envify@npm:1.4.0"
   dependencies:
-    array-union: "npm:^2.1.0"
-    dir-glob: "npm:^3.0.1"
-    fast-glob: "npm:^3.2.9"
-    ignore: "npm:^5.2.0"
-    merge2: "npm:^1.4.1"
-    slash: "npm:^3.0.0"
-  checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189
+    js-tokens: "npm:^3.0.0 || ^4.0.0"
+  bin:
+    loose-envify: cli.js
+  checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
   languageName: node
   linkType: hard
 
-"gopd@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "gopd@npm:1.0.1"
+"lower-case@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "lower-case@npm:2.0.2"
   dependencies:
-    get-intrinsic: "npm:^1.1.3"
-  checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/3d925e090315cf7dc1caa358e0477e186ffa23947740e4314a7429b6e62d72742e0bbe7536a5ae56d19d7618ce998aba05caca53c2902bd5742fdca5fc57fd7b
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
-  version: 4.2.11
-  resolution: "graceful-fs@npm:4.2.11"
-  checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2
+"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "lru-cache@npm:10.2.0"
+  checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
   languageName: node
   linkType: hard
 
-"graphemer@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "graphemer@npm:1.4.0"
-  checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31
+"lru-cache@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "lru-cache@npm:5.1.1"
+  dependencies:
+    yallist: "npm:^3.0.2"
+  checksum: 10c0/89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
   languageName: node
   linkType: hard
 
-"gzip-size@npm:^6.0.0":
+"lru-cache@npm:^6.0.0":
   version: 6.0.0
-  resolution: "gzip-size@npm:6.0.0"
+  resolution: "lru-cache@npm:6.0.0"
   dependencies:
-    duplexer: "npm:^0.1.2"
-  checksum: 10c0/4ccb924626c82125897a997d1c84f2377846a6ef57fbee38f7c0e6b41387fba4d00422274440747b58008b5d60114bac2349c2908e9aba55188345281af40a3f
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.7.7":
-  version: 4.7.8
-  resolution: "handlebars@npm:4.7.8"
-  dependencies:
-    minimist: "npm:^1.2.5"
-    neo-async: "npm:^2.6.2"
-    source-map: "npm:^0.6.1"
-    uglify-js: "npm:^3.1.4"
-    wordwrap: "npm:^1.0.0"
-  dependenciesMeta:
-    uglify-js:
-      optional: true
-  bin:
-    handlebars: bin/handlebars
-  checksum: 10c0/7aff423ea38a14bb379316f3857fe0df3c5d66119270944247f155ba1f08e07a92b340c58edaa00cfe985c21508870ee5183e0634dcb53dd405f35c93ef7f10d
+"lru-cache@npm:^7.7.1":
+  version: 7.18.3
+  resolution: "lru-cache@npm:7.18.3"
+  checksum: 10c0/b3a452b491433db885beed95041eb104c157ef7794b9c9b4d647be503be91769d11206bb573849a16b4cc0d03cbd15ffd22df7960997788b74c1d399ac7a4fed
   languageName: node
   linkType: hard
 
-"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-bigints@npm:1.0.2"
-  checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b
+"lru-queue@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "lru-queue@npm:0.1.0"
+  dependencies:
+    es5-ext: "npm:~0.10.2"
+  checksum: 10c0/83517032b46843601c4528be65e8aaf85f5a7860a9cfa3e4f2b5591da436e7cd748d95b450c91434c4ffb75d3ae4c069ddbdd9f71ada56a99a00c03088c51b4d
   languageName: node
   linkType: hard
 
-"has-flag@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "has-flag@npm:3.0.0"
-  checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473
+"lz-string@npm:^1.4.4":
+  version: 1.5.0
+  resolution: "lz-string@npm:1.5.0"
+  bin:
+    lz-string: bin/bin.js
+  checksum: 10c0/36128e4de34791838abe979b19927c26e67201ca5acf00880377af7d765b38d1c60847e01c5ec61b1a260c48029084ab3893a3925fd6e48a04011364b089991b
   languageName: node
   linkType: hard
 
-"has-flag@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "has-flag@npm:4.0.0"
-  checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1
+"magic-string@npm:^0.25.0, magic-string@npm:^0.25.7":
+  version: 0.25.9
+  resolution: "magic-string@npm:0.25.9"
+  dependencies:
+    sourcemap-codec: "npm:^1.4.8"
+  checksum: 10c0/37f5e01a7e8b19a072091f0b45ff127cda676232d373ce2c551a162dd4053c575ec048b9cbb4587a1f03adb6c5d0fd0dd49e8ab070cd2c83a4992b2182d9cb56
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-property-descriptors@npm:1.0.2"
+"make-dir@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "make-dir@npm:2.1.0"
   dependencies:
-    es-define-property: "npm:^1.0.0"
-  checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236
+    pify: "npm:^4.0.1"
+    semver: "npm:^5.6.0"
+  checksum: 10c0/ada869944d866229819735bee5548944caef560d7a8536ecbc6536edca28c72add47cc4f6fc39c54fb25d06b58da1f8994cf7d9df7dadea047064749efc085d8
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-proto@npm:1.0.3"
-  checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205
+"make-dir@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "make-dir@npm:3.1.0"
+  dependencies:
+    semver: "npm:^6.0.0"
+  checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa
   languageName: node
   linkType: hard
 
-"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has-symbols@npm:1.0.3"
-  checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
+  dependencies:
+    semver: "npm:^7.5.3"
+  checksum: 10c0/69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "has-tostringtag@npm:1.0.2"
+"make-fetch-happen@npm:^10.0.3":
+  version: 10.2.1
+  resolution: "make-fetch-happen@npm:10.2.1"
   dependencies:
-    has-symbols: "npm:^1.0.3"
-  checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c
+    agentkeepalive: "npm:^4.2.1"
+    cacache: "npm:^16.1.0"
+    http-cache-semantics: "npm:^4.1.0"
+    http-proxy-agent: "npm:^5.0.0"
+    https-proxy-agent: "npm:^5.0.0"
+    is-lambda: "npm:^1.0.1"
+    lru-cache: "npm:^7.7.1"
+    minipass: "npm:^3.1.6"
+    minipass-collect: "npm:^1.0.2"
+    minipass-fetch: "npm:^2.0.3"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    socks-proxy-agent: "npm:^7.0.0"
+    ssri: "npm:^9.0.0"
+  checksum: 10c0/28ec392f63ab93511f400839dcee83107eeecfaad737d1e8487ea08b4332cd89a8f3319584222edd9f6f1d0833cf516691469496d46491863f9e88c658013949
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "has-unicode@npm:2.0.1"
-  checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "make-fetch-happen@npm:13.0.0"
+  dependencies:
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
+    http-cache-semantics: "npm:^4.1.1"
+    is-lambda: "npm:^1.0.1"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    promise-retry: "npm:^2.0.1"
+    ssri: "npm:^10.0.0"
+  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "hasown@npm:2.0.2"
+"makeerror@npm:1.0.12":
+  version: 1.0.12
+  resolution: "makeerror@npm:1.0.12"
   dependencies:
-    function-bind: "npm:^1.1.2"
-  checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9
+    tmpl: "npm:1.0.5"
+  checksum: 10c0/b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
   languageName: node
   linkType: hard
 
-"header-case@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "header-case@npm:2.0.4"
+"map-cache@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "map-cache@npm:0.2.2"
+  checksum: 10c0/05e3eb005c1b80b9f949ca007687640e8c5d0fc88dc45c3c3ab4902a3bec79d66a58f3e3b04d6985d90cd267c629c7b46c977e9c34433e8c11ecfcbb9f0fa290
+  languageName: node
+  linkType: hard
+
+"map-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "map-visit@npm:1.0.0"
   dependencies:
-    capital-case: "npm:^1.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/c9f295d9d8e38fa50679281fd70d80726962256e888a76c8e72e526453da7a1832dcb427caa716c1ad5d79841d4537301b90156fa30298fefd3d68f4ea2181bb
+    object-visit: "npm:^1.0.0"
+  checksum: 10c0/fb3475e5311939a6147e339999113db607adc11c7c3cd3103e5e9dbf502898416ecba6b1c7c649c6d4d12941de00cee58b939756bdf20a9efe7d4fa5a5738b73
   languageName: node
   linkType: hard
 
-"highlight.js@npm:^11.9.0":
-  version: 11.9.0
-  resolution: "highlight.js@npm:11.9.0"
-  checksum: 10c0/27cfa8717dc9d200aecbdb383eb122d5f45ce715d2f468583785d36fbfe5076ce033abb02486dc13b407171721cda6f474ed3f3a5a8e8c3d91367fa5f51ee374
+"marked@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "marked@npm:4.3.0"
+  bin:
+    marked: bin/marked.js
+  checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "html-encoding-sniffer@npm:3.0.0"
+"md5.js@npm:^1.3.4":
+  version: 1.3.5
+  resolution: "md5.js@npm:1.3.5"
   dependencies:
-    whatwg-encoding: "npm:^2.0.0"
-  checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386
+    hash-base: "npm:^3.0.0"
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.1.2"
+  checksum: 10c0/b7bd75077f419c8e013fc4d4dada48be71882e37d69a44af65a2f2804b91e253441eb43a0614423a1c91bb830b8140b0dc906bc797245e2e275759584f4efcc5
   languageName: node
   linkType: hard
 
-"html-escaper@npm:^2.0.0, html-escaper@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "html-escaper@npm:2.0.2"
-  checksum: 10c0/208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
+"mdn-data@npm:2.0.14":
+  version: 2.0.14
+  resolution: "mdn-data@npm:2.0.14"
+  checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.1.0, http-cache-semantics@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "http-cache-semantics@npm:4.1.1"
-  checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc
+"mdn-data@npm:2.0.4":
+  version: 2.0.4
+  resolution: "mdn-data@npm:2.0.4"
+  checksum: 10c0/a935c4530b938407481f7d0ccb82119ae618d9c673d2ee78bb10dcba8bd0ccbe2e2c7fe850ddc60b67e08f4c9d97f50b900993f6c2f2926e64a52ed6baa00b3a
   languageName: node
   linkType: hard
 
-"http-errors@npm:2.0.0":
-  version: 2.0.0
-  resolution: "http-errors@npm:2.0.0"
-  dependencies:
-    depd: "npm:2.0.0"
-    inherits: "npm:2.0.4"
-    setprototypeof: "npm:1.2.0"
-    statuses: "npm:2.0.1"
-    toidentifier: "npm:1.0.1"
-  checksum: 10c0/fc6f2715fe188d091274b5ffc8b3657bd85c63e969daa68ccb77afb05b071a4b62841acb7a21e417b5539014dff2ebf9550f0b14a9ff126f2734a7c1387f8e19
+"media-typer@npm:0.3.0":
+  version: 0.3.0
+  resolution: "media-typer@npm:0.3.0"
+  checksum: 10c0/d160f31246907e79fed398470285f21bafb45a62869dc469b1c8877f3f064f5eabc4bcc122f9479b8b605bc5c76187d7871cf84c4ee3ecd3e487da1993279928
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "http-proxy-agent@npm:5.0.0"
+"memoizee@npm:^0.4.15":
+  version: 0.4.15
+  resolution: "memoizee@npm:0.4.15"
   dependencies:
-    "@tootallnate/once": "npm:2"
-    agent-base: "npm:6"
-    debug: "npm:4"
-  checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32
+    d: "npm:^1.0.1"
+    es5-ext: "npm:^0.10.53"
+    es6-weak-map: "npm:^2.0.3"
+    event-emitter: "npm:^0.3.5"
+    is-promise: "npm:^2.2.2"
+    lru-queue: "npm:^0.1.0"
+    next-tick: "npm:^1.1.0"
+    timers-ext: "npm:^0.1.7"
+  checksum: 10c0/297e65cd8256bdf24c48f5e158da80d4c9688db0d6e65c5dcc13fa768e782ddeb71aec36925359931b5efef0efc6666b5bb2af6deb3de63d4258a3821ed16fce
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "http-proxy-agent@npm:7.0.2"
+"memory-fs@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "memory-fs@npm:0.4.1"
   dependencies:
-    agent-base: "npm:^7.1.0"
-    debug: "npm:^4.3.4"
-  checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921
+    errno: "npm:^0.1.3"
+    readable-stream: "npm:^2.0.1"
+  checksum: 10c0/f114c44ad8285103cb0e71420cf5bb628d3eb6cbd918197f5951590ff56ba2072f4a97924949c170320cdf180d2da4e8d16a0edd92ba0ca2d2de51dc932841e2
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "https-proxy-agent@npm:5.0.1"
+"memory-fs@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "memory-fs@npm:0.5.0"
   dependencies:
-    agent-base: "npm:6"
-    debug: "npm:4"
-  checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
+    errno: "npm:^0.1.3"
+    readable-stream: "npm:^2.0.1"
+  checksum: 10c0/2737a27b14a9e8b8cd757be2ad99e8cc504b78a78aba9d6aa18ff1ef528e2223a433413d2df6ab5332997a5a8ccf075e6c6e90e31ab732a55455ca620e4a720b
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1":
-  version: 7.0.4
-  resolution: "https-proxy-agent@npm:7.0.4"
-  dependencies:
-    agent-base: "npm:^7.0.2"
-    debug: "npm:4"
-  checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b
+"merge-descriptors@npm:1.0.1":
+  version: 1.0.1
+  resolution: "merge-descriptors@npm:1.0.1"
+  checksum: 10c0/b67d07bd44cfc45cebdec349bb6e1f7b077ee2fd5beb15d1f7af073849208cb6f144fe403e29a36571baf3f4e86469ac39acf13c318381e958e186b2766f54ec
   languageName: node
   linkType: hard
 
-"human-signals@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "human-signals@npm:2.1.0"
-  checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a
+"merge-stream@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "merge-stream@npm:2.0.0"
+  checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
   languageName: node
   linkType: hard
 
-"humanize-ms@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "humanize-ms@npm:1.2.1"
-  dependencies:
-    ms: "npm:^2.0.0"
-  checksum: 10c0/f34a2c20161d02303c2807badec2f3b49cbfbbb409abd4f95a07377ae01cfe6b59e3d15ac609cffcd8f2521f0eb37b7e1091acf65da99aa2a4f1ad63c21e7e7a
+"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "merge2@npm:1.4.1"
+  checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
-  version: 0.6.3
-  resolution: "iconv-lite@npm:0.6.3"
+"methods@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "methods@npm:1.1.2"
+  checksum: 10c0/bdf7cc72ff0a33e3eede03708c08983c4d7a173f91348b4b1e4f47d4cdbf734433ad971e7d1e8c77247d9e5cd8adb81ea4c67b0a2db526b758b2233d7814b8b2
+  languageName: node
+  linkType: hard
+
+"microbuffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "microbuffer@npm:1.0.0"
+  checksum: 10c0/b4615ba2f61bf30d7c1a2eeef0d6bea8acbbe92bfb300024fbf62ba3b5d553eb4bae75642dbc8d995f43a10066e126d76ac62fd5543c0026bcecc2d895efdbb2
+  languageName: node
+  linkType: hard
+
+"microevent.ts@npm:~0.1.1":
+  version: 0.1.1
+  resolution: "microevent.ts@npm:0.1.1"
+  checksum: 10c0/1f18f23ebebf155d3f480b1414cec7667a477a09ced2c60705b204cfaba82cbecc76169d890b9a675f237cb1a5497ba744ca8619a65802ac6765148a05bb6bf4
+  languageName: node
+  linkType: hard
+
+"micromatch@npm:^3.1.10, micromatch@npm:^3.1.4":
+  version: 3.1.10
+  resolution: "micromatch@npm:3.1.10"
   dependencies:
-    safer-buffer: "npm:>= 2.1.2 < 3.0.0"
-  checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    braces: "npm:^2.3.1"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    extglob: "npm:^2.0.4"
+    fragment-cache: "npm:^0.2.1"
+    kind-of: "npm:^6.0.2"
+    nanomatch: "npm:^1.2.9"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.2"
+  checksum: 10c0/531a32e7ac92bef60657820202be71b63d0f945c08a69cc4c239c0b19372b751483d464a850a2e3a5ff6cc9060641e43d44c303af104c1a27493d137d8af017f
   languageName: node
   linkType: hard
 
-"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "icss-utils@npm:5.1.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d
+"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "micromatch@npm:4.0.5"
+  dependencies:
+    braces: "npm:^3.0.2"
+    picomatch: "npm:^2.3.1"
+  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0":
-  version: 5.3.1
-  resolution: "ignore@npm:5.3.1"
-  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+"miller-rabin@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "miller-rabin@npm:4.0.1"
+  dependencies:
+    bn.js: "npm:^4.0.0"
+    brorand: "npm:^1.0.1"
+  bin:
+    miller-rabin: bin/miller-rabin
+  checksum: 10c0/26b2b96f6e49dbcff7faebb78708ed2f5f9ae27ac8cbbf1d7c08f83cf39bed3d418c0c11034dce997da70d135cc0ff6f3a4c15dc452f8e114c11986388a64346
   languageName: node
   linkType: hard
 
-"immutable@npm:^4.0.0":
-  version: 4.3.5
-  resolution: "immutable@npm:4.3.5"
-  checksum: 10c0/63d2d7908241a955d18c7822fd2215b6e89ff5a1a33cc72cd475b013cbbdef7a705aa5170a51ce9f84a57f62fdddfaa34e7b5a14b33d8a43c65cc6a881d6e894
+"mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
+  version: 1.52.0
+  resolution: "mime-db@npm:1.52.0"
+  checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.2.1":
-  version: 3.3.0
-  resolution: "import-fresh@npm:3.3.0"
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+  version: 2.1.35
+  resolution: "mime-types@npm:2.1.35"
   dependencies:
-    parent-module: "npm:^1.0.0"
-    resolve-from: "npm:^4.0.0"
-  checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3
+    mime-db: "npm:1.52.0"
+  checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
   languageName: node
   linkType: hard
 
-"import-local@npm:^3.0.2":
-  version: 3.1.0
-  resolution: "import-local@npm:3.1.0"
-  dependencies:
-    pkg-dir: "npm:^4.2.0"
-    resolve-cwd: "npm:^3.0.0"
+"mime@npm:1.6.0":
+  version: 1.6.0
+  resolution: "mime@npm:1.6.0"
   bin:
-    import-local-fixture: fixtures/cli.js
-  checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2
+    mime: cli.js
+  checksum: 10c0/b92cd0adc44888c7135a185bfd0dddc42c32606401c72896a842ae15da71eb88858f17669af41e498b463cd7eb998f7b48939a25b08374c7924a9c8a6f8a81b0
   languageName: node
   linkType: hard
 
-"imurmurhash@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "imurmurhash@npm:0.1.4"
-  checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6
+"mime@npm:^2.4.4":
+  version: 2.6.0
+  resolution: "mime@npm:2.6.0"
+  bin:
+    mime: cli.js
+  checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c
   languageName: node
   linkType: hard
 
-"indent-string@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "indent-string@npm:4.0.0"
-  checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f
+"mime@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mime@npm:3.0.0"
+  bin:
+    mime: cli.js
+  checksum: 10c0/402e792a8df1b2cc41cb77f0dcc46472b7944b7ec29cb5bbcd398624b6b97096728f1239766d3fdeb20551dd8d94738344c195a6ea10c4f906eb0356323b0531
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 10c0/a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9
+"mimic-fn@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "mimic-fn@npm:2.1.0"
+  checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
   languageName: node
   linkType: hard
 
-"inflight@npm:^1.0.4":
-  version: 1.0.6
-  resolution: "inflight@npm:1.0.6"
-  dependencies:
-    once: "npm:^1.3.0"
-    wrappy: "npm:1"
-  checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2
+"min-indent@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "min-indent@npm:1.0.1"
+  checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:~2.0.1":
-  version: 2.0.4
-  resolution: "inherits@npm:2.0.4"
-  checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2
+"mini-css-extract-plugin@npm:0.11.3":
+  version: 0.11.3
+  resolution: "mini-css-extract-plugin@npm:0.11.3"
+  dependencies:
+    loader-utils: "npm:^1.1.0"
+    normalize-url: "npm:1.9.1"
+    schema-utils: "npm:^1.0.0"
+    webpack-sources: "npm:^1.1.0"
+  peerDependencies:
+    webpack: ^4.4.0 || ^5.0.0
+  checksum: 10c0/a2eda5d3d8508ec1036bfaa9d146391af07b1e933d06fd133409374a1203dbcb18d0dad128696e890369456d5e42acbe10ce011cf491a3476dabf3639e31815c
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "internal-slot@npm:1.0.7"
+"mini-css-extract-plugin@npm:^2.8.1":
+  version: 2.8.1
+  resolution: "mini-css-extract-plugin@npm:2.8.1"
   dependencies:
-    es-errors: "npm:^1.3.0"
-    hasown: "npm:^2.0.0"
-    side-channel: "npm:^1.0.4"
-  checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c
+    schema-utils: "npm:^4.0.0"
+    tapable: "npm:^2.2.1"
+  peerDependencies:
+    webpack: ^5.0.0
+  checksum: 10c0/ef0064f32051294e76141ba74ddf139d313ba26f3abcef1a3906347ca75df8e69c490351bd4c2f373b0cf5c934f39c7d643c8615421c24e4d2c724345294f80a
   languageName: node
   linkType: hard
 
-"interpret@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "interpret@npm:3.1.1"
-  checksum: 10c0/6f3c4d0aa6ec1b43a8862375588a249e3c917739895cbe67fe12f0a76260ea632af51e8e2431b50fbcd0145356dc28ca147be08dbe6a523739fd55c0f91dc2a5
+"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "minimalistic-assert@npm:1.0.1"
+  checksum: 10c0/96730e5601cd31457f81a296f521eb56036e6f69133c0b18c13fe941109d53ad23a4204d946a0d638d7f3099482a0cec8c9bb6d642604612ce43ee536be3dddd
   languageName: node
   linkType: hard
 
-"ip-address@npm:^9.0.5":
-  version: 9.0.5
-  resolution: "ip-address@npm:9.0.5"
-  dependencies:
-    jsbn: "npm:1.1.0"
-    sprintf-js: "npm:^1.1.3"
-  checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc
+"minimalistic-crypto-utils@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "minimalistic-crypto-utils@npm:1.0.1"
+  checksum: 10c0/790ecec8c5c73973a4fbf2c663d911033e8494d5fb0960a4500634766ab05d6107d20af896ca2132e7031741f19888154d44b2408ada0852446705441383e9f8
   languageName: node
   linkType: hard
 
-"ipaddr.js@npm:1.9.1":
-  version: 1.9.1
-  resolution: "ipaddr.js@npm:1.9.1"
-  checksum: 10c0/0486e775047971d3fdb5fb4f063829bac45af299ae0b82dcf3afa2145338e08290563a2a70f34b732d795ecc8311902e541a8530eeb30d75860a78ff4e94ce2a
+"minimatch@npm:3.0.4":
+  version: 3.0.4
+  resolution: "minimatch@npm:3.0.4"
+  dependencies:
+    brace-expansion: "npm:^1.1.7"
+  checksum: 10c0/d0a2bcd93ebec08a9eef3ca83ba33c9fb6feb93932e0b4dc6aa46c5f37a9404bea7ad9ff7cafe23ce6634f1fe3b206f5315ecbb05812da6e692c21d8ecfd3dae
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "is-array-buffer@npm:3.0.4"
+"minimatch@npm:9.0.3":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.2.1"
-  checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
   languageName: node
   linkType: hard
 
-"is-arrayish@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "is-arrayish@npm:0.2.1"
-  checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729
+"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "minimatch@npm:3.1.2"
+  dependencies:
+    brace-expansion: "npm:^1.1.7"
+  checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
   languageName: node
   linkType: hard
 
-"is-async-function@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-async-function@npm:2.0.0"
+"minimatch@npm:^5.0.1":
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
   languageName: node
   linkType: hard
 
-"is-bigint@npm:^1.0.1":
-  version: 1.0.4
-  resolution: "is-bigint@npm:1.0.4"
+"minimatch@npm:^9.0.1":
+  version: 9.0.4
+  resolution: "minimatch@npm:9.0.4"
   dependencies:
-    has-bigints: "npm:^1.0.1"
-  checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
   languageName: node
   linkType: hard
 
-"is-binary-path@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "is-binary-path@npm:2.1.0"
-  dependencies:
-    binary-extensions: "npm:^2.0.0"
-  checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
+"minimist@npm:^1.1.1, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
+  version: 1.2.8
+  resolution: "minimist@npm:1.2.8"
+  checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
   languageName: node
   linkType: hard
 
-"is-boolean-object@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "is-boolean-object@npm:1.1.2"
+"minipass-collect@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "minipass-collect@npm:1.0.2"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
-  version: 1.2.7
-  resolution: "is-callable@npm:1.2.7"
-  checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0":
-  version: 2.13.1
-  resolution: "is-core-module@npm:2.13.1"
+"minipass-fetch@npm:^2.0.3":
+  version: 2.1.2
+  resolution: "minipass-fetch@npm:2.1.2"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^3.1.6"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 10c0/33ab2c5bdb3d91b9cb8bc6ae42d7418f4f00f7f7beae14b3bb21ea18f9224e792f560a6e17b6f1be12bbeb70dbe99a269f4204c60e5d99130a0777b153505c43
   languageName: node
   linkType: hard
 
-"is-data-view@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-data-view@npm:1.0.1"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
   dependencies:
-    is-typed-array: "npm:^1.1.13"
-  checksum: 10c0/a3e6ec84efe303da859107aed9b970e018e2bee7ffcb48e2f8096921a493608134240e672a2072577e5f23a729846241d9634806e8a0e51d9129c56d5f65442d
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^7.0.3"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
   languageName: node
   linkType: hard
 
-"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
+"minipass-flush@npm:^1.0.5":
   version: 1.0.5
-  resolution: "is-date-object@npm:1.0.5"
+  resolution: "minipass-flush@npm:1.0.5"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
   languageName: node
   linkType: hard
 
-"is-extglob@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "is-extglob@npm:2.1.1"
-  checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912
+"minipass-pipeline@npm:^1.2.2, minipass-pipeline@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "minipass-pipeline@npm:1.2.4"
+  dependencies:
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
   languageName: node
   linkType: hard
 
-"is-finalizationregistry@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-finalizationregistry@npm:1.0.2"
+"minipass-sized@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "minipass-sized@npm:1.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86
+    minipass: "npm:^3.0.0"
+  checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
   languageName: node
   linkType: hard
 
-"is-fullwidth-code-point@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "is-fullwidth-code-point@npm:3.0.0"
-  checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc
+"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
+  version: 3.3.6
+  resolution: "minipass@npm:3.3.6"
+  dependencies:
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
   languageName: node
   linkType: hard
 
-"is-generator-fn@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "is-generator-fn@npm:2.1.0"
-  checksum: 10c0/2957cab387997a466cd0bf5c1b6047bd21ecb32bdcfd8996b15747aa01002c1c88731802f1b3d34ac99f4f6874b626418bd118658cf39380fe5fff32a3af9c4d
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
   languageName: node
   linkType: hard
 
-"is-generator-function@npm:^1.0.10":
-  version: 1.0.10
-  resolution: "is-generator-function@npm:1.0.10"
-  dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
   languageName: node
   linkType: hard
 
-"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
-  version: 4.0.3
-  resolution: "is-glob@npm:4.0.3"
+"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "minizlib@npm:2.1.2"
   dependencies:
-    is-extglob: "npm:^2.1.1"
-  checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a
-  languageName: node
-  linkType: hard
-
-"is-lambda@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-lambda@npm:1.0.1"
-  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
+    minipass: "npm:^3.0.0"
+    yallist: "npm:^4.0.0"
+  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "is-map@npm:2.0.3"
-  checksum: 10c0/2c4d431b74e00fdda7162cd8e4b763d6f6f217edf97d4f8538b94b8702b150610e2c64961340015fe8df5b1fcee33ccd2e9b62619c4a8a3a155f8de6d6d355fc
+"mississippi@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mississippi@npm:3.0.0"
+  dependencies:
+    concat-stream: "npm:^1.5.0"
+    duplexify: "npm:^3.4.2"
+    end-of-stream: "npm:^1.1.0"
+    flush-write-stream: "npm:^1.0.0"
+    from2: "npm:^2.1.0"
+    parallel-transform: "npm:^1.1.0"
+    pump: "npm:^3.0.0"
+    pumpify: "npm:^1.3.3"
+    stream-each: "npm:^1.1.0"
+    through2: "npm:^2.0.0"
+  checksum: 10c0/97424a331ce1b9f789a0d3fa47d725dad9adfe5e0ead8bc458ba9fb51c4d2630df6b0966ca9dcbb4c90db48737d58126cbf0e3c170697bf41c265606efa91103
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "is-negative-zero@npm:2.0.3"
-  checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
+"mixin-deep@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "mixin-deep@npm:1.3.2"
+  dependencies:
+    for-in: "npm:^1.0.2"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10c0/cb39ffb73c377222391af788b4c83d1a6cecb2d9fceb7015384f8deb46e151a9b030c21ef59a79cb524d4557e3f74c7248ab948a62a6e7e296b42644863d183b
   languageName: node
   linkType: hard
 
-"is-number-object@npm:^1.0.4":
-  version: 1.0.7
-  resolution: "is-number-object@npm:1.0.7"
+"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.6, mkdirp@npm:~0.5.1":
+  version: 0.5.6
+  resolution: "mkdirp@npm:0.5.6"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b
+    minimist: "npm:^1.2.6"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: 10c0/e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01
   languageName: node
   linkType: hard
 
-"is-number@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "is-number@npm:7.0.0"
-  checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811
+"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "mkdirp@npm:1.0.4"
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
   languageName: node
   linkType: hard
 
-"is-path-inside@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "is-path-inside@npm:3.0.3"
-  checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05
+"move-concurrently@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "move-concurrently@npm:1.0.1"
+  dependencies:
+    aproba: "npm:^1.1.1"
+    copy-concurrently: "npm:^1.0.0"
+    fs-write-stream-atomic: "npm:^1.0.8"
+    mkdirp: "npm:^0.5.1"
+    rimraf: "npm:^2.5.4"
+    run-queue: "npm:^1.0.3"
+  checksum: 10c0/0fe81acf3bbbc322013c2f4ee4a48cf8d180a7d925fb9284c0f1f444e862d7eb0421ee074b68d35357a12f0d5e94a322049dc9da480672331b5b8895743eb66a
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "is-plain-object@npm:2.0.4"
-  dependencies:
-    isobject: "npm:^3.0.1"
-  checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4
+"mrmime@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mrmime@npm:2.0.0"
+  checksum: 10c0/312b35ed288986aec90955410b21ed7427fd1e4ee318cb5fc18765c8d029eeded9444faa46589e5b1ed6b35fb2054a802ac8dcb917ddf6b3e189cb3bf11a965c
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "is-plain-object@npm:5.0.0"
-  checksum: 10c0/893e42bad832aae3511c71fd61c0bf61aa3a6d853061c62a307261842727d0d25f761ce9379f7ba7226d6179db2a3157efa918e7fe26360f3bf0842d9f28942c
+"ms@npm:2.0.0":
+  version: 2.0.0
+  resolution: "ms@npm:2.0.0"
+  checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d
   languageName: node
   linkType: hard
 
-"is-potential-custom-element-name@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9
+"ms@npm:2.1.2":
+  version: 2.1.2
+  resolution: "ms@npm:2.1.2"
+  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
   languageName: node
   linkType: hard
 
-"is-promise@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "is-promise@npm:2.2.2"
-  checksum: 10c0/2dba959812380e45b3df0fb12e7cb4d4528c989c7abb03ececb1d1fd6ab1cbfee956ca9daa587b9db1d8ac3c1e5738cf217bdb3dfd99df8c691be4c00ae09069
+"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
+  version: 2.1.3
+  resolution: "ms@npm:2.1.3"
+  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
   languageName: node
   linkType: hard
 
-"is-regex@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "is-regex@npm:1.1.4"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1
+"multicast-dns-service-types@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "multicast-dns-service-types@npm:1.1.0"
+  checksum: 10c0/25abc0e9ee509f38d874e22b03d563b16009d3976760d29bed25bf70ea992cfe30b0403743f49342279c67178a03311d31ecc1ec54bf79af2e6fe55f11af2660
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "is-set@npm:2.0.3"
-  checksum: 10c0/f73732e13f099b2dc879c2a12341cfc22ccaca8dd504e6edae26484bd5707a35d503fba5b4daad530a9b088ced1ae6c9d8200fd92e09b428fe14ea79ce8080b7
+"multicast-dns@npm:^6.0.1":
+  version: 6.2.3
+  resolution: "multicast-dns@npm:6.2.3"
+  dependencies:
+    dns-packet: "npm:^1.3.1"
+    thunky: "npm:^1.0.2"
+  bin:
+    multicast-dns: cli.js
+  checksum: 10c0/972fc50869e922d80d66eeb91ad39fd2e107241e0c791fc914e76578e4f7f3dfe3bf007020dd4d7ed4d0ffd69d9aa2238a9f8bbb4d160bd6eb3f35dde0c2c513
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "is-shared-array-buffer@npm:1.0.3"
+"nan@npm:^2.12.1, nan@npm:^2.14.2":
+  version: 2.19.0
+  resolution: "nan@npm:2.19.0"
   dependencies:
-    call-bind: "npm:^1.0.7"
-  checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7
+    node-gyp: "npm:latest"
+  checksum: 10c0/b8d05d75f92ee9d94affa50d0aa41b6c698254c848529452d7ab67c2e0d160a83f563bfe2cbd53e077944eceb48c757f83c93634c7c9ff404c9ec1ed4e5ced1a
   languageName: node
   linkType: hard
 
-"is-stream@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "is-stream@npm:2.0.1"
-  checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5
+"nanoid@npm:^3.3.7":
+  version: 3.3.7
+  resolution: "nanoid@npm:3.3.7"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
   languageName: node
   linkType: hard
 
-"is-string@npm:^1.0.5, is-string@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "is-string@npm:1.0.7"
+"nanomatch@npm:^1.2.9":
+  version: 1.2.13
+  resolution: "nanomatch@npm:1.2.13"
   dependencies:
-    has-tostringtag: "npm:^1.0.0"
-  checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    fragment-cache: "npm:^0.2.1"
+    is-windows: "npm:^1.0.2"
+    kind-of: "npm:^6.0.2"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10c0/0f5cefa755ca2e20c86332821995effb24acb79551ddaf51c1b9112628cad234a0d8fd9ac6aa56ad1f8bfad6ff6ae86e851acb960943249d9fa44b091479953a
   languageName: node
   linkType: hard
 
-"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "is-symbol@npm:1.0.4"
+"native-url@npm:^0.2.6":
+  version: 0.2.6
+  resolution: "native-url@npm:0.2.6"
   dependencies:
-    has-symbols: "npm:^1.0.2"
-  checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7
+    querystring: "npm:^0.2.0"
+  checksum: 10c0/d29d4a96ce20c107da0febcfd402665a2033f46075a51b3d70c97b0fadf6b102658b573aa04e33e82b7d8ec7686a760a4af96991653ee848ee3a57e30202d205
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.13":
-  version: 1.1.13
-  resolution: "is-typed-array@npm:1.1.13"
+"natural-compare@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "natural-compare@npm:1.4.0"
+  checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
+  languageName: node
+  linkType: hard
+
+"neatequal@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "neatequal@npm:1.0.0"
   dependencies:
-    which-typed-array: "npm:^1.1.14"
-  checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca
+    varstream: "npm:^0.3.2"
+  checksum: 10c0/3feff681d474e451996ee98260afbeb5d02d1d41165038cb9bd661e248f76e7385a567811aa5de97769711cc2220c4b221e7a4c24b21dbdc7351c539371a9097
   languageName: node
   linkType: hard
 
-"is-weakmap@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-weakmap@npm:2.0.2"
-  checksum: 10c0/443c35bb86d5e6cc5929cd9c75a4024bb0fff9586ed50b092f94e700b89c43a33b186b76dbc6d54f3d3d09ece689ab38dcdc1af6a482cbe79c0f2da0a17f1299
+"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
+  version: 0.6.3
+  resolution: "negotiator@npm:0.6.3"
+  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
-"is-weakref@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-weakref@npm:1.0.2"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-  checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1
+"neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "neo-async@npm:2.6.2"
+  checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
   languageName: node
   linkType: hard
 
-"is-weakset@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "is-weakset@npm:2.0.3"
-  dependencies:
-    call-bind: "npm:^1.0.7"
-    get-intrinsic: "npm:^1.2.4"
-  checksum: 10c0/8ad6141b6a400e7ce7c7442a13928c676d07b1f315ab77d9912920bf5f4170622f43126f111615788f26c3b1871158a6797c862233124507db0bcc33a9537d1a
+"next-tick@npm:1, next-tick@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "next-tick@npm:1.1.0"
+  checksum: 10c0/3ba80dd805fcb336b4f52e010992f3e6175869c8d88bf4ff0a81d5d66e6049f89993463b28211613e58a6b7fe93ff5ccbba0da18d4fa574b96289e8f0b577f28
   languageName: node
   linkType: hard
 
-"isarray@npm:0.0.1":
-  version: 0.0.1
-  resolution: "isarray@npm:0.0.1"
-  checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
+"nice-try@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "nice-try@npm:1.0.5"
+  checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f
   languageName: node
   linkType: hard
 
-"isarray@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "isarray@npm:2.0.5"
-  checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd
+"no-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "no-case@npm:3.0.4"
+  dependencies:
+    lower-case: "npm:^2.0.2"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/8ef545f0b3f8677c848f86ecbd42ca0ff3cd9dd71c158527b344c69ba14710d816d8489c746b6ca225e7b615108938a0bda0a54706f8c255933703ac1cf8e703
   languageName: node
   linkType: hard
 
-"isexe@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "isexe@npm:2.0.0"
-  checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d
+"node-forge@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "node-forge@npm:0.10.0"
+  checksum: 10c0/9cbf9ac8fc3889a5a46b0248f7238ee4014770bf31d22e04c0c7f04ed91c8be4584c5f534cdf6037e99f236c636c925cba960501ed2b850e077512e152760663
   languageName: node
   linkType: hard
 
-"isexe@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "isexe@npm:3.1.1"
-  checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7
+"node-gyp@npm:^9.0.0":
+  version: 9.4.1
+  resolution: "node-gyp@npm:9.4.1"
+  dependencies:
+    env-paths: "npm:^2.2.0"
+    exponential-backoff: "npm:^3.1.1"
+    glob: "npm:^7.1.4"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^10.0.3"
+    nopt: "npm:^6.0.0"
+    npmlog: "npm:^6.0.0"
+    rimraf: "npm:^3.0.2"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^2.0.2"
+  bin:
+    node-gyp: bin/node-gyp.js
+  checksum: 10c0/f7d676cfa79f27d35edf17fe9c80064123670362352d19729e5dc9393d7e99f1397491c3107eddc0c0e8941442a6244a7ba6c860cfbe4b433b4cae248a55fe10
   languageName: node
   linkType: hard
 
-"isobject@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "isobject@npm:3.0.1"
-  checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db
+"node-gyp@npm:latest":
+  version: 10.1.0
+  resolution: "node-gyp@npm:10.1.0"
+  dependencies:
+    env-paths: "npm:^2.2.0"
+    exponential-backoff: "npm:^3.1.1"
+    glob: "npm:^10.3.10"
+    graceful-fs: "npm:^4.2.6"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^3.0.0"
+    semver: "npm:^7.3.5"
+    tar: "npm:^6.1.2"
+    which: "npm:^4.0.0"
+  bin:
+    node-gyp: bin/node-gyp.js
+  checksum: 10c0/9cc821111ca244a01fb7f054db7523ab0a0cd837f665267eb962eb87695d71fb1e681f9e21464cc2fd7c05530dc4c81b810bca1a88f7d7186909b74477491a3c
   languageName: node
   linkType: hard
 
-"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
-  version: 3.2.2
-  resolution: "istanbul-lib-coverage@npm:3.2.2"
-  checksum: 10c0/6c7ff2106769e5f592ded1fb418f9f73b4411fd5a084387a5410538332b6567cd1763ff6b6cadca9b9eb2c443cce2f7ea7d7f1b8d315f9ce58539793b1e0922b
+"node-int64@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "node-int64@npm:0.4.0"
+  checksum: 10c0/a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^5.0.4":
-  version: 5.2.1
-  resolution: "istanbul-lib-instrument@npm:5.2.1"
+"node-libs-browser@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "node-libs-browser@npm:2.2.1"
+  dependencies:
+    assert: "npm:^1.1.1"
+    browserify-zlib: "npm:^0.2.0"
+    buffer: "npm:^4.3.0"
+    console-browserify: "npm:^1.1.0"
+    constants-browserify: "npm:^1.0.0"
+    crypto-browserify: "npm:^3.11.0"
+    domain-browser: "npm:^1.1.1"
+    events: "npm:^3.0.0"
+    https-browserify: "npm:^1.0.0"
+    os-browserify: "npm:^0.3.0"
+    path-browserify: "npm:0.0.1"
+    process: "npm:^0.11.10"
+    punycode: "npm:^1.2.4"
+    querystring-es3: "npm:^0.2.0"
+    readable-stream: "npm:^2.3.3"
+    stream-browserify: "npm:^2.0.1"
+    stream-http: "npm:^2.7.2"
+    string_decoder: "npm:^1.0.0"
+    timers-browserify: "npm:^2.0.4"
+    tty-browserify: "npm:0.0.0"
+    url: "npm:^0.11.0"
+    util: "npm:^0.11.0"
+    vm-browserify: "npm:^1.0.1"
+  checksum: 10c0/0e05321a6396408903ed642231d2bca7dd96492d074c7af161ba06a63c95378bd3de50b4105eccbbc02d93ba3da69f0ff5e624bc2a8c92ca462ceb6a403e7986
+  languageName: node
+  linkType: hard
+
+"node-notifier@npm:^8.0.0":
+  version: 8.0.2
+  resolution: "node-notifier@npm:8.0.2"
   dependencies:
-    "@babel/core": "npm:^7.12.3"
-    "@babel/parser": "npm:^7.14.7"
-    "@istanbuljs/schema": "npm:^0.1.2"
-    istanbul-lib-coverage: "npm:^3.2.0"
-    semver: "npm:^6.3.0"
-  checksum: 10c0/8a1bdf3e377dcc0d33ec32fe2b6ecacdb1e4358fd0eb923d4326bb11c67622c0ceb99600a680f3dad5d29c66fc1991306081e339b4d43d0b8a2ab2e1d910a6ee
+    growly: "npm:^1.3.0"
+    is-wsl: "npm:^2.2.0"
+    semver: "npm:^7.3.2"
+    shellwords: "npm:^0.1.1"
+    uuid: "npm:^8.3.0"
+    which: "npm:^2.0.2"
+  checksum: 10c0/8df8618628c14ef26214a376dbde425264b92ae5e5944d21807f41e3d2ed3ff29f6c5aba089f4a5f22328b2157aa874e93f2304a2134b1ee59508cedf7e889bb
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "istanbul-lib-instrument@npm:6.0.2"
-  dependencies:
-    "@babel/core": "npm:^7.23.9"
-    "@babel/parser": "npm:^7.23.9"
-    "@istanbuljs/schema": "npm:^0.1.3"
-    istanbul-lib-coverage: "npm:^3.2.0"
-    semver: "npm:^7.5.4"
-  checksum: 10c0/405c6ac037bf8c7ee7495980b0cd5544b2c53078c10534d0c9ceeb92a9ea7dcf8510f58ccfce31336458a8fa6ccef27b570bbb602abaa8c1650f5496a807477c
+"node-releases@npm:^1.1.61":
+  version: 1.1.77
+  resolution: "node-releases@npm:1.1.77"
+  checksum: 10c0/e7477dd1201d32f2169988665f6e5b3b779f3c582decae4a1ab119dc8a8e3a28b3118c386b3c2e8c5a55c415066fe82c77e976979ad4e742ee14483d62f3f3a5
   languageName: node
   linkType: hard
 
-"istanbul-lib-report@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "istanbul-lib-report@npm:3.0.1"
-  dependencies:
-    istanbul-lib-coverage: "npm:^3.0.0"
-    make-dir: "npm:^4.0.0"
-    supports-color: "npm:^7.1.0"
-  checksum: 10c0/84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
+"node-releases@npm:^2.0.14":
+  version: 2.0.14
+  resolution: "node-releases@npm:2.0.14"
+  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
   languageName: node
   linkType: hard
 
-"istanbul-lib-source-maps@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "istanbul-lib-source-maps@npm:4.0.1"
+"nopt@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "nopt@npm:6.0.0"
   dependencies:
-    debug: "npm:^4.1.1"
-    istanbul-lib-coverage: "npm:^3.0.0"
-    source-map: "npm:^0.6.1"
-  checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
+    abbrev: "npm:^1.0.0"
+  bin:
+    nopt: bin/nopt.js
+  checksum: 10c0/837b52c330df16fcaad816b1f54fec6b2854ab1aa771d935c1603fbcf9b023bb073f1466b1b67f48ea4dce127ae675b85b9d9355700e9b109de39db490919786
   languageName: node
   linkType: hard
 
-"istanbul-reports@npm:^3.1.3":
-  version: 3.1.7
-  resolution: "istanbul-reports@npm:3.1.7"
+"nopt@npm:^7.0.0":
+  version: 7.2.0
+  resolution: "nopt@npm:7.2.0"
   dependencies:
-    html-escaper: "npm:^2.0.0"
-    istanbul-lib-report: "npm:^3.0.0"
-  checksum: 10c0/a379fadf9cf8dc5dfe25568115721d4a7eb82fbd50b005a6672aff9c6989b20cc9312d7865814e0859cd8df58cbf664482e1d3604be0afde1f7fc3ccc1394a51
+    abbrev: "npm:^2.0.0"
+  bin:
+    nopt: bin/nopt.js
+  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
   languageName: node
   linkType: hard
 
-"iterator.prototype@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "iterator.prototype@npm:1.1.2"
+"normalize-package-data@npm:^2.5.0":
+  version: 2.5.0
+  resolution: "normalize-package-data@npm:2.5.0"
   dependencies:
-    define-properties: "npm:^1.2.1"
-    get-intrinsic: "npm:^1.2.1"
-    has-symbols: "npm:^1.0.3"
-    reflect.getprototypeof: "npm:^1.0.4"
-    set-function-name: "npm:^2.0.1"
-  checksum: 10c0/a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79
+    hosted-git-info: "npm:^2.1.4"
+    resolve: "npm:^1.10.0"
+    semver: "npm:2 || 3 || 4 || 5"
+    validate-npm-package-license: "npm:^3.0.1"
+  checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.6":
-  version: 2.3.6
-  resolution: "jackspeak@npm:2.3.6"
+"normalize-path@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "normalize-path@npm:2.1.1"
   dependencies:
-    "@isaacs/cliui": "npm:^8.0.2"
-    "@pkgjs/parseargs": "npm:^0.11.0"
-  dependenciesMeta:
-    "@pkgjs/parseargs":
-      optional: true
-  checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111
+    remove-trailing-separator: "npm:^1.0.1"
+  checksum: 10c0/db814326ff88057437233361b4c7e9cac7b54815b051b57f2d341ce89b1d8ec8cbd43e7fa95d7652b3b69ea8fcc294b89b8530d556a84d1bdace94229e1e9a8b
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-changed-files@npm:29.7.0"
-  dependencies:
-    execa: "npm:^5.0.0"
-    jest-util: "npm:^29.7.0"
-    p-limit: "npm:^3.1.0"
-  checksum: 10c0/e071384d9e2f6bb462231ac53f29bff86f0e12394c1b49ccafbad225ce2ab7da226279a8a94f421949920bef9be7ef574fd86aee22e8adfa149be73554ab828b
+"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
+  version: 3.0.0
+  resolution: "normalize-path@npm:3.0.0"
+  checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-circus@npm:29.7.0"
-  dependencies:
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/expect": "npm:^29.7.0"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    co: "npm:^4.6.0"
-    dedent: "npm:^1.0.0"
-    is-generator-fn: "npm:^2.0.0"
-    jest-each: "npm:^29.7.0"
-    jest-matcher-utils: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-runtime: "npm:^29.7.0"
-    jest-snapshot: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    p-limit: "npm:^3.1.0"
-    pretty-format: "npm:^29.7.0"
-    pure-rand: "npm:^6.0.0"
-    slash: "npm:^3.0.0"
-    stack-utils: "npm:^2.0.3"
-  checksum: 10c0/8d15344cf7a9f14e926f0deed64ed190c7a4fa1ed1acfcd81e4cc094d3cc5bf7902ebb7b874edc98ada4185688f90c91e1747e0dfd7ac12463b097968ae74b5e
+"normalize-range@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "normalize-range@npm:0.1.2"
+  checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-cli@npm:29.7.0"
+"normalize-url@npm:1.9.1":
+  version: 1.9.1
+  resolution: "normalize-url@npm:1.9.1"
   dependencies:
-    "@jest/core": "npm:^29.7.0"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    chalk: "npm:^4.0.0"
-    create-jest: "npm:^29.7.0"
-    exit: "npm:^0.1.2"
-    import-local: "npm:^3.0.2"
-    jest-config: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jest-validate: "npm:^29.7.0"
-    yargs: "npm:^17.3.1"
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 10c0/a658fd55050d4075d65c1066364595962ead7661711495cfa1dfeecf3d6d0a8ffec532f3dbd8afbb3e172dd5fd2fb2e813c5e10256e7cf2fea766314942fb43a
+    object-assign: "npm:^4.0.1"
+    prepend-http: "npm:^1.0.0"
+    query-string: "npm:^4.1.0"
+    sort-keys: "npm:^1.0.0"
+  checksum: 10c0/5ecd525f743c3fb5370d2bab8e78446f3e3bd7c0c97a5fd3f0bc0c5f396fbd117d13c9118766128d25ed575755cb539dc33a38419f18ca9d8577c8d1cd7a8daf
   languageName: node
   linkType: hard
 
-"jest-config@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-config@npm:29.7.0"
-  dependencies:
-    "@babel/core": "npm:^7.11.6"
-    "@jest/test-sequencer": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    babel-jest: "npm:^29.7.0"
-    chalk: "npm:^4.0.0"
-    ci-info: "npm:^3.2.0"
-    deepmerge: "npm:^4.2.2"
-    glob: "npm:^7.1.3"
-    graceful-fs: "npm:^4.2.9"
-    jest-circus: "npm:^29.7.0"
-    jest-environment-node: "npm:^29.7.0"
-    jest-get-type: "npm:^29.6.3"
-    jest-regex-util: "npm:^29.6.3"
-    jest-resolve: "npm:^29.7.0"
-    jest-runner: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jest-validate: "npm:^29.7.0"
-    micromatch: "npm:^4.0.4"
-    parse-json: "npm:^5.2.0"
-    pretty-format: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-    strip-json-comments: "npm:^3.1.1"
-  peerDependencies:
-    "@types/node": "*"
-    ts-node: ">=9.0.0"
-  peerDependenciesMeta:
-    "@types/node":
-      optional: true
-    ts-node:
-      optional: true
-  checksum: 10c0/bab23c2eda1fff06e0d104b00d6adfb1d1aabb7128441899c9bff2247bd26710b050a5364281ce8d52b46b499153bf7e3ee88b19831a8f3451f1477a0246a0f1
+"normalize-url@npm:^3.0.0":
+  version: 3.3.0
+  resolution: "normalize-url@npm:3.3.0"
+  checksum: 10c0/07c2fdcfac898d97eee256d7f62108034224588263fadc45caba0cc402b2bd59b9bd9e66e0c54ac9ee902fcb27af80cacd36375f641409f46749b4eb10f47352
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-diff@npm:29.7.0"
+"npm-run-path@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "npm-run-path@npm:2.0.2"
   dependencies:
-    chalk: "npm:^4.0.0"
-    diff-sequences: "npm:^29.6.3"
-    jest-get-type: "npm:^29.6.3"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/89a4a7f182590f56f526443dde69acefb1f2f0c9e59253c61d319569856c4931eae66b8a3790c443f529267a0ddba5ba80431c585deed81827032b2b2a1fc999
+    path-key: "npm:^2.0.0"
+  checksum: 10c0/95549a477886f48346568c97b08c4fda9cdbf7ce8a4fbc2213f36896d0d19249e32d68d7451bdcbca8041b5fba04a6b2c4a618beaf19849505c05b700740f1de
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-docblock@npm:29.7.0"
+"npm-run-path@npm:^4.0.0, npm-run-path@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "npm-run-path@npm:4.0.1"
   dependencies:
-    detect-newline: "npm:^3.0.0"
-  checksum: 10c0/d932a8272345cf6b6142bb70a2bb63e0856cc0093f082821577ea5bdf4643916a98744dfc992189d2b1417c38a11fa42466f6111526bc1fb81366f56410f3be9
+    path-key: "npm:^3.0.0"
+  checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
   languageName: node
   linkType: hard
 
-"jest-each@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-each@npm:29.7.0"
+"npmlog@npm:^6.0.0":
+  version: 6.0.2
+  resolution: "npmlog@npm:6.0.2"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    chalk: "npm:^4.0.0"
-    jest-get-type: "npm:^29.6.3"
-    jest-util: "npm:^29.7.0"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/f7f9a90ebee80cc688e825feceb2613627826ac41ea76a366fa58e669c3b2403d364c7c0a74d862d469b103c843154f8456d3b1c02b487509a12afa8b59edbb4
+    are-we-there-yet: "npm:^3.0.0"
+    console-control-strings: "npm:^1.1.0"
+    gauge: "npm:^4.0.3"
+    set-blocking: "npm:^2.0.0"
+  checksum: 10c0/0cacedfbc2f6139c746d9cd4a85f62718435ad0ca4a2d6459cd331dd33ae58206e91a0742c1558634efcde3f33f8e8e7fd3adf1bfe7978310cf00bd55cccf890
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-environment-jsdom@npm:29.7.0"
+"nth-check@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "nth-check@npm:1.0.2"
   dependencies:
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/fake-timers": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/jsdom": "npm:^20.0.0"
-    "@types/node": "npm:*"
-    jest-mock: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jsdom: "npm:^20.0.0"
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 10c0/139b94e2c8ec1bb5a46ce17df5211da65ce867354b3fd4e00fa6a0d1da95902df4cf7881273fc6ea937e5c325d39d6773f0d41b6c469363334de9d489d2c321f
+    boolbase: "npm:~1.0.0"
+  checksum: 10c0/1a67ce53a99e276eea672f892d712b29f3e6802bbbef7285ffab72ecea4f972e8244defac1ebded0daffabf459def31355bb9c64e5657ac2ab032c13f185d0fd
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-environment-node@npm:29.7.0"
+"nth-check@npm:^2.0.1":
+  version: 2.1.1
+  resolution: "nth-check@npm:2.1.1"
   dependencies:
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/fake-timers": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    jest-mock: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-  checksum: 10c0/61f04fec077f8b1b5c1a633e3612fc0c9aa79a0ab7b05600683428f1e01a4d35346c474bde6f439f9fcc1a4aa9a2861ff852d079a43ab64b02105d1004b2592b
+    boolbase: "npm:^1.0.0"
+  checksum: 10c0/5fee7ff309727763689cfad844d979aedd2204a817fbaaf0e1603794a7c20db28548d7b024692f953557df6ce4a0ee4ae46cd8ebd9b36cfb300b9226b567c479
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "jest-get-type@npm:29.6.3"
-  checksum: 10c0/552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b
-  languageName: node
-  linkType: hard
-
-"jest-haste-map@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-haste-map@npm:29.7.0"
-  dependencies:
-    "@jest/types": "npm:^29.6.3"
-    "@types/graceful-fs": "npm:^4.1.3"
-    "@types/node": "npm:*"
-    anymatch: "npm:^3.0.3"
-    fb-watchman: "npm:^2.0.0"
-    fsevents: "npm:^2.3.2"
-    graceful-fs: "npm:^4.2.9"
-    jest-regex-util: "npm:^29.6.3"
-    jest-util: "npm:^29.7.0"
-    jest-worker: "npm:^29.7.0"
-    micromatch: "npm:^4.0.4"
-    walker: "npm:^1.0.8"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  checksum: 10c0/2683a8f29793c75a4728787662972fedd9267704c8f7ef9d84f2beed9a977f1cf5e998c07b6f36ba5603f53cb010c911fe8cd0ac9886e073fe28ca66beefd30c
+"num2fraction@npm:^1.2.2":
+  version: 1.2.2
+  resolution: "num2fraction@npm:1.2.2"
+  checksum: 10c0/3bf17b44af00508a2b0370146629710645c3e3ff3c052893680efe3f4a6ff5c953ce9e54734013b02b35744a49352d54fbc5d8b455fac979047ef17dd8ec74bd
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-leak-detector@npm:29.7.0"
-  dependencies:
-    jest-get-type: "npm:^29.6.3"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395
+"nwsapi@npm:^2.2.0":
+  version: 2.2.9
+  resolution: "nwsapi@npm:2.2.9"
+  checksum: 10c0/e6ebbaedf44d1c1e13f7193e5129c8da1b2e8064862b70458ab9bd9e9640b8ad035a0e48d509e787527ecdddea74d5a02798420cd971264a4e03c2b173fadac8
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-matcher-utils@npm:29.7.0"
-  dependencies:
-    chalk: "npm:^4.0.0"
-    jest-diff: "npm:^29.7.0"
-    jest-get-type: "npm:^29.6.3"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/0d0e70b28fa5c7d4dce701dc1f46ae0922102aadc24ed45d594dd9b7ae0a8a6ef8b216718d1ab79e451291217e05d4d49a82666e1a3cc2b428b75cd9c933244e
+"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.4":
+  version: 2.2.7
+  resolution: "nwsapi@npm:2.2.7"
+  checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
   languageName: node
   linkType: hard
 
-"jest-message-util@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-message-util@npm:29.7.0"
-  dependencies:
-    "@babel/code-frame": "npm:^7.12.13"
-    "@jest/types": "npm:^29.6.3"
-    "@types/stack-utils": "npm:^2.0.0"
-    chalk: "npm:^4.0.0"
-    graceful-fs: "npm:^4.2.9"
-    micromatch: "npm:^4.0.4"
-    pretty-format: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-    stack-utils: "npm:^2.0.3"
-  checksum: 10c0/850ae35477f59f3e6f27efac5215f706296e2104af39232bb14e5403e067992afb5c015e87a9243ec4d9df38525ef1ca663af9f2f4766aa116f127247008bd22
+"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "object-assign@npm:4.1.1"
+  checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-mock@npm:29.7.0"
+"object-copy@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "object-copy@npm:0.1.0"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    jest-util: "npm:^29.7.0"
-  checksum: 10c0/7b9f8349ee87695a309fe15c46a74ab04c853369e5c40952d68061d9dc3159a0f0ed73e215f81b07ee97a9faaf10aebe5877a9d6255068a0977eae6a9ff1d5ac
+    copy-descriptor: "npm:^0.1.0"
+    define-property: "npm:^0.2.5"
+    kind-of: "npm:^3.0.3"
+  checksum: 10c0/79314b05e9d626159a04f1d913f4c4aba9eae8848511cf5f4c8e3b04bb3cc313b65f60357f86462c959a14c2d58380fedf89b6b32ecec237c452a5ef3900a293
   languageName: node
   linkType: hard
 
-"jest-pnp-resolver@npm:^1.2.2":
-  version: 1.2.3
-  resolution: "jest-pnp-resolver@npm:1.2.3"
-  peerDependencies:
-    jest-resolve: "*"
-  peerDependenciesMeta:
-    jest-resolve:
-      optional: true
-  checksum: 10c0/86eec0c78449a2de733a6d3e316d49461af6a858070e113c97f75fb742a48c2396ea94150cbca44159ffd4a959f743a47a8b37a792ef6fdad2cf0a5cba973fac
+"object-inspect@npm:^1.13.1":
+  version: 1.13.1
+  resolution: "object-inspect@npm:1.13.1"
+  checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^29.6.3":
-  version: 29.6.3
-  resolution: "jest-regex-util@npm:29.6.3"
-  checksum: 10c0/4e33fb16c4f42111159cafe26397118dcfc4cf08bc178a67149fb05f45546a91928b820894572679d62559839d0992e21080a1527faad65daaae8743a5705a3b
+"object-is@npm:^1.1.5":
+  version: 1.1.6
+  resolution: "object-is@npm:1.1.6"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+  checksum: 10c0/506af444c4dce7f8e31f34fc549e2fb8152d6b9c4a30c6e62852badd7f520b579c679af433e7a072f9d78eb7808d230dc12e1cf58da9154dfbf8813099ea0fe0
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-resolve-dependencies@npm:29.7.0"
-  dependencies:
-    jest-regex-util: "npm:^29.6.3"
-    jest-snapshot: "npm:^29.7.0"
-  checksum: 10c0/b6e9ad8ae5b6049474118ea6441dfddd385b6d1fc471db0136f7c8fbcfe97137a9665e4f837a9f49f15a29a1deb95a14439b7aec812f3f99d08f228464930f0d
+"object-keys@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "object-keys@npm:1.1.1"
+  checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-resolve@npm:29.7.0"
+"object-visit@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object-visit@npm:1.0.1"
   dependencies:
-    chalk: "npm:^4.0.0"
-    graceful-fs: "npm:^4.2.9"
-    jest-haste-map: "npm:^29.7.0"
-    jest-pnp-resolver: "npm:^1.2.2"
-    jest-util: "npm:^29.7.0"
-    jest-validate: "npm:^29.7.0"
-    resolve: "npm:^1.20.0"
-    resolve.exports: "npm:^2.0.0"
-    slash: "npm:^3.0.0"
-  checksum: 10c0/59da5c9c5b50563e959a45e09e2eace783d7f9ac0b5dcc6375dea4c0db938d2ebda97124c8161310082760e8ebbeff9f6b177c15ca2f57fb424f637a5d2adb47
+    isobject: "npm:^3.0.0"
+  checksum: 10c0/086b475bda24abd2318d2b187c3e928959b89f5cb5883d6fe5a42d03719b61fc18e765f658de9ac8730e67ba9ff26d61e73d991215948ff9ecefe771e0071029
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-runner@npm:29.7.0"
+"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   dependencies:
-    "@jest/console": "npm:^29.7.0"
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/transform": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    emittery: "npm:^0.13.1"
-    graceful-fs: "npm:^4.2.9"
-    jest-docblock: "npm:^29.7.0"
-    jest-environment-node: "npm:^29.7.0"
-    jest-haste-map: "npm:^29.7.0"
-    jest-leak-detector: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-resolve: "npm:^29.7.0"
-    jest-runtime: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    jest-watcher: "npm:^29.7.0"
-    jest-worker: "npm:^29.7.0"
-    p-limit: "npm:^3.1.0"
-    source-map-support: "npm:0.5.13"
-  checksum: 10c0/2194b4531068d939f14c8d3274fe5938b77fa73126aedf9c09ec9dec57d13f22c72a3b5af01ac04f5c1cf2e28d0ac0b4a54212a61b05f10b5d6b47f2a1097bb4
+    call-bind: "npm:^1.0.5"
+    define-properties: "npm:^1.2.1"
+    has-symbols: "npm:^1.0.3"
+    object-keys: "npm:^1.1.1"
+  checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-runtime@npm:29.7.0"
+"object.entries@npm:^1.1.0, object.entries@npm:^1.1.7":
+  version: 1.1.8
+  resolution: "object.entries@npm:1.1.8"
   dependencies:
-    "@jest/environment": "npm:^29.7.0"
-    "@jest/fake-timers": "npm:^29.7.0"
-    "@jest/globals": "npm:^29.7.0"
-    "@jest/source-map": "npm:^29.6.3"
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/transform": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    cjs-module-lexer: "npm:^1.0.0"
-    collect-v8-coverage: "npm:^1.0.0"
-    glob: "npm:^7.1.3"
-    graceful-fs: "npm:^4.2.9"
-    jest-haste-map: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-mock: "npm:^29.7.0"
-    jest-regex-util: "npm:^29.6.3"
-    jest-resolve: "npm:^29.7.0"
-    jest-snapshot: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    slash: "npm:^3.0.0"
-    strip-bom: "npm:^4.0.0"
-  checksum: 10c0/7cd89a1deda0bda7d0941835434e44f9d6b7bd50b5c5d9b0fc9a6c990b2d4d2cab59685ab3cb2850ed4cc37059f6de903af5a50565d7f7f1192a77d3fd6dd2a6
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-snapshot@npm:29.7.0"
+"object.fromentries@npm:^2.0.7":
+  version: 2.0.8
+  resolution: "object.fromentries@npm:2.0.8"
   dependencies:
-    "@babel/core": "npm:^7.11.6"
-    "@babel/generator": "npm:^7.7.2"
-    "@babel/plugin-syntax-jsx": "npm:^7.7.2"
-    "@babel/plugin-syntax-typescript": "npm:^7.7.2"
-    "@babel/types": "npm:^7.3.3"
-    "@jest/expect-utils": "npm:^29.7.0"
-    "@jest/transform": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    babel-preset-current-node-syntax: "npm:^1.0.0"
-    chalk: "npm:^4.0.0"
-    expect: "npm:^29.7.0"
-    graceful-fs: "npm:^4.2.9"
-    jest-diff: "npm:^29.7.0"
-    jest-get-type: "npm:^29.6.3"
-    jest-matcher-utils: "npm:^29.7.0"
-    jest-message-util: "npm:^29.7.0"
-    jest-util: "npm:^29.7.0"
-    natural-compare: "npm:^1.4.0"
-    pretty-format: "npm:^29.7.0"
-    semver: "npm:^7.5.3"
-  checksum: 10c0/6e9003c94ec58172b4a62864a91c0146513207bedf4e0a06e1e2ac70a4484088a2683e3a0538d8ea913bcfd53dc54a9b98a98cdfa562e7fe1d1339aeae1da570
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/cd4327e6c3369cfa805deb4cbbe919bfb7d3aeebf0bcaba291bb568ea7169f8f8cdbcabe2f00b40db0c20cd20f08e11b5f3a5a36fb7dd3fe04850c50db3bf83b
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-util@npm:29.7.0"
+"object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.0":
+  version: 2.1.8
+  resolution: "object.getownpropertydescriptors@npm:2.1.8"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    chalk: "npm:^4.0.0"
-    ci-info: "npm:^3.2.0"
-    graceful-fs: "npm:^4.2.9"
-    picomatch: "npm:^2.2.3"
-  checksum: 10c0/bc55a8f49fdbb8f51baf31d2a4f312fb66c9db1483b82f602c9c990e659cdd7ec529c8e916d5a89452ecbcfae4949b21b40a7a59d4ffc0cd813a973ab08c8150
+    array.prototype.reduce: "npm:^1.0.6"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    gopd: "npm:^1.0.1"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10c0/553e9562fd86637c9c169df23a56f1d810d8c9b580a6d4be11552c009f32469310c9347f3d10325abf0cd9cfe4afc521a1e903fbd24148ae7ec860e1e7c75cf3
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-validate@npm:29.7.0"
+"object.groupby@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "object.groupby@npm:1.0.3"
   dependencies:
-    "@jest/types": "npm:^29.6.3"
-    camelcase: "npm:^6.2.0"
-    chalk: "npm:^4.0.0"
-    jest-get-type: "npm:^29.6.3"
-    leven: "npm:^3.1.0"
-    pretty-format: "npm:^29.7.0"
-  checksum: 10c0/a20b930480c1ed68778c739f4739dce39423131bc070cd2505ddede762a5570a256212e9c2401b7ae9ba4d7b7c0803f03c5b8f1561c62348213aba18d9dbece2
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+  checksum: 10c0/60d0455c85c736fbfeda0217d1a77525956f76f7b2495edeca9e9bbf8168a45783199e77b894d30638837c654d0cc410e0e02cbfcf445bc8de71c3da1ede6a9c
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-watcher@npm:29.7.0"
+"object.hasown@npm:^1.1.3":
+  version: 1.1.4
+  resolution: "object.hasown@npm:1.1.4"
   dependencies:
-    "@jest/test-result": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    "@types/node": "npm:*"
-    ansi-escapes: "npm:^4.2.1"
-    chalk: "npm:^4.0.0"
-    emittery: "npm:^0.13.1"
-    jest-util: "npm:^29.7.0"
-    string-length: "npm:^4.0.1"
-  checksum: 10c0/ec6c75030562fc8f8c727cb8f3b94e75d831fc718785abfc196e1f2a2ebc9a2e38744a15147170039628a853d77a3b695561ce850375ede3a4ee6037a2574567
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/f23187b08d874ef1aea060118c8259eb7f99f93c15a50771d710569534119062b90e087b92952b2d0fb1bb8914d61fb0b43c57fb06f622aaad538fe6868ab987
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^27.4.5":
-  version: 27.5.1
-  resolution: "jest-worker@npm:27.5.1"
+"object.pick@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "object.pick@npm:1.3.0"
   dependencies:
-    "@types/node": "npm:*"
-    merge-stream: "npm:^2.0.0"
-    supports-color: "npm:^8.0.0"
-  checksum: 10c0/8c4737ffd03887b3c6768e4cc3ca0269c0336c1e4b1b120943958ddb035ed2a0fc6acab6dc99631720a3720af4e708ff84fb45382ad1e83c27946adf3623969b
+    isobject: "npm:^3.0.1"
+  checksum: 10c0/cd316ec986e49895a28f2df9182de9cdeee57cd2a952c122aacc86344c28624fe002d9affc4f48b5014ec7c033da9942b08821ddb44db8c5bac5b3ec54bdc31e
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-worker@npm:29.7.0"
+"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.1.7":
+  version: 1.2.0
+  resolution: "object.values@npm:1.2.0"
   dependencies:
-    "@types/node": "npm:*"
-    jest-util: "npm:^29.7.0"
-    merge-stream: "npm:^2.0.0"
-    supports-color: "npm:^8.0.0"
-  checksum: 10c0/5570a3a005b16f46c131968b8a5b56d291f9bbb85ff4217e31c80bd8a02e7de799e59a54b95ca28d5c302f248b54cbffde2d177c2f0f52ffcee7504c6eabf660
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3
   languageName: node
   linkType: hard
-
-"jest@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest@npm:29.7.0"
-  dependencies:
-    "@jest/core": "npm:^29.7.0"
-    "@jest/types": "npm:^29.6.3"
-    import-local: "npm:^3.0.2"
-    jest-cli: "npm:^29.7.0"
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 10c0/f40eb8171cf147c617cc6ada49d062fbb03b4da666cb8d39cdbfb739a7d75eea4c3ca150fb072d0d273dce0c753db4d0467d54906ad0293f59c54f9db4a09d8b
+
+"obuf@npm:^1.0.0, obuf@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "obuf@npm:1.1.2"
+  checksum: 10c0/520aaac7ea701618eacf000fc96ae458e20e13b0569845800fc582f81b386731ab22d55354b4915d58171db00e79cfcd09c1638c02f89577ef092b38c65b7d81
   languageName: node
   linkType: hard
 
-"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "js-tokens@npm:4.0.0"
-  checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed
+"on-finished@npm:2.4.1":
+  version: 2.4.1
+  resolution: "on-finished@npm:2.4.1"
+  dependencies:
+    ee-first: "npm:1.1.1"
+  checksum: 10c0/46fb11b9063782f2d9968863d9cbba33d77aa13c17f895f56129c274318b86500b22af3a160fe9995aa41317efcd22941b6eba747f718ced08d9a73afdb087b4
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.13.1":
-  version: 3.14.1
-  resolution: "js-yaml@npm:3.14.1"
+"on-headers@npm:~1.0.2":
+  version: 1.0.2
+  resolution: "on-headers@npm:1.0.2"
+  checksum: 10c0/f649e65c197bf31505a4c0444875db0258e198292f34b884d73c2f751e91792ef96bb5cf89aa0f4fecc2e4dc662461dda606b1274b0e564f539cae5d2f5fc32f
+  languageName: node
+  linkType: hard
+
+"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "once@npm:1.4.0"
   dependencies:
-    argparse: "npm:^1.0.7"
-    esprima: "npm:^4.0.0"
-  bin:
-    js-yaml: bin/js-yaml.js
-  checksum: 10c0/6746baaaeac312c4db8e75fa22331d9a04cccb7792d126ed8ce6a0bbcfef0cedaddd0c5098fade53db067c09fe00aa1c957674b4765610a8b06a5a189e46433b
+    wrappy: "npm:1"
+  checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "js-yaml@npm:4.1.0"
+"onetime@npm:^5.1.0, onetime@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "onetime@npm:5.1.2"
   dependencies:
-    argparse: "npm:^2.0.1"
+    mimic-fn: "npm:^2.1.0"
+  checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
+  languageName: node
+  linkType: hard
+
+"open@npm:^7.0.2":
+  version: 7.4.2
+  resolution: "open@npm:7.4.2"
+  dependencies:
+    is-docker: "npm:^2.0.0"
+    is-wsl: "npm:^2.1.1"
+  checksum: 10c0/77573a6a68f7364f3a19a4c80492712720746b63680ee304555112605ead196afe91052bd3c3d165efdf4e9d04d255e87de0d0a77acec11ef47fd5261251813f
+  languageName: node
+  linkType: hard
+
+"opener@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "opener@npm:1.5.2"
   bin:
-    js-yaml: bin/js-yaml.js
-  checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f
+    opener: bin/opener-bin.js
+  checksum: 10c0/dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
   languageName: node
   linkType: hard
 
-"jsbn@npm:1.1.0":
-  version: 1.1.0
-  resolution: "jsbn@npm:1.1.0"
-  checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96
+"opn@npm:^5.5.0":
+  version: 5.5.0
+  resolution: "opn@npm:5.5.0"
+  dependencies:
+    is-wsl: "npm:^1.1.0"
+  checksum: 10c0/03f78b1ab464fd0d97543e2a90e47ca872e2324696bc13f741467693060fe058e87e38e9cfc9f3b568e60dfb31579fbe664d8e806b2f219262c423da953bba4c
   languageName: node
   linkType: hard
 
-"jsdom@npm:^20.0.0":
-  version: 20.0.3
-  resolution: "jsdom@npm:20.0.3"
+"optimize-css-assets-webpack-plugin@npm:5.0.4":
+  version: 5.0.4
+  resolution: "optimize-css-assets-webpack-plugin@npm:5.0.4"
   dependencies:
-    abab: "npm:^2.0.6"
-    acorn: "npm:^8.8.1"
-    acorn-globals: "npm:^7.0.0"
-    cssom: "npm:^0.5.0"
-    cssstyle: "npm:^2.3.0"
-    data-urls: "npm:^3.0.2"
-    decimal.js: "npm:^10.4.2"
-    domexception: "npm:^4.0.0"
-    escodegen: "npm:^2.0.0"
-    form-data: "npm:^4.0.0"
-    html-encoding-sniffer: "npm:^3.0.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.1"
-    is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.2"
-    parse5: "npm:^7.1.1"
-    saxes: "npm:^6.0.0"
-    symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^4.1.2"
-    w3c-xmlserializer: "npm:^4.0.0"
-    webidl-conversions: "npm:^7.0.0"
-    whatwg-encoding: "npm:^2.0.0"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^11.0.0"
-    ws: "npm:^8.11.0"
-    xml-name-validator: "npm:^4.0.0"
+    cssnano: "npm:^4.1.10"
+    last-call-webpack-plugin: "npm:^3.0.0"
   peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 10c0/b109073bb826a966db7828f46cb1d7371abecd30f182b143c52be5fe1ed84513bbbe995eb3d157241681fcd18331381e61e3dc004d4949f3a63bca02f6214902
+    webpack: ^4.0.0
+  checksum: 10c0/01c513d3bd9735a21ffc7002c27e73c1d5b1a330389cc8cbfc49ba29ad0415b505da4a2a057174c039ddb29b09f4831125bff56ade90ffb2c9b68376b6f4cee1
   languageName: node
   linkType: hard
 
-"jsdom@npm:^22.1.0":
-  version: 22.1.0
-  resolution: "jsdom@npm:22.1.0"
+"optionator@npm:^0.8.1":
+  version: 0.8.3
+  resolution: "optionator@npm:0.8.3"
   dependencies:
-    abab: "npm:^2.0.6"
-    cssstyle: "npm:^3.0.0"
-    data-urls: "npm:^4.0.0"
-    decimal.js: "npm:^10.4.3"
-    domexception: "npm:^4.0.0"
-    form-data: "npm:^4.0.0"
-    html-encoding-sniffer: "npm:^3.0.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.1"
-    is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.4"
-    parse5: "npm:^7.1.2"
-    rrweb-cssom: "npm:^0.6.0"
-    saxes: "npm:^6.0.0"
-    symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^4.1.2"
-    w3c-xmlserializer: "npm:^4.0.0"
-    webidl-conversions: "npm:^7.0.0"
-    whatwg-encoding: "npm:^2.0.0"
-    whatwg-mimetype: "npm:^3.0.0"
-    whatwg-url: "npm:^12.0.1"
-    ws: "npm:^8.13.0"
-    xml-name-validator: "npm:^4.0.0"
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 10c0/a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d
+    deep-is: "npm:~0.1.3"
+    fast-levenshtein: "npm:~2.0.6"
+    levn: "npm:~0.3.0"
+    prelude-ls: "npm:~1.1.2"
+    type-check: "npm:~0.3.2"
+    word-wrap: "npm:~1.2.3"
+  checksum: 10c0/ad7000ea661792b3ec5f8f86aac28895850988926f483b5f308f59f4607dfbe24c05df2d049532ee227c040081f39401a268cf7bbf3301512f74c4d760dc6dd8
   languageName: node
   linkType: hard
 
-"jsesc@npm:^2.5.1":
-  version: 2.5.2
-  resolution: "jsesc@npm:2.5.2"
-  bin:
-    jsesc: bin/jsesc
-  checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88
+"optionator@npm:^0.9.1":
+  version: 0.9.4
+  resolution: "optionator@npm:0.9.4"
+  dependencies:
+    deep-is: "npm:^0.1.3"
+    fast-levenshtein: "npm:^2.0.6"
+    levn: "npm:^0.4.1"
+    prelude-ls: "npm:^1.2.1"
+    type-check: "npm:^0.4.0"
+    word-wrap: "npm:^1.2.5"
+  checksum: 10c0/4afb687a059ee65b61df74dfe87d8d6815cd6883cb8b3d5883a910df72d0f5d029821f37025e4bccf4048873dbdb09acc6d303d27b8f76b1a80dd5a7d5334675
   languageName: node
   linkType: hard
 
-"json-buffer@npm:3.0.1":
-  version: 3.0.1
-  resolution: "json-buffer@npm:3.0.1"
-  checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7
+"optionator@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "optionator@npm:0.9.3"
+  dependencies:
+    "@aashutoshrathi/word-wrap": "npm:^1.2.3"
+    deep-is: "npm:^0.1.3"
+    fast-levenshtein: "npm:^2.0.6"
+    levn: "npm:^0.4.1"
+    prelude-ls: "npm:^1.2.1"
+    type-check: "npm:^0.4.0"
+  checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
   languageName: node
   linkType: hard
 
-"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "json-parse-even-better-errors@npm:2.3.1"
-  checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3
+"os-browserify@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "os-browserify@npm:0.3.0"
+  checksum: 10c0/6ff32cb1efe2bc6930ad0fd4c50e30c38010aee909eba8d65be60af55efd6cbb48f0287e3649b4e3f3a63dce5a667b23c187c4293a75e557f0d5489d735bcf52
   languageName: node
   linkType: hard
 
-"json-schema-traverse@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "json-schema-traverse@npm:0.4.1"
-  checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce
+"p-each-series@npm:^2.1.0":
+  version: 2.2.0
+  resolution: "p-each-series@npm:2.2.0"
+  checksum: 10c0/32a7cce1312bf70f99079db2ff070fc3ee2ed6efe0fa0444616fa38f79730ad09b461d009127d25254c4c865c40b6664e2c656b1a7b2c4781756d9173c974269
   languageName: node
   linkType: hard
 
-"json-schema-traverse@npm:^1.0.0":
+"p-finally@npm:^1.0.0":
   version: 1.0.0
-  resolution: "json-schema-traverse@npm:1.0.0"
-  checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6
+  resolution: "p-finally@npm:1.0.0"
+  checksum: 10c0/6b8552339a71fe7bd424d01d8451eea92d379a711fc62f6b2fe64cad8a472c7259a236c9a22b4733abca0b5666ad503cb497792a0478c5af31ded793d00937e7
   languageName: node
   linkType: hard
 
-"json-stable-stringify-without-jsonify@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json-stable-stringify-without-jsonify@npm:1.0.1"
-  checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5
+"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0":
+  version: 2.3.0
+  resolution: "p-limit@npm:2.3.0"
+  dependencies:
+    p-try: "npm:^2.0.0"
+  checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
   languageName: node
   linkType: hard
 
-"json5@npm:^2.1.2, json5@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "json5@npm:2.2.3"
-  bin:
-    json5: lib/cli.js
-  checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c
+"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "p-limit@npm:3.1.0"
+  dependencies:
+    yocto-queue: "npm:^0.1.0"
+  checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
   languageName: node
   linkType: hard
 
-"jsonc-parser@npm:^3.2.0":
-  version: 3.2.1
-  resolution: "jsonc-parser@npm:3.2.1"
-  checksum: 10c0/ada66dec143d7f9cb0e2d0d29c69e9ce40d20f3a4cb96b0c6efb745025ac7f9ba647d7ac0990d0adfc37a2d2ae084a12009a9c833dbdbeadf648879a99b9df89
+"p-locate@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "p-locate@npm:3.0.0"
+  dependencies:
+    p-limit: "npm:^2.0.0"
+  checksum: 10c0/7b7f06f718f19e989ce6280ed4396fb3c34dabdee0df948376483032f9d5ec22fdf7077ec942143a75827bb85b11da72016497fc10dac1106c837ed593969ee8
   languageName: node
   linkType: hard
 
-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0":
-  version: 3.3.5
-  resolution: "jsx-ast-utils@npm:3.3.5"
+"p-locate@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "p-locate@npm:4.1.0"
   dependencies:
-    array-includes: "npm:^3.1.6"
-    array.prototype.flat: "npm:^1.3.1"
-    object.assign: "npm:^4.1.4"
-    object.values: "npm:^1.1.6"
-  checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1
+    p-limit: "npm:^2.2.0"
+  checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
   languageName: node
   linkType: hard
 
-"keyv@npm:^4.5.3":
-  version: 4.5.4
-  resolution: "keyv@npm:4.5.4"
+"p-locate@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "p-locate@npm:5.0.0"
   dependencies:
-    json-buffer: "npm:3.0.1"
-  checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e
+    p-limit: "npm:^3.0.2"
+  checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
   languageName: node
   linkType: hard
 
-"kind-of@npm:^6.0.2":
-  version: 6.0.3
-  resolution: "kind-of@npm:6.0.3"
-  checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4
+"p-map@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "p-map@npm:2.1.0"
+  checksum: 10c0/735dae87badd4737a2dd582b6d8f93e49a1b79eabbc9815a4d63a528d5e3523e978e127a21d784cccb637010e32103a40d2aaa3ab23ae60250b1a820ca752043
   languageName: node
   linkType: hard
 
-"kleur@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "kleur@npm:3.0.3"
-  checksum: 10c0/cd3a0b8878e7d6d3799e54340efe3591ca787d9f95f109f28129bdd2915e37807bf8918bb295ab86afb8c82196beec5a1adcaf29042ce3f2bd932b038fe3aa4b
+"p-map@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-map@npm:4.0.0"
+  dependencies:
+    aggregate-error: "npm:^3.0.0"
+  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
   languageName: node
   linkType: hard
 
-"leven@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "leven@npm:3.1.0"
-  checksum: 10c0/cd778ba3fbab0f4d0500b7e87d1f6e1f041507c56fdcd47e8256a3012c98aaee371d4c15e0a76e0386107af2d42e2b7466160a2d80688aaa03e66e49949f42df
+"p-retry@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "p-retry@npm:3.0.1"
+  dependencies:
+    retry: "npm:^0.12.0"
+  checksum: 10c0/4fbec30cb0d8d10c5d9d1787a2d2c2b5ee60ddfa1897e86ec4e556ca1dff0901859872d7a7ecc33dd94af6e1c3a92ed79cc828161bbd221a2a1e464971c51b1b
   languageName: node
   linkType: hard
 
-"levn@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "levn@npm:0.4.1"
-  dependencies:
-    prelude-ls: "npm:^1.2.1"
-    type-check: "npm:~0.4.0"
-  checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e
+"p-try@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "p-try@npm:2.2.0"
+  checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
   languageName: node
   linkType: hard
 
-"light-my-request@npm:^4.2.0":
-  version: 4.12.0
-  resolution: "light-my-request@npm:4.12.0"
-  dependencies:
-    ajv: "npm:^8.1.0"
-    cookie: "npm:^0.5.0"
-    process-warning: "npm:^1.0.0"
-    set-cookie-parser: "npm:^2.4.1"
-  checksum: 10c0/d95b9e5bec2fe32ec02d77791c2e5786358f396f27c9c15c97f224e8bb94e357e143f89b67856f20ee2f980136f2c9ac3a934177f8d10b3c184a81c578b00e6f
+"pako@npm:^1.0.0, pako@npm:~1.0.5":
+  version: 1.0.11
+  resolution: "pako@npm:1.0.11"
+  checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
+  languageName: node
+  linkType: hard
+
+"parallel-transform@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "parallel-transform@npm:1.2.0"
+  dependencies:
+    cyclist: "npm:^1.0.1"
+    inherits: "npm:^2.0.3"
+    readable-stream: "npm:^2.1.5"
+  checksum: 10c0/ab0e58569e73681ca4b9c9228189bdb6cbea535295fae344cf0d8342fd33a950961914f3c414f81894c1498fb9ad1c079b4625d2b7ceae9e6ab812f22e3bea3f
   languageName: node
   linkType: hard
 
-"lines-and-columns@npm:^1.1.6":
-  version: 1.2.4
-  resolution: "lines-and-columns@npm:1.2.4"
-  checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d
+"param-case@npm:^3.0.3, param-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "param-case@npm:3.0.4"
+  dependencies:
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/ccc053f3019f878eca10e70ec546d92f51a592f762917dafab11c8b532715dcff58356118a6f350976e4ab109e321756f05739643ed0ca94298e82291e6f9e76
   languageName: node
   linkType: hard
 
-"loader-runner@npm:^4.2.0":
-  version: 4.3.0
-  resolution: "loader-runner@npm:4.3.0"
-  checksum: 10c0/a44d78aae0907a72f73966fe8b82d1439c8c485238bd5a864b1b9a2a3257832effa858790241e6b37876b5446a78889adf2fcc8dd897ce54c089ecc0a0ce0bf0
+"parent-module@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "parent-module@npm:1.0.1"
+  dependencies:
+    callsites: "npm:^3.0.0"
+  checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
   languageName: node
   linkType: hard
 
-"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "loader-utils@npm:2.0.4"
+"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.7":
+  version: 5.1.7
+  resolution: "parse-asn1@npm:5.1.7"
   dependencies:
-    big.js: "npm:^5.2.2"
-    emojis-list: "npm:^3.0.0"
-    json5: "npm:^2.1.2"
-  checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100
+    asn1.js: "npm:^4.10.1"
+    browserify-aes: "npm:^1.2.0"
+    evp_bytestokey: "npm:^1.0.3"
+    hash-base: "npm:~3.0"
+    pbkdf2: "npm:^3.1.2"
+    safe-buffer: "npm:^5.2.1"
+  checksum: 10c0/05eb5937405c904eb5a7f3633bab1acc11f4ae3478a07ef5c6d81ce88c3c0e505ff51f9c7b935ebc1265c868343793698fc91025755a895d0276f620f95e8a82
   languageName: node
   linkType: hard
 
-"locate-path@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "locate-path@npm:5.0.0"
+"parse-json@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "parse-json@npm:4.0.0"
   dependencies:
-    p-locate: "npm:^4.1.0"
-  checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59
+    error-ex: "npm:^1.3.1"
+    json-parse-better-errors: "npm:^1.0.1"
+  checksum: 10c0/8d80790b772ccb1bcea4e09e2697555e519d83d04a77c2b4237389b813f82898943a93ffff7d0d2406203bdd0c30dcf95b1661e3a53f83d0e417f053957bef32
   languageName: node
   linkType: hard
 
-"locate-path@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "locate-path@npm:6.0.0"
+"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "parse-json@npm:5.2.0"
   dependencies:
-    p-locate: "npm:^5.0.0"
-  checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3
+    "@babel/code-frame": "npm:^7.0.0"
+    error-ex: "npm:^1.3.1"
+    json-parse-even-better-errors: "npm:^2.3.0"
+    lines-and-columns: "npm:^1.1.6"
+  checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
   languageName: node
   linkType: hard
 
-"lodash.merge@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "lodash.merge@npm:4.6.2"
-  checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506
+"parse5@npm:6.0.1":
+  version: 6.0.1
+  resolution: "parse5@npm:6.0.1"
+  checksum: 10c0/595821edc094ecbcfb9ddcb46a3e1fe3a718540f8320eff08b8cf6742a5114cce2d46d45f95c26191c11b184dcaf4e2960abcd9c5ed9eb9393ac9a37efcfdecb
   languageName: node
   linkType: hard
 
-"lodash@npm:^4.17.10, lodash@npm:^4.17.21":
-  version: 4.17.21
-  resolution: "lodash@npm:4.17.21"
-  checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
+"parse5@npm:^7.0.0, parse5@npm:^7.1.1, parse5@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: "npm:^4.4.0"
+  checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "loose-envify@npm:1.4.0"
-  dependencies:
-    js-tokens: "npm:^3.0.0 || ^4.0.0"
-  bin:
-    loose-envify: cli.js
-  checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e
+"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
+  version: 1.3.3
+  resolution: "parseurl@npm:1.3.3"
+  checksum: 10c0/90dd4760d6f6174adb9f20cf0965ae12e23879b5f5464f38e92fce8073354341e4b3b76fa3d878351efe7d01e617121955284cfd002ab087fba1a0726ec0b4f5
   languageName: node
   linkType: hard
 
-"lower-case@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "lower-case@npm:2.0.2"
+"pascal-case@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pascal-case@npm:3.1.2"
   dependencies:
+    no-case: "npm:^3.0.4"
     tslib: "npm:^2.0.3"
-  checksum: 10c0/3d925e090315cf7dc1caa358e0477e186ffa23947740e4314a7429b6e62d72742e0bbe7536a5ae56d19d7618ce998aba05caca53c2902bd5742fdca5fc57fd7b
+  checksum: 10c0/05ff7c344809fd272fc5030ae0ee3da8e4e63f36d47a1e0a4855ca59736254192c5a27b5822ed4bae96e54048eec5f6907713cfcfff7cdf7a464eaf7490786d8
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
-  version: 10.2.0
-  resolution: "lru-cache@npm:10.2.0"
-  checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee
+"pascalcase@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "pascalcase@npm:0.1.1"
+  checksum: 10c0/48dfe90618e33810bf58211d8f39ad2c0262f19ad6354da1ba563935b5f429f36409a1fb9187c220328f7a4dc5969917f8e3e01ee089b5f1627b02aefe39567b
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "lru-cache@npm:5.1.1"
-  dependencies:
-    yallist: "npm:^3.0.2"
-  checksum: 10c0/89b2ef2ef45f543011e38737b8a8622a2f8998cddf0e5437174ef8f1f70a8b9d14a918ab3e232cb3ba343b7abddffa667f0b59075b2b80e6b4d63c3de6127482
+"path-browserify@npm:0.0.1":
+  version: 0.0.1
+  resolution: "path-browserify@npm:0.0.1"
+  checksum: 10c0/3d59710cddeea06509d91935196185900f3d9d29376dff68ff0e146fbd41d0fb304e983d0158f30cabe4dd2ffcc6a7d3d977631994ee984c88e66aed50a1ccd3
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "lru-cache@npm:6.0.0"
+"path-case@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "path-case@npm:3.0.4"
   dependencies:
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9
+    dot-case: "npm:^3.0.4"
+    tslib: "npm:^2.0.3"
+  checksum: 10c0/b6b14637228a558793f603aaeb2fcd981e738b8b9319421b713532fba96d75aa94024b9f6b9ae5aa33d86755144a5b36697d28db62ae45527dbd672fcc2cf0b7
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.7.1":
-  version: 7.18.3
-  resolution: "lru-cache@npm:7.18.3"
-  checksum: 10c0/b3a452b491433db885beed95041eb104c157ef7794b9c9b4d647be503be91769d11206bb573849a16b4cc0d03cbd15ffd22df7960997788b74c1d399ac7a4fed
+"path-dirname@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "path-dirname@npm:1.0.2"
+  checksum: 10c0/71e59be2bada7c91f62b976245fd421b7cb01fde3207fe53a82d8880621ad04fd8b434e628c9cf4e796259fc168a107d77cd56837725267c5b2c58cefe2c4e1b
   languageName: node
   linkType: hard
 
-"lru-queue@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "lru-queue@npm:0.1.0"
-  dependencies:
-    es5-ext: "npm:~0.10.2"
-  checksum: 10c0/83517032b46843601c4528be65e8aaf85f5a7860a9cfa3e4f2b5591da436e7cd748d95b450c91434c4ffb75d3ae4c069ddbdd9f71ada56a99a00c03088c51b4d
+"path-exists@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "path-exists@npm:3.0.0"
+  checksum: 10c0/17d6a5664bc0a11d48e2b2127d28a0e58822c6740bde30403f08013da599182289c56518bec89407e3f31d3c2b6b296a4220bc3f867f0911fee6952208b04167
   languageName: node
   linkType: hard
 
-"make-dir@npm:^4.0.0":
+"path-exists@npm:^4.0.0":
   version: 4.0.0
-  resolution: "make-dir@npm:4.0.0"
-  dependencies:
-    semver: "npm:^7.5.3"
-  checksum: 10c0/69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
+  resolution: "path-exists@npm:4.0.0"
+  checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
-  dependencies:
-    agentkeepalive: "npm:^4.2.1"
-    cacache: "npm:^16.1.0"
-    http-cache-semantics: "npm:^4.1.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.0"
-    is-lambda: "npm:^1.0.1"
-    lru-cache: "npm:^7.7.1"
-    minipass: "npm:^3.1.6"
-    minipass-collect: "npm:^1.0.2"
-    minipass-fetch: "npm:^2.0.3"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    negotiator: "npm:^0.6.3"
-    promise-retry: "npm:^2.0.1"
-    socks-proxy-agent: "npm:^7.0.0"
-    ssri: "npm:^9.0.0"
-  checksum: 10c0/28ec392f63ab93511f400839dcee83107eeecfaad737d1e8487ea08b4332cd89a8f3319584222edd9f6f1d0833cf516691469496d46491863f9e88c658013949
+"path-is-absolute@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "path-is-absolute@npm:1.0.1"
+  checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "make-fetch-happen@npm:13.0.0"
-  dependencies:
-    "@npmcli/agent": "npm:^2.0.0"
-    cacache: "npm:^18.0.0"
-    http-cache-semantics: "npm:^4.1.1"
-    is-lambda: "npm:^1.0.1"
-    minipass: "npm:^7.0.2"
-    minipass-fetch: "npm:^3.0.0"
-    minipass-flush: "npm:^1.0.5"
-    minipass-pipeline: "npm:^1.2.4"
-    negotiator: "npm:^0.6.3"
-    promise-retry: "npm:^2.0.1"
-    ssri: "npm:^10.0.0"
-  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+"path-is-inside@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "path-is-inside@npm:1.0.2"
+  checksum: 10c0/7fdd4b41672c70461cce734fc222b33e7b447fa489c7c4377c95e7e6852d83d69741f307d88ec0cc3b385b41cb4accc6efac3c7c511cd18512e95424f5fa980c
   languageName: node
   linkType: hard
 
-"makeerror@npm:1.0.12":
-  version: 1.0.12
-  resolution: "makeerror@npm:1.0.12"
-  dependencies:
-    tmpl: "npm:1.0.5"
-  checksum: 10c0/b0e6e599780ce6bab49cc413eba822f7d1f0dfebd1c103eaa3785c59e43e22c59018323cf9e1708f0ef5329e94a745d163fcbb6bff8e4c6742f9be9e86f3500c
+"path-key@npm:^2.0.0, path-key@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "path-key@npm:2.0.1"
+  checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b
   languageName: node
   linkType: hard
 
-"marked@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "marked@npm:4.3.0"
-  bin:
-    marked: bin/marked.js
-  checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47
+"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "path-key@npm:3.1.1"
+  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
   languageName: node
   linkType: hard
 
-"memoizee@npm:^0.4.15":
-  version: 0.4.15
-  resolution: "memoizee@npm:0.4.15"
-  dependencies:
-    d: "npm:^1.0.1"
-    es5-ext: "npm:^0.10.53"
-    es6-weak-map: "npm:^2.0.3"
-    event-emitter: "npm:^0.3.5"
-    is-promise: "npm:^2.2.2"
-    lru-queue: "npm:^0.1.0"
-    next-tick: "npm:^1.1.0"
-    timers-ext: "npm:^0.1.7"
-  checksum: 10c0/297e65cd8256bdf24c48f5e158da80d4c9688db0d6e65c5dcc13fa768e782ddeb71aec36925359931b5efef0efc6666b5bb2af6deb3de63d4258a3821ed16fce
+"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "path-parse@npm:1.0.7"
+  checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
   languageName: node
   linkType: hard
 
-"merge-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "merge-stream@npm:2.0.0"
-  checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
+"path-scurry@npm:^1.10.2":
+  version: 1.10.2
+  resolution: "path-scurry@npm:1.10.2"
+  dependencies:
+    lru-cache: "npm:^10.2.0"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+  checksum: 10c0/d723777fbf9627f201e64656680f66ebd940957eebacf780e6cce1c2919c29c116678b2d7dbf8821b3a2caa758d125f4444005ccec886a25c8f324504e48e601
   languageName: node
   linkType: hard
 
-"merge2@npm:^1.3.0, merge2@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "merge2@npm:1.4.1"
-  checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb
+"path-to-regexp@npm:0.1.7":
+  version: 0.1.7
+  resolution: "path-to-regexp@npm:0.1.7"
+  checksum: 10c0/50a1ddb1af41a9e68bd67ca8e331a705899d16fb720a1ea3a41e310480948387daf603abb14d7b0826c58f10146d49050a1291ba6a82b78a382d1c02c0b8f905
   languageName: node
   linkType: hard
 
-"microbuffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "microbuffer@npm:1.0.0"
-  checksum: 10c0/b4615ba2f61bf30d7c1a2eeef0d6bea8acbbe92bfb300024fbf62ba3b5d553eb4bae75642dbc8d995f43a10066e126d76ac62fd5543c0026bcecc2d895efdbb2
+"path-type@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "path-type@npm:4.0.0"
+  checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4":
-  version: 4.0.5
-  resolution: "micromatch@npm:4.0.5"
+"pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pbkdf2@npm:3.1.2"
   dependencies:
-    braces: "npm:^3.0.2"
-    picomatch: "npm:^2.3.1"
-  checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff
+    create-hash: "npm:^1.1.2"
+    create-hmac: "npm:^1.1.4"
+    ripemd160: "npm:^2.0.1"
+    safe-buffer: "npm:^5.0.1"
+    sha.js: "npm:^2.4.8"
+  checksum: 10c0/5a30374e87d33fa080a92734d778cf172542cc7e41b96198c4c88763997b62d7850de3fbda5c3111ddf79805ee7c1da7046881c90ac4920b5e324204518b05fd
   languageName: node
   linkType: hard
 
-"mime-db@npm:1.52.0":
-  version: 1.52.0
-  resolution: "mime-db@npm:1.52.0"
-  checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa
+"performance-now@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "performance-now@npm:2.1.0"
+  checksum: 10c0/22c54de06f269e29f640e0e075207af57de5052a3d15e360c09b9a8663f393f6f45902006c1e71aa8a5a1cdfb1a47fe268826f8496d6425c362f00f5bc3e85d9
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27":
-  version: 2.1.35
-  resolution: "mime-types@npm:2.1.35"
-  dependencies:
-    mime-db: "npm:1.52.0"
-  checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2
+"picocolors@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "picocolors@npm:0.2.1"
+  checksum: 10c0/98a83c77912c80aea0fc518aec184768501bfceafa490714b0f43eda9c52e372b844ce0a591e822bbfe5df16dcf366be7cbdb9534d39cf54a80796340371ee17
   languageName: node
   linkType: hard
 
-"mime@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mime@npm:3.0.0"
-  bin:
-    mime: cli.js
-  checksum: 10c0/402e792a8df1b2cc41cb77f0dcc46472b7944b7ec29cb5bbcd398624b6b97096728f1239766d3fdeb20551dd8d94738344c195a6ea10c4f906eb0356323b0531
+"picocolors@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "picocolors@npm:1.0.0"
+  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mimic-fn@npm:2.1.0"
-  checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4
+"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "picomatch@npm:2.3.1"
+  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
+  languageName: node
+  linkType: hard
+
+"pify@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "pify@npm:2.3.0"
+  checksum: 10c0/551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc
   languageName: node
   linkType: hard
 
-"mini-css-extract-plugin@npm:^2.8.1":
-  version: 2.8.1
-  resolution: "mini-css-extract-plugin@npm:2.8.1"
-  dependencies:
-    schema-utils: "npm:^4.0.0"
-    tapable: "npm:^2.2.1"
-  peerDependencies:
-    webpack: ^5.0.0
-  checksum: 10c0/ef0064f32051294e76141ba74ddf139d313ba26f3abcef1a3906347ca75df8e69c490351bd4c2f373b0cf5c934f39c7d643c8615421c24e4d2c724345294f80a
+"pify@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "pify@npm:4.0.1"
+  checksum: 10c0/6f9d404b0d47a965437403c9b90eca8bb2536407f03de165940e62e72c8c8b75adda5516c6b9b23675a5877cc0bcac6bdfb0ef0e39414cd2476d5495da40e7cf
   languageName: node
   linkType: hard
 
-"minimatch@npm:9.0.3":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
+"pinkie-promise@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "pinkie-promise@npm:2.0.1"
   dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac
+    pinkie: "npm:^2.0.0"
+  checksum: 10c0/11b5e5ce2b090c573f8fad7b517cbca1bb9a247587306f05ae71aef6f9b2cd2b923c304aa9663c2409cfde27b367286179f1379bc4ec18a3fbf2bb0d473b160a
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "minimatch@npm:3.1.2"
-  dependencies:
-    brace-expansion: "npm:^1.1.7"
-  checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311
+"pinkie@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "pinkie@npm:2.0.4"
+  checksum: 10c0/25228b08b5597da42dc384221aa0ce56ee0fbf32965db12ba838e2a9ca0193c2f0609c45551ee077ccd2060bf109137fdb185b00c6d7e0ed7e35006d20fdcbc6
   languageName: node
   linkType: hard
 
-"minimatch@npm:^5.0.1":
-  version: 5.1.6
-  resolution: "minimatch@npm:5.1.6"
-  dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
+"pino-std-serializers@npm:^3.1.0":
+  version: 3.2.0
+  resolution: "pino-std-serializers@npm:3.2.0"
+  checksum: 10c0/ae08159372b5bbe69f13770a7f20ba7ded0bb97b2c6f42f780995582135ca907e66504f06371c12f991dbfcd489280f942786c02a9e8e952974d455cb0a477c9
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1":
-  version: 9.0.4
-  resolution: "minimatch@npm:9.0.4"
+"pino@npm:^6.13.0":
+  version: 6.14.0
+  resolution: "pino@npm:6.14.0"
   dependencies:
-    brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
+    fast-redact: "npm:^3.0.0"
+    fast-safe-stringify: "npm:^2.0.8"
+    flatstr: "npm:^1.0.12"
+    pino-std-serializers: "npm:^3.1.0"
+    process-warning: "npm:^1.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    sonic-boom: "npm:^1.0.2"
+  bin:
+    pino: bin.js
+  checksum: 10c0/5d3cb22c804e2bf2439ace64a46a7901d0a138cb75715ad8a8bbcf3ddb09dc5e33a9fc8a49527c3345d317619748c6de94d28481911ae931c21b953e24048425
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.2.5":
-  version: 1.2.8
-  resolution: "minimist@npm:1.2.8"
-  checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6
+"pirates@npm:^4.0.1, pirates@npm:^4.0.4":
+  version: 4.0.6
+  resolution: "pirates@npm:4.0.6"
+  checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
   languageName: node
   linkType: hard
 
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
+"pkg-dir@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "pkg-dir@npm:3.0.0"
   dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
+    find-up: "npm:^3.0.0"
+  checksum: 10c0/902a3d0c1f8ac43b1795fa1ba6ffeb37dfd53c91469e969790f6ed5e29ff2bdc50b63ba6115dc056d2efb4a040aa2446d512b3804bdafdf302f734fb3ec21847
   languageName: node
   linkType: hard
 
-"minipass-collect@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "minipass-collect@npm:2.0.1"
+"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "pkg-dir@npm:4.2.0"
   dependencies:
-    minipass: "npm:^7.0.3"
-  checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e
+    find-up: "npm:^4.0.0"
+  checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
+"pkg-up@npm:3.1.0":
+  version: 3.1.0
+  resolution: "pkg-up@npm:3.1.0"
   dependencies:
-    encoding: "npm:^0.1.13"
-    minipass: "npm:^3.1.6"
-    minipass-sized: "npm:^1.0.3"
-    minizlib: "npm:^2.1.2"
-  dependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 10c0/33ab2c5bdb3d91b9cb8bc6ae42d7418f4f00f7f7beae14b3bb21ea18f9224e792f560a6e17b6f1be12bbeb70dbe99a269f4204c60e5d99130a0777b153505c43
+    find-up: "npm:^3.0.0"
+  checksum: 10c0/ecb60e1f8e1f611c0bdf1a0b6a474d6dfb51185567dc6f29cdef37c8d480ecba5362e006606bb290519bbb6f49526c403fabea93c3090c20368d98bb90c999ab
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "minipass-fetch@npm:3.0.4"
-  dependencies:
-    encoding: "npm:^0.1.13"
-    minipass: "npm:^7.0.3"
-    minipass-sized: "npm:^1.0.3"
-    minizlib: "npm:^2.1.2"
-  dependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+"platform@npm:^1.3.6":
+  version: 1.3.6
+  resolution: "platform@npm:1.3.6"
+  checksum: 10c0/69f2eb692e15f1a343dd0d9347babd9ca933824c8673096be746ff66f99f2bdc909fadd8609076132e6ec768349080babb7362299f2a7f885b98f1254ae6224b
   languageName: node
   linkType: hard
 
-"minipass-flush@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "minipass-flush@npm:1.0.5"
+"pnp-webpack-plugin@npm:1.6.4":
+  version: 1.6.4
+  resolution: "pnp-webpack-plugin@npm:1.6.4"
   dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd
+    ts-pnp: "npm:^1.1.6"
+  checksum: 10c0/6cedab8a9cd129b9f58408023f80cad528e361685f50c2149da7ad8fb79bd2043d3250c68b8723aa43ecdb913931edf04ecaa4d7afe719d0e151055d41779599
   languageName: node
   linkType: hard
 
-"minipass-pipeline@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "minipass-pipeline@npm:1.2.4"
+"portfinder@npm:^1.0.26":
+  version: 1.0.32
+  resolution: "portfinder@npm:1.0.32"
   dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2
+    async: "npm:^2.6.4"
+    debug: "npm:^3.2.7"
+    mkdirp: "npm:^0.5.6"
+  checksum: 10c0/cef8b567b78aabccc59fe8e103bac8b394bb45a6a69be626608f099f454124c775aaf47b274c006332c07ab3f501cde55e49aaeb9d49d78d90362d776a565cbf
   languageName: node
   linkType: hard
 
-"minipass-sized@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "minipass-sized@npm:1.0.3"
-  dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb
+"posix-character-classes@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "posix-character-classes@npm:0.1.1"
+  checksum: 10c0/cce88011548a973b4af58361cd8f5f7b5a6faff8eef0901565802f067bcabf82597e920d4c97c22068464be3cbc6447af589f6cc8a7d813ea7165be60a0395bc
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
-  version: 3.3.6
-  resolution: "minipass@npm:3.3.6"
-  dependencies:
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "minipass@npm:5.0.0"
-  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
+"postcss-attribute-case-insensitive@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "postcss-attribute-case-insensitive@npm:4.0.2"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-selector-parser: "npm:^6.0.2"
+  checksum: 10c0/fe83aed9e3de315c9d029d883179b0fdeb63ec28e2e149b590187934cf59dc22b939bb36c62766abb500ba74004d0efbd0cc0267ca6c543e743abb88b054c11c
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5
+"postcss-browser-comments@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-browser-comments@npm:3.0.0"
+  dependencies:
+    postcss: "npm:^7"
+  peerDependencies:
+    browserslist: ^4
+  checksum: 10c0/642374e23b237e236791f02cd01cb3382a1dd62c895173ed13b0f2f428ce62fc5666b7a85fbe0f2ed8f568290f19710323f13a9326715c2d5b2a6e8ec7e1a8e6
   languageName: node
   linkType: hard
 
-"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "minizlib@npm:2.1.2"
+"postcss-calc@npm:^7.0.1":
+  version: 7.0.5
+  resolution: "postcss-calc@npm:7.0.5"
   dependencies:
-    minipass: "npm:^3.0.0"
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
+    postcss: "npm:^7.0.27"
+    postcss-selector-parser: "npm:^6.0.2"
+    postcss-value-parser: "npm:^4.0.2"
+  checksum: 10c0/37f10245a1280d96165a8f56a0cd90fcbc3f9277fc50b54ba79a45f24da4662b8ce57dcffe81331e8997bcc56f7b89fae4e8d9dc27b8c5d72010976d622388e3
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
-  bin:
-    mkdirp: bin/cmd.js
-  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
+"postcss-color-functional-notation@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "postcss-color-functional-notation@npm:2.0.1"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/257c02d473d2a2c696542867eba6087de8e51ad8b44545bffbf85d7e3bb63bc8677198406d3ca80b40115e8c0648ad4c3fd53c132eef3cb1643bc09cbcc365cf
   languageName: node
   linkType: hard
 
-"mrmime@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mrmime@npm:2.0.0"
-  checksum: 10c0/312b35ed288986aec90955410b21ed7427fd1e4ee318cb5fc18765c8d029eeded9444faa46589e5b1ed6b35fb2054a802ac8dcb917ddf6b3e189cb3bf11a965c
+"postcss-color-gray@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-color-gray@npm:5.0.0"
+  dependencies:
+    "@csstools/convert-colors": "npm:^1.4.0"
+    postcss: "npm:^7.0.5"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/c8a8d1d48dc4b6ef6fa017c9ab8318e807baf4b12a4f6ec8946e6bcf3ffb6eafbb3abe56ddd439b787709b4270af35b59c338677b398021cb223249c55973832
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.2":
-  version: 2.1.2
-  resolution: "ms@npm:2.1.2"
-  checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc
+"postcss-color-hex-alpha@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "postcss-color-hex-alpha@npm:5.0.3"
+  dependencies:
+    postcss: "npm:^7.0.14"
+    postcss-values-parser: "npm:^2.0.1"
+  checksum: 10c0/4e897520bcc3397ed10cb14e130f54abfc6e66e8d023ad522ec98d9c107ec8677d77e0739edc7f0b4d78869d40430709427ba23bcfd610995fa6422b294067d6
   languageName: node
   linkType: hard
 
-"ms@npm:^2.0.0":
-  version: 2.1.3
-  resolution: "ms@npm:2.1.3"
-  checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48
+"postcss-color-mod-function@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "postcss-color-mod-function@npm:3.0.3"
+  dependencies:
+    "@csstools/convert-colors": "npm:^1.4.0"
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/1a74557199282ab1a90be81c1957146cf4dd6a6d3a2db304d7ce44a8db809cfb8b35d830c2526e1de77b37e8eceaa5d4603d881075eaf19e2d27513cdb70035d
   languageName: node
   linkType: hard
 
-"nan@npm:^2.14.2":
-  version: 2.19.0
-  resolution: "nan@npm:2.19.0"
+"postcss-color-rebeccapurple@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-color-rebeccapurple@npm:4.0.1"
   dependencies:
-    node-gyp: "npm:latest"
-  checksum: 10c0/b8d05d75f92ee9d94affa50d0aa41b6c698254c848529452d7ab67c2e0d160a83f563bfe2cbd53e077944eceb48c757f83c93634c7c9ff404c9ec1ed4e5ced1a
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/10ae55e3eadf35d64ea42fe40872b09259768c63e1a918b78e89b2441046fde6d0d1a635b8b78a916b80af500f622b228af108e435d3ff74645b23b811b93ec0
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.7":
-  version: 3.3.7
-  resolution: "nanoid@npm:3.3.7"
-  bin:
-    nanoid: bin/nanoid.cjs
-  checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3
+"postcss-colormin@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "postcss-colormin@npm:4.0.3"
+  dependencies:
+    browserslist: "npm:^4.0.0"
+    color: "npm:^3.0.0"
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/7f722c3287e51c6103554e536d0ee8497f137f6292874180cb50de98c8e86b0701898aafc81fa133fef29f3f857dc2a36b101d9b629556dcff02487e91e668af
   languageName: node
   linkType: hard
 
-"natural-compare@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare@npm:1.4.0"
-  checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447
+"postcss-convert-values@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-convert-values@npm:4.0.1"
+  dependencies:
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/19d81085b7e74610f35a857eb0daba90fc3f0195e211175051ff7cd77f1a6c2b16e82059495651c37e83a3c47b4ad8eae4eb6e7792ad01a2694ba541f518f50e
   languageName: node
   linkType: hard
 
-"neatequal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "neatequal@npm:1.0.0"
+"postcss-custom-media@npm:^7.0.8":
+  version: 7.0.8
+  resolution: "postcss-custom-media@npm:7.0.8"
   dependencies:
-    varstream: "npm:^0.3.2"
-  checksum: 10c0/3feff681d474e451996ee98260afbeb5d02d1d41165038cb9bd661e248f76e7385a567811aa5de97769711cc2220c4b221e7a4c24b21dbdc7351c539371a9097
+    postcss: "npm:^7.0.14"
+  checksum: 10c0/d5f36919a636ed2170cacef433047fb7fadaabb411ea07bf8f3d5c10544906369a577df088cedf129dad1c3167d7203af2806d9498f240b4e7b02ed53a35bf60
   languageName: node
   linkType: hard
 
-"negotiator@npm:^0.6.3":
-  version: 0.6.3
-  resolution: "negotiator@npm:0.6.3"
-  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
+"postcss-custom-properties@npm:^8.0.11":
+  version: 8.0.11
+  resolution: "postcss-custom-properties@npm:8.0.11"
+  dependencies:
+    postcss: "npm:^7.0.17"
+    postcss-values-parser: "npm:^2.0.1"
+  checksum: 10c0/66e2443cf890ba7a040dcb54cdf3d5c64015fa89f10b66b0bd58b6f43d4f82f73af77c8f97c67605c7b2c88482a10a02b7935618d4cdc683587066e9b33bd0db
   languageName: node
   linkType: hard
 
-"neo-async@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "neo-async@npm:2.6.2"
-  checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d
+"postcss-custom-selectors@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "postcss-custom-selectors@npm:5.1.2"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-selector-parser: "npm:^5.0.0-rc.3"
+  checksum: 10c0/d39ea9c7b6bb69163f8d31b34557eecd6849de5480a7f6f7fb1fe01751e93909c85f6512028e22a524081cb97a1d0e8b685325eca296983163e143ce3d872f68
   languageName: node
   linkType: hard
 
-"next-tick@npm:1, next-tick@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "next-tick@npm:1.1.0"
-  checksum: 10c0/3ba80dd805fcb336b4f52e010992f3e6175869c8d88bf4ff0a81d5d66e6049f89993463b28211613e58a6b7fe93ff5ccbba0da18d4fa574b96289e8f0b577f28
+"postcss-dir-pseudo-class@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-dir-pseudo-class@npm:5.0.0"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-selector-parser: "npm:^5.0.0-rc.3"
+  checksum: 10c0/8bc84b08ce9a22db284500dee1b36458fba0f7b7cdad70b4f7a171b6c20dcbef5dfdfd310e7b74d6fbfcd2477cd121a89f8a8083a871254ce800a9a856cc9279
   languageName: node
   linkType: hard
 
-"no-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "no-case@npm:3.0.4"
+"postcss-discard-comments@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-discard-comments@npm:4.0.2"
   dependencies:
-    lower-case: "npm:^2.0.2"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/8ef545f0b3f8677c848f86ecbd42ca0ff3cd9dd71c158527b344c69ba14710d816d8489c746b6ca225e7b615108938a0bda0a54706f8c255933703ac1cf8e703
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/12b491ae1a730137bc77443d2dda274ec385e8a8994a87eda67ca811c9b733f21d362fac6762f9b850a9093ef645201bedcfda91983909cd1b14092524dbbe26
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^9.0.0":
-  version: 9.4.1
-  resolution: "node-gyp@npm:9.4.1"
+"postcss-discard-duplicates@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-discard-duplicates@npm:4.0.2"
   dependencies:
-    env-paths: "npm:^2.2.0"
-    exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^7.1.4"
-    graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^10.0.3"
-    nopt: "npm:^6.0.0"
-    npmlog: "npm:^6.0.0"
-    rimraf: "npm:^3.0.2"
-    semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^2.0.2"
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: 10c0/f7d676cfa79f27d35edf17fe9c80064123670362352d19729e5dc9393d7e99f1397491c3107eddc0c0e8941442a6244a7ba6c860cfbe4b433b4cae248a55fe10
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/ca7a9a1564e4a8aedccb0fb9a8b4b3b42328998d30e54a6cbff8cee85cf9d1751acb802549f2cf8d4a846731f9a22946e83d2ab430ea66332c58e13d9c6e9d08
   languageName: node
   linkType: hard
 
-"node-gyp@npm:latest":
-  version: 10.1.0
-  resolution: "node-gyp@npm:10.1.0"
+"postcss-discard-empty@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-discard-empty@npm:4.0.1"
   dependencies:
-    env-paths: "npm:^2.2.0"
-    exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^10.3.10"
-    graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^13.0.0"
-    nopt: "npm:^7.0.0"
-    proc-log: "npm:^3.0.0"
-    semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^4.0.0"
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: 10c0/9cc821111ca244a01fb7f054db7523ab0a0cd837f665267eb962eb87695d71fb1e681f9e21464cc2fd7c05530dc4c81b810bca1a88f7d7186909b74477491a3c
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/be6c575a92dfd8b43e3e31af27b4585273e51b8576a8f8b68128fd66a050aeed2395e8f68000ab4047a5a51388fd1c1d6abdcb21469bccf99394faef5638ed94
+  languageName: node
+  linkType: hard
+
+"postcss-discard-overridden@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-discard-overridden@npm:4.0.1"
+  dependencies:
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/187408dbc7668d8b9c8326b8c8a615c191d1cd159095dd77a35bdd7d53688a650e68f043cdacccb78429a0d0339b834313060ae45c63d022ec3c13f581d37be8
   languageName: node
   linkType: hard
 
-"node-int64@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "node-int64@npm:0.4.0"
-  checksum: 10c0/a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a
+"postcss-double-position-gradients@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "postcss-double-position-gradients@npm:1.0.0"
+  dependencies:
+    postcss: "npm:^7.0.5"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/92bfd22e8a34a8f872c09a6be82c3ed8647d5caa3680efcbbf73fdcc7dd33341d235c1ccfe8cc8d6321e8c593c734d0796318f63d4e0faa22c56770ab6d6fe7b
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "node-releases@npm:2.0.14"
-  checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9
+"postcss-env-function@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "postcss-env-function@npm:2.0.2"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/275eb38146ec7cf928bdc26af55bb7e26deab6cc897248dd7c67f6de57b908165a1915ca76cf55c08895071b5ce4964498597a7de8024cb4036d24f6440bfad6
   languageName: node
   linkType: hard
 
-"nopt@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "nopt@npm:6.0.0"
+"postcss-flexbugs-fixes@npm:4.2.1":
+  version: 4.2.1
+  resolution: "postcss-flexbugs-fixes@npm:4.2.1"
   dependencies:
-    abbrev: "npm:^1.0.0"
-  bin:
-    nopt: bin/nopt.js
-  checksum: 10c0/837b52c330df16fcaad816b1f54fec6b2854ab1aa771d935c1603fbcf9b023bb073f1466b1b67f48ea4dce127ae675b85b9d9355700e9b109de39db490919786
+    postcss: "npm:^7.0.26"
+  checksum: 10c0/57d2894dadd5762ae243792ca45806281ca9c32a9270519f2fd5d95cf1445590df260997b3d9ff937b9e1a551644799881c7f337352dde4e453805687c1ebee8
   languageName: node
   linkType: hard
 
-"nopt@npm:^7.0.0":
-  version: 7.2.0
-  resolution: "nopt@npm:7.2.0"
+"postcss-focus-visible@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-focus-visible@npm:4.0.0"
   dependencies:
-    abbrev: "npm:^2.0.0"
-  bin:
-    nopt: bin/nopt.js
-  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/fc1dc654ae2b07427d1a9d660b0d37679a80ee24c4d9aa7324b446c7544878bcd84757c4329225c118c798e8a115d42c020477aa34ddd2ce4d7796928b329298
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
+"postcss-focus-within@npm:^3.0.0":
   version: 3.0.0
-  resolution: "normalize-path@npm:3.0.0"
-  checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
+  resolution: "postcss-focus-within@npm:3.0.0"
+  dependencies:
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/9fda6a96bbf2932bbf4974c3a46e865949265e39d22ca27d0e5498a6a04f90aac7b6e2413e2808df9c4c3a78d6bcc0465396c21c61b0aff52ab8c7d41bf0a28d
   languageName: node
   linkType: hard
 
-"npm-run-path@npm:^4.0.1":
+"postcss-font-variant@npm:^4.0.0":
   version: 4.0.1
-  resolution: "npm-run-path@npm:4.0.1"
+  resolution: "postcss-font-variant@npm:4.0.1"
   dependencies:
-    path-key: "npm:^3.0.0"
-  checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/eb35b1da7525c8ac487110b843f7454d1cf0245bac57898502d0d437a2765cbdf7b19d8563a21353f71a1b5c646851695d8e42677870e11040e0a2ae89ddac3a
   languageName: node
   linkType: hard
 
-"npmlog@npm:^6.0.0":
-  version: 6.0.2
-  resolution: "npmlog@npm:6.0.2"
+"postcss-gap-properties@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-gap-properties@npm:2.0.0"
   dependencies:
-    are-we-there-yet: "npm:^3.0.0"
-    console-control-strings: "npm:^1.1.0"
-    gauge: "npm:^4.0.3"
-    set-blocking: "npm:^2.0.0"
-  checksum: 10c0/0cacedfbc2f6139c746d9cd4a85f62718435ad0ca4a2d6459cd331dd33ae58206e91a0742c1558634efcde3f33f8e8e7fd3adf1bfe7978310cf00bd55cccf890
-  languageName: node
-  linkType: hard
-
-"nwsapi@npm:^2.2.2, nwsapi@npm:^2.2.4":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/3402832f2526351de17a2a8ca6af99cf593e81918afdb437e5d4822ef9c2a9d3ad14571ab688d2d3163d53c2c155116a0c58d3fc3e38fc85b497a6d4c9f57ee3
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "object-assign@npm:4.1.1"
-  checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
+"postcss-image-set-function@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "postcss-image-set-function@npm:3.0.1"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/648860c96f44b5fe482ee6878a057996001d788a6116b74f4a821f2bc8b2f0edd7d1a90e496f2a20946853205003849509c12173ebec78919f972f7732ebc349
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.13.1":
-  version: 1.13.1
-  resolution: "object-inspect@npm:1.13.1"
-  checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d
+"postcss-initial@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "postcss-initial@npm:3.0.4"
+  dependencies:
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/8819bec7dd84617ffcda6a93c255ebf32e426922df6ac41154e507919e9b2e71677038c8657463f6c354b9b9509394b66a1d253db7b2eddd10f607db967dc5bf
   languageName: node
   linkType: hard
 
-"object-keys@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "object-keys@npm:1.1.1"
-  checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d
+"postcss-lab-function@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "postcss-lab-function@npm:2.0.1"
+  dependencies:
+    "@csstools/convert-colors": "npm:^1.4.0"
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/e74dd68258e9935856a468b863b712395df344d503b3a77f2240216de494ea7aced272cdc7ccc6af9905ab5ab04b7f0d9295752a26de7af0f1717968f8b77720
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
-  version: 4.1.5
-  resolution: "object.assign@npm:4.1.5"
+"postcss-load-config@npm:^2.0.0":
+  version: 2.1.2
+  resolution: "postcss-load-config@npm:2.1.2"
   dependencies:
-    call-bind: "npm:^1.0.5"
-    define-properties: "npm:^1.2.1"
-    has-symbols: "npm:^1.0.3"
-    object-keys: "npm:^1.1.1"
-  checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469
+    cosmiconfig: "npm:^5.0.0"
+    import-cwd: "npm:^2.0.0"
+  checksum: 10c0/a91df467d07b9ac3c5373721ac5294e2c21c9acdc9f2e2f43f7dc9d02529bee7d9e65b5ab20165d3f99d2421e38db893109c6bfd5f7432d607bfba5eea0f61df
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.7":
-  version: 1.1.8
-  resolution: "object.entries@npm:1.1.8"
+"postcss-loader@npm:3.0.0":
+  version: 3.0.0
+  resolution: "postcss-loader@npm:3.0.0"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3
+    loader-utils: "npm:^1.1.0"
+    postcss: "npm:^7.0.0"
+    postcss-load-config: "npm:^2.0.0"
+    schema-utils: "npm:^1.0.0"
+  checksum: 10c0/1b11a6a3f52c9ef5d86c7be87a16a420fc5396865fcfeaf2d9f21cb5c7b4fd3381ecf9b9fbe748f5efb6de9a17f270fcf3b76f76a45f7d91ffff507b674f0171
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.7":
-  version: 2.0.8
-  resolution: "object.fromentries@npm:2.0.8"
+"postcss-logical@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-logical@npm:3.0.0"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/cd4327e6c3369cfa805deb4cbbe919bfb7d3aeebf0bcaba291bb568ea7169f8f8cdbcabe2f00b40db0c20cd20f08e11b5f3a5a36fb7dd3fe04850c50db3bf83b
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/79b094c8a17eb62059c2c15a9417a8a68c31685a93d6736de7d2f4872d728e8738288f244eb1bb2d3e6348e906b1e9c9a533e90b4bfd5f80111723875c53a99c
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.3":
-  version: 1.1.4
-  resolution: "object.hasown@npm:1.1.4"
+"postcss-media-minmax@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-media-minmax@npm:4.0.0"
   dependencies:
-    define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/f23187b08d874ef1aea060118c8259eb7f99f93c15a50771d710569534119062b90e087b92952b2d0fb1bb8914d61fb0b43c57fb06f622aaad538fe6868ab987
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/fca7dec6ccd7a124cf10128d9329f6f2954b264109b8bd9a799faf5807393671e92868fcb91948930667c3e5dd874d444a60f36d96569a31f3437a692e1ca7d3
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.6, object.values@npm:^1.1.7":
-  version: 1.2.0
-  resolution: "object.values@npm:1.2.0"
+"postcss-merge-longhand@npm:^4.0.11":
+  version: 4.0.11
+  resolution: "postcss-merge-longhand@npm:4.0.11"
   dependencies:
-    call-bind: "npm:^1.0.7"
-    define-properties: "npm:^1.2.1"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3
+    css-color-names: "npm:0.0.4"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+    stylehacks: "npm:^4.0.0"
+  checksum: 10c0/6611e41d7fd103befdf429277214da56bcba37e4f2e7a5a0d4b463f418e7b66f71bfa6b5bb21be6e92e9d9e30884d9cc13c7f8025abef69e0941a0202afbcf15
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0":
-  version: 1.4.0
-  resolution: "once@npm:1.4.0"
+"postcss-merge-rules@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "postcss-merge-rules@npm:4.0.3"
   dependencies:
-    wrappy: "npm:1"
-  checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0
+    browserslist: "npm:^4.0.0"
+    caniuse-api: "npm:^3.0.0"
+    cssnano-util-same-parent: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-selector-parser: "npm:^3.0.0"
+    vendors: "npm:^1.0.0"
+  checksum: 10c0/999462a396a3987355bce10318db03b2cff08b8162285e98f247713620eb4ac352e325f4dec6362dda91747303d3c83386e48aad3cc8e671f5e51a094a7d9c68
   languageName: node
   linkType: hard
 
-"onetime@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "onetime@npm:5.1.2"
+"postcss-minify-font-values@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-minify-font-values@npm:4.0.2"
   dependencies:
-    mimic-fn: "npm:^2.1.0"
-  checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/e22eec80302a193f18956ea6f32f3c010603b607e7c35753c9af14d7ac2c53f1f4cc45bd150c478a04805ade8914ec612f67e486f07fd82bc0af1fe779f3670f
   languageName: node
   linkType: hard
 
-"opener@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "opener@npm:1.5.2"
-  bin:
-    opener: bin/opener-bin.js
-  checksum: 10c0/dd56256ab0cf796585617bc28e06e058adf09211781e70b264c76a1dbe16e90f868c974e5bf5309c93469157c7d14b89c35dc53fe7293b0e40b4d2f92073bc79
+"postcss-minify-gradients@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-minify-gradients@npm:4.0.2"
+  dependencies:
+    cssnano-util-get-arguments: "npm:^4.0.0"
+    is-color-stop: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/946546279c2fd2d84c9ce42085c524940a5feb3bc73ca8d45bffc978196194565017531d9b405578f02a5d1c337fd7c982d690aaa56471d1c13475c3cefefbdc
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.9.3":
-  version: 0.9.3
-  resolution: "optionator@npm:0.9.3"
+"postcss-minify-params@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-minify-params@npm:4.0.2"
   dependencies:
-    "@aashutoshrathi/word-wrap": "npm:^1.2.3"
-    deep-is: "npm:^0.1.3"
-    fast-levenshtein: "npm:^2.0.6"
-    levn: "npm:^0.4.1"
-    prelude-ls: "npm:^1.2.1"
-    type-check: "npm:^0.4.0"
-  checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c
+    alphanum-sort: "npm:^1.0.0"
+    browserslist: "npm:^4.0.0"
+    cssnano-util-get-arguments: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+    uniqs: "npm:^2.0.0"
+  checksum: 10c0/c43f5a04f62b864303e14a8584c662d1b3f6f9ed1df5585a43f778197729e3ee2b8fc099b2977b47f813ea11f32e3c8fcd59937ecd8a92b39c8207ce6c745936
   languageName: node
   linkType: hard
 
-"p-limit@npm:^2.2.0":
-  version: 2.3.0
-  resolution: "p-limit@npm:2.3.0"
+"postcss-minify-selectors@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-minify-selectors@npm:4.0.2"
   dependencies:
-    p-try: "npm:^2.0.0"
-  checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12
+    alphanum-sort: "npm:^1.0.0"
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-selector-parser: "npm:^3.0.0"
+  checksum: 10c0/e7f5ffcfb3d9a763201952327c5bf4cd3d4fcb0ffdbab156d935600cbb7bf0d15b7b039449fe3971f54edd33043d7a41580715ee6d57f3cb0336ba1ca915fa12
   languageName: node
   linkType: hard
 
-"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "p-limit@npm:3.1.0"
+"postcss-modules-extract-imports@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-modules-extract-imports@npm:2.0.0"
   dependencies:
-    yocto-queue: "npm:^0.1.0"
-  checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a
+    postcss: "npm:^7.0.5"
+  checksum: 10c0/170e8d680c267c536563e76979f04dc80e6dfa026d49f1e9ead2d0981a74b0c64d2894a8fd691e50568f12144553cf0b948ab43263872b3f696dcb34b683e238
   languageName: node
   linkType: hard
 
-"p-locate@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "p-locate@npm:4.1.0"
-  dependencies:
-    p-limit: "npm:^2.2.0"
-  checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9
+"postcss-modules-extract-imports@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-modules-extract-imports@npm:3.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
   languageName: node
   linkType: hard
 
-"p-locate@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "p-locate@npm:5.0.0"
+"postcss-modules-local-by-default@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "postcss-modules-local-by-default@npm:3.0.3"
   dependencies:
-    p-limit: "npm:^3.0.2"
-  checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a
+    icss-utils: "npm:^4.1.1"
+    postcss: "npm:^7.0.32"
+    postcss-selector-parser: "npm:^6.0.2"
+    postcss-value-parser: "npm:^4.1.0"
+  checksum: 10c0/007fd7286b4e120edfdf1a41f2006e9c8cb49e1613a4e3f0fdc184ad14273a1bbfc39ced3bc7cbad9af64bf67056e8ea0dcfda16d3057562343a48ee9ec2ccac
   languageName: node
   linkType: hard
 
-"p-map@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-map@npm:4.0.0"
+"postcss-modules-local-by-default@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "postcss-modules-local-by-default@npm:4.0.4"
   dependencies:
-    aggregate-error: "npm:^3.0.0"
-  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
+    icss-utils: "npm:^5.0.0"
+    postcss-selector-parser: "npm:^6.0.2"
+    postcss-value-parser: "npm:^4.1.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/9ebf464867eb10b29b73501b1466dcac8352ed852ef68ec23571f515daa74401d7ace9a6c72f354542081fdbb47d098c9bc6b05373b553a6e35779d072f967bb
   languageName: node
   linkType: hard
 
-"p-try@npm:^2.0.0":
+"postcss-modules-scope@npm:^2.2.0":
   version: 2.2.0
-  resolution: "p-try@npm:2.2.0"
-  checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f
+  resolution: "postcss-modules-scope@npm:2.2.0"
+  dependencies:
+    postcss: "npm:^7.0.6"
+    postcss-selector-parser: "npm:^6.0.0"
+  checksum: 10c0/60b4438d43e6629d72b31a5122037e5574f8a6a4629038cd74afc4e5197cebc55b76c765b6bfcc2421bc740d19c3c97e68918e560a0fe88047c2131d0966df3c
   languageName: node
   linkType: hard
 
-"pako@npm:^1.0.0":
-  version: 1.0.11
-  resolution: "pako@npm:1.0.11"
-  checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe
+"postcss-modules-scope@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "postcss-modules-scope@npm:3.1.1"
+  dependencies:
+    postcss-selector-parser: "npm:^6.0.4"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/3ef6ac14fcda1581bc43e37622256bd87b99ea49c59b2aae648d057d57f5ecc634648cce9910166220a797567af674bc09246ccc010f1dd58d2863b805719109
   languageName: node
   linkType: hard
 
-"param-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "param-case@npm:3.0.4"
+"postcss-modules-values@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-modules-values@npm:3.0.0"
   dependencies:
-    dot-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/ccc053f3019f878eca10e70ec546d92f51a592f762917dafab11c8b532715dcff58356118a6f350976e4ab109e321756f05739643ed0ca94298e82291e6f9e76
+    icss-utils: "npm:^4.0.0"
+    postcss: "npm:^7.0.6"
+  checksum: 10c0/f97b4669446810aa9c4c22538e24faee203e8462f1c7d38923c57140903bc170451dfec5974e480c2c367690735042cbfec187d209d0044d99f829f29ad0e610
   languageName: node
   linkType: hard
 
-"parent-module@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "parent-module@npm:1.0.1"
+"postcss-modules-values@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-modules-values@npm:4.0.0"
   dependencies:
-    callsites: "npm:^3.0.0"
-  checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556
+    icss-utils: "npm:^5.0.0"
+  peerDependencies:
+    postcss: ^8.1.0
+  checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
   languageName: node
   linkType: hard
 
-"parse-json@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "parse-json@npm:5.2.0"
+"postcss-nesting@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "postcss-nesting@npm:7.0.1"
   dependencies:
-    "@babel/code-frame": "npm:^7.0.0"
-    error-ex: "npm:^1.3.1"
-    json-parse-even-better-errors: "npm:^2.3.0"
-    lines-and-columns: "npm:^1.1.6"
-  checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/c88b81dbc8cac9fc472abb332c8c5b463aad195488719ba3d2164abe93e62c33450a160417e84a6661427b765e84b9d94aa13ad96f8d2d617bd687f053a20083
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.0.0, parse5@npm:^7.1.1, parse5@npm:^7.1.2":
-  version: 7.1.2
-  resolution: "parse5@npm:7.1.2"
+"postcss-normalize-charset@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-normalize-charset@npm:4.0.1"
   dependencies:
-    entities: "npm:^4.4.0"
-  checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/4eea4cb61e9153c064354919d3a0eb4666d5f2ea36c5cc1d24e9901601a03fb9bb40e5161f7203088afb306c7bdf21dfaf19489378d642a612741deb5cb17723
   languageName: node
   linkType: hard
 
-"pascal-case@npm:^3.1.2":
-  version: 3.1.2
-  resolution: "pascal-case@npm:3.1.2"
+"postcss-normalize-display-values@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-display-values@npm:4.0.2"
   dependencies:
-    no-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/05ff7c344809fd272fc5030ae0ee3da8e4e63f36d47a1e0a4855ca59736254192c5a27b5822ed4bae96e54048eec5f6907713cfcfff7cdf7a464eaf7490786d8
+    cssnano-util-get-match: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/01083456e37d466c093defdb7b7fc8779a1ec6fbe0a18469127d243c49fb7c61cc70d378c04461314d7b38327c2833ca928317413bf2a41402b3214a950d7e00
   languageName: node
   linkType: hard
 
-"path-case@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "path-case@npm:3.0.4"
+"postcss-normalize-positions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-positions@npm:4.0.2"
   dependencies:
-    dot-case: "npm:^3.0.4"
-    tslib: "npm:^2.0.3"
-  checksum: 10c0/b6b14637228a558793f603aaeb2fcd981e738b8b9319421b713532fba96d75aa94024b9f6b9ae5aa33d86755144a5b36697d28db62ae45527dbd672fcc2cf0b7
+    cssnano-util-get-arguments: "npm:^4.0.0"
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/1b774b7277420869bfeb5921d66584b1669a2a0d47b34e11b839a34049895e6146721d26c20e6aab7928240a8565ac6dec13b6101837ee50b7edc3016f6288f6
   languageName: node
   linkType: hard
 
-"path-exists@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-exists@npm:4.0.0"
-  checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b
+"postcss-normalize-repeat-style@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-repeat-style@npm:4.0.2"
+  dependencies:
+    cssnano-util-get-arguments: "npm:^4.0.0"
+    cssnano-util-get-match: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/a13e6d0aac3a7a0627a180bcca04467dcab23f14a676ded735dee1ca742293ea7baf283f2cf3c8e28b7429b2ab158b6646f4375d0bbbeffec7870fea1818af0b
   languageName: node
   linkType: hard
 
-"path-is-absolute@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "path-is-absolute@npm:1.0.1"
-  checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078
+"postcss-normalize-string@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-string@npm:4.0.2"
+  dependencies:
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/2827a5a16bbfd87c4f41aa30e818428eb3a86755c43938590e7436c6f7bf7cc17099b37f6b89425f0b7f46d482e230dc3d887426b26566a818eeaa64131e8c8d
+  languageName: node
+  linkType: hard
+
+"postcss-normalize-timing-functions@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-timing-functions@npm:4.0.2"
+  dependencies:
+    cssnano-util-get-match: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/999c3166332b83c7cad2d5cf21dfda52349068eeeec79117304e754d3607dc7ed2133f78c1c0fec870c34e700687a4ed0b4f8780ca3c0a4428b422fbc72ec14e
   languageName: node
   linkType: hard
 
-"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "path-key@npm:3.1.1"
-  checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c
+"postcss-normalize-unicode@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-normalize-unicode@npm:4.0.1"
+  dependencies:
+    browserslist: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/9841bcfb11c4371cea853c2b88756428215c3dd64b3535b136189ca67f721b309d32d59067ca9ba8a6862a69c1ada4a5ca65c8d40757fd2ba87f313bccc97634
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "path-parse@npm:1.0.7"
-  checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1
+"postcss-normalize-url@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-normalize-url@npm:4.0.1"
+  dependencies:
+    is-absolute-url: "npm:^2.0.0"
+    normalize-url: "npm:^3.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/713d0b87d5dd0aa126f3f4850be581b05c3668887c591f84e89ca90fb892a6a78fb7fdcf4750c968bf804dcd0bd9d7768e0339c7259e891a69c5d6b414333a3f
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.2":
-  version: 1.10.2
-  resolution: "path-scurry@npm:1.10.2"
+"postcss-normalize-whitespace@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-normalize-whitespace@npm:4.0.2"
   dependencies:
-    lru-cache: "npm:^10.2.0"
-    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
-  checksum: 10c0/d723777fbf9627f201e64656680f66ebd940957eebacf780e6cce1c2919c29c116678b2d7dbf8821b3a2caa758d125f4444005ccec886a25c8f324504e48e601
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/497ed988df6c4e6f2dcfcc9f6cfff967585c941549d885b02ef55b2d1ab7bceabb633595dd5b6ad1a2998af0c8c6f2d59cdffad4828c86ca79a690dd727a6dc2
   languageName: node
   linkType: hard
 
-"path-type@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "path-type@npm:4.0.0"
-  checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c
+"postcss-normalize@npm:8.0.1":
+  version: 8.0.1
+  resolution: "postcss-normalize@npm:8.0.1"
+  dependencies:
+    "@csstools/normalize.css": "npm:^10.1.0"
+    browserslist: "npm:^4.6.2"
+    postcss: "npm:^7.0.17"
+    postcss-browser-comments: "npm:^3.0.0"
+    sanitize.css: "npm:^10.0.0"
+  checksum: 10c0/783e5b629fb2932411f8a797f5a2fb9378446ea26e4688a7471b859362e7c3ba8f5bf0da725055491f4391dbb6caab1a54ccadb27b9b76fbaba6b54f9f4a1be9
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7
+"postcss-ordered-values@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "postcss-ordered-values@npm:4.1.2"
+  dependencies:
+    cssnano-util-get-arguments: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/6866d7b0b8b7f1986614216af124b36bc10b41995ee690d6a025fb9135438578041be30e779117f20fca94df97189f460d7013d6839d7e2a225802652074f12f
   languageName: node
   linkType: hard
 
-"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "picomatch@npm:2.3.1"
-  checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
+"postcss-overflow-shorthand@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-overflow-shorthand@npm:2.0.0"
+  dependencies:
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/32e72de8071669587d4321469ec15000f86165f8b1bac8b07e79c889a77fc1b15f9e1c3759676765b8dfc9349a972ab7ce97e630eb128d754cbe1ebc5165c865
   languageName: node
   linkType: hard
 
-"pino-std-serializers@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "pino-std-serializers@npm:3.2.0"
-  checksum: 10c0/ae08159372b5bbe69f13770a7f20ba7ded0bb97b2c6f42f780995582135ca907e66504f06371c12f991dbfcd489280f942786c02a9e8e952974d455cb0a477c9
+"postcss-page-break@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "postcss-page-break@npm:2.0.0"
+  dependencies:
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/2fcf936e7b87700c3d97fd867e90b8ae45b8cb6b128bfbc63e4ee78b55d5d23bb44c01e9fed059c6c9edebbf2ffac3967f0bfe090bef58e3d323009a49d537f7
   languageName: node
   linkType: hard
 
-"pino@npm:^6.13.0":
-  version: 6.14.0
-  resolution: "pino@npm:6.14.0"
+"postcss-place@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-place@npm:4.0.1"
+  dependencies:
+    postcss: "npm:^7.0.2"
+    postcss-values-parser: "npm:^2.0.0"
+  checksum: 10c0/e07296bea52fda7d3e68dea7f15d1b11988b33cefb8f777793087d627465ee2f38cf83b7670aaa6ab460ce2816cd359bcbe05272230d02bba248107cd62975cc
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:6.7.0":
+  version: 6.7.0
+  resolution: "postcss-preset-env@npm:6.7.0"
+  dependencies:
+    autoprefixer: "npm:^9.6.1"
+    browserslist: "npm:^4.6.4"
+    caniuse-lite: "npm:^1.0.30000981"
+    css-blank-pseudo: "npm:^0.1.4"
+    css-has-pseudo: "npm:^0.10.0"
+    css-prefers-color-scheme: "npm:^3.1.1"
+    cssdb: "npm:^4.4.0"
+    postcss: "npm:^7.0.17"
+    postcss-attribute-case-insensitive: "npm:^4.0.1"
+    postcss-color-functional-notation: "npm:^2.0.1"
+    postcss-color-gray: "npm:^5.0.0"
+    postcss-color-hex-alpha: "npm:^5.0.3"
+    postcss-color-mod-function: "npm:^3.0.3"
+    postcss-color-rebeccapurple: "npm:^4.0.1"
+    postcss-custom-media: "npm:^7.0.8"
+    postcss-custom-properties: "npm:^8.0.11"
+    postcss-custom-selectors: "npm:^5.1.2"
+    postcss-dir-pseudo-class: "npm:^5.0.0"
+    postcss-double-position-gradients: "npm:^1.0.0"
+    postcss-env-function: "npm:^2.0.2"
+    postcss-focus-visible: "npm:^4.0.0"
+    postcss-focus-within: "npm:^3.0.0"
+    postcss-font-variant: "npm:^4.0.0"
+    postcss-gap-properties: "npm:^2.0.0"
+    postcss-image-set-function: "npm:^3.0.1"
+    postcss-initial: "npm:^3.0.0"
+    postcss-lab-function: "npm:^2.0.1"
+    postcss-logical: "npm:^3.0.0"
+    postcss-media-minmax: "npm:^4.0.0"
+    postcss-nesting: "npm:^7.0.0"
+    postcss-overflow-shorthand: "npm:^2.0.0"
+    postcss-page-break: "npm:^2.0.0"
+    postcss-place: "npm:^4.0.1"
+    postcss-pseudo-class-any-link: "npm:^6.0.0"
+    postcss-replace-overflow-wrap: "npm:^3.0.0"
+    postcss-selector-matches: "npm:^4.0.0"
+    postcss-selector-not: "npm:^4.0.0"
+  checksum: 10c0/069006c09afba84dfc74f37487d1e6bff911d55dc28b26a08c80fd1298a3b807084d815fe50ce238f0eb6429f6d6739704cbea867b3e50a479c361aaaf5d656c
+  languageName: node
+  linkType: hard
+
+"postcss-pseudo-class-any-link@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-pseudo-class-any-link@npm:6.0.0"
   dependencies:
-    fast-redact: "npm:^3.0.0"
-    fast-safe-stringify: "npm:^2.0.8"
-    flatstr: "npm:^1.0.12"
-    pino-std-serializers: "npm:^3.1.0"
-    process-warning: "npm:^1.0.0"
-    quick-format-unescaped: "npm:^4.0.3"
-    sonic-boom: "npm:^1.0.2"
-  bin:
-    pino: bin.js
-  checksum: 10c0/5d3cb22c804e2bf2439ace64a46a7901d0a138cb75715ad8a8bbcf3ddb09dc5e33a9fc8a49527c3345d317619748c6de94d28481911ae931c21b953e24048425
+    postcss: "npm:^7.0.2"
+    postcss-selector-parser: "npm:^5.0.0-rc.3"
+  checksum: 10c0/185c50ecd337fcbdeaaf72a5b567af16de8918a1bd9094d1ac6998be32550a0f5bd8ecad647ea1625e7fe5225cdadfb69c4961ce4b464a7c0e464c4ccc937df9
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.4":
-  version: 4.0.6
-  resolution: "pirates@npm:4.0.6"
-  checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36
+"postcss-reduce-initial@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "postcss-reduce-initial@npm:4.0.3"
+  dependencies:
+    browserslist: "npm:^4.0.0"
+    caniuse-api: "npm:^3.0.0"
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+  checksum: 10c0/5358b64afbfc3eb0b51031f4568850a5c9142ccf45a6416736802778972d7157811cefebcd2b3afbbf7267db3d39bb09575a8c976ca6552b99ffbf7fdd5083ea
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "pkg-dir@npm:4.2.0"
+"postcss-reduce-transforms@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "postcss-reduce-transforms@npm:4.0.2"
   dependencies:
-    find-up: "npm:^4.0.0"
-  checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728
+    cssnano-util-get-match: "npm:^4.0.0"
+    has: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+  checksum: 10c0/72b9c83fb8af3ec756a8dedcc13d025068896484da00c6859c4e0980eb37b85766354cdbf83283f1f047417b00fc3f7472f3acd7411e301fcfe067e02fae03f3
   languageName: node
   linkType: hard
 
-"platform@npm:^1.3.6":
-  version: 1.3.6
-  resolution: "platform@npm:1.3.6"
-  checksum: 10c0/69f2eb692e15f1a343dd0d9347babd9ca933824c8673096be746ff66f99f2bdc909fadd8609076132e6ec768349080babb7362299f2a7f885b98f1254ae6224b
+"postcss-replace-overflow-wrap@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "postcss-replace-overflow-wrap@npm:3.0.0"
+  dependencies:
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/c73bfd3d3676473dbe6b8505a84f7daaa57d9a05631db95a0894576f33fc7b019de7550de6e3e293d3ddaebafb6a41bedfa590bc9cde25f9c70095eaaa22ca55
   languageName: node
   linkType: hard
 
-"possible-typed-array-names@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "possible-typed-array-names@npm:1.0.0"
-  checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd
+"postcss-safe-parser@npm:5.0.2":
+  version: 5.0.2
+  resolution: "postcss-safe-parser@npm:5.0.2"
+  dependencies:
+    postcss: "npm:^8.1.0"
+  checksum: 10c0/017c3d43eeebe31808e22aaccf5a14a9c15b95004b2b93f96a7c35d87ecc1a72903014ee5defef637ce10ea7b12e73a95e22b273a018e500599f3d64af3f8e9f
   languageName: node
   linkType: hard
 
-"postcss-modules-extract-imports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-modules-extract-imports@npm:3.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943
+"postcss-selector-matches@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-selector-matches@npm:4.0.0"
+  dependencies:
+    balanced-match: "npm:^1.0.0"
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/c561fd804e35370d40bb90ca1c37f59556abc77373bb6ebd26df764e40170f1d434cfd7f714dbe0b42534e70610503b8f9073bed9f4f7e90a01b0330c8dfd5fd
   languageName: node
   linkType: hard
 
-"postcss-modules-local-by-default@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "postcss-modules-local-by-default@npm:4.0.4"
+"postcss-selector-not@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "postcss-selector-not@npm:4.0.1"
   dependencies:
-    icss-utils: "npm:^5.0.0"
-    postcss-selector-parser: "npm:^6.0.2"
-    postcss-value-parser: "npm:^4.1.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10c0/9ebf464867eb10b29b73501b1466dcac8352ed852ef68ec23571f515daa74401d7ace9a6c72f354542081fdbb47d098c9bc6b05373b553a6e35779d072f967bb
+    balanced-match: "npm:^1.0.0"
+    postcss: "npm:^7.0.2"
+  checksum: 10c0/0c8970a4b97efa338e527d8cd2dee027ad4531a884833044944b00de2561ee32091bc4b8e8ddf6b6590c68cf234e7d2d697854a55051ca0e4e6eb26408b2516c
   languageName: node
   linkType: hard
 
-"postcss-modules-scope@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "postcss-modules-scope@npm:3.1.1"
+"postcss-selector-parser@npm:^3.0.0":
+  version: 3.1.2
+  resolution: "postcss-selector-parser@npm:3.1.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.4"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10c0/3ef6ac14fcda1581bc43e37622256bd87b99ea49c59b2aae648d057d57f5ecc634648cce9910166220a797567af674bc09246ccc010f1dd58d2863b805719109
+    dot-prop: "npm:^5.2.0"
+    indexes-of: "npm:^1.0.1"
+    uniq: "npm:^1.0.1"
+  checksum: 10c0/65f8fb1dcd64e9a3de03a6bd5e0a2e67475a01057d8470b46723cd569d1ddba4d18107e45aee26b46d8cdaab6ef8f5aad7c2e934fc4c46386418cc578dcc181b
   languageName: node
   linkType: hard
 
-"postcss-modules-values@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-modules-values@npm:4.0.0"
+"postcss-selector-parser@npm:^5.0.0-rc.3, postcss-selector-parser@npm:^5.0.0-rc.4":
+  version: 5.0.0
+  resolution: "postcss-selector-parser@npm:5.0.0"
   dependencies:
-    icss-utils: "npm:^5.0.0"
-  peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc
+    cssesc: "npm:^2.0.0"
+    indexes-of: "npm:^1.0.1"
+    uniq: "npm:^1.0.1"
+  checksum: 10c0/4f5773963d16f4e1dfce64032ffab2e7fba3239d3a545ee00316f68ccf49f609c1a7b141d9ad1eb68b34690382c6d116636731c7849bafe1930dc4bb6ef5aa18
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
+"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
   version: 6.0.16
   resolution: "postcss-selector-parser@npm:6.0.16"
   dependencies:
@@ -6985,14 +15722,75 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
+"postcss-svgo@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "postcss-svgo@npm:4.0.3"
+  dependencies:
+    postcss: "npm:^7.0.0"
+    postcss-value-parser: "npm:^3.0.0"
+    svgo: "npm:^1.0.0"
+  checksum: 10c0/555eccf33c533e5f28f8441c5b14a2b1f606d56b8a357efad190f8d6d2646c11e088b740ba21798d41ba7c6819b6bd237a805dd1f8ddd44dd5c1c50ab5532f91
+  languageName: node
+  linkType: hard
+
+"postcss-unique-selectors@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-unique-selectors@npm:4.0.1"
+  dependencies:
+    alphanum-sort: "npm:^1.0.0"
+    postcss: "npm:^7.0.0"
+    uniqs: "npm:^2.0.0"
+  checksum: 10c0/a7c1ef42914b89b05db624667edfcba9cd6dddc90ab9dc0049c42dd03cad02c9a6a128bded04188d32a62de263ac1893b5ff6ce4e8bb1ad628cfd944068d6edf
+  languageName: node
+  linkType: hard
+
+"postcss-value-parser@npm:^3.0.0":
+  version: 3.3.1
+  resolution: "postcss-value-parser@npm:3.3.1"
+  checksum: 10c0/23eed98d8eeadb1f9ef1db4a2757da0f1d8e7c1dac2a38d6b35d971aab9eb3c6d8a967d0e9f435558834ffcd966afbbe875a56bcc5bcdd09e663008c106b3e47
+  languageName: node
+  linkType: hard
+
+"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
   checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.33":
+"postcss-values-parser@npm:^2.0.0, postcss-values-parser@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "postcss-values-parser@npm:2.0.1"
+  dependencies:
+    flatten: "npm:^1.0.2"
+    indexes-of: "npm:^1.0.1"
+    uniq: "npm:^1.0.1"
+  checksum: 10c0/2ac07c134abc1c1f79f3188afa028db4b0f58421b3eb13b8ad5e3c79542735810d70b24a49d274237f9315b13d970ce81790b3c5a676543e0717228a66f9e703
+  languageName: node
+  linkType: hard
+
+"postcss@npm:7.0.36":
+  version: 7.0.36
+  resolution: "postcss@npm:7.0.36"
+  dependencies:
+    chalk: "npm:^2.4.2"
+    source-map: "npm:^0.6.1"
+    supports-color: "npm:^6.1.0"
+  checksum: 10c0/8e5dcaf9adf875a3ad9444227391979043958fc08f5a848a58bb716e41d1f7a1618cc3f884a7a19328d7ae341bbaa4f5a75063195dd43da168659688dffecbe1
+  languageName: node
+  linkType: hard
+
+"postcss@npm:^7, postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.2, postcss@npm:^7.0.26, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6":
+  version: 7.0.39
+  resolution: "postcss@npm:7.0.39"
+  dependencies:
+    picocolors: "npm:^0.2.1"
+    source-map: "npm:^0.6.1"
+  checksum: 10c0/fd27ee808c0d02407582cccfad4729033e2b439d56cd45534fb39aaad308bb35a290f3b7db5f2394980e8756f9381b458a625618550808c5ff01a125f51efc53
+  languageName: node
+  linkType: hard
+
+"postcss@npm:^8.1.0, postcss@npm:^8.4.33":
   version: 8.4.38
   resolution: "postcss@npm:8.4.38"
   dependencies:
@@ -7010,6 +15808,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prelude-ls@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "prelude-ls@npm:1.1.2"
+  checksum: 10c0/7284270064f74e0bb7f04eb9bff7be677e4146417e599ccc9c1200f0f640f8b11e592d94eb1b18f7aa9518031913bb42bea9c86af07ba69902864e61005d6f18
+  languageName: node
+  linkType: hard
+
+"prepend-http@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "prepend-http@npm:1.0.4"
+  checksum: 10c0/c6c173ca439e58163ba7bea7cbba52a1ed11e3e3da1c048da296f37d4b7654f78f7304e03f76d5923f4b83af7e2d55533e0f79064209c75b743ccddee13904f8
+  languageName: node
+  linkType: hard
+
 "prettier@npm:^3.2.5":
   version: 3.2.5
   resolution: "prettier@npm:3.2.5"
@@ -7019,6 +15831,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pretty-bytes@npm:^5.3.0":
+  version: 5.6.0
+  resolution: "pretty-bytes@npm:5.6.0"
+  checksum: 10c0/f69f494dcc1adda98dbe0e4a36d301e8be8ff99bfde7a637b2ee2820e7cb583b0fc0f3a63b0e3752c01501185a5cf38602c7be60da41bdf84ef5b70e89c370f3
+  languageName: node
+  linkType: hard
+
+"pretty-error@npm:^2.1.1":
+  version: 2.1.2
+  resolution: "pretty-error@npm:2.1.2"
+  dependencies:
+    lodash: "npm:^4.17.20"
+    renderkid: "npm:^2.0.4"
+  checksum: 10c0/779743faf707308e5d07c53c3ec94596c0cb631c92104a2721dd5d021ade39505a9151c5a5f838dfd26b02a06752c410eb6de1769c4fe327c90bd083f61a1fa1
+  languageName: node
+  linkType: hard
+
+"pretty-format@npm:^26.6.0, pretty-format@npm:^26.6.2":
+  version: 26.6.2
+  resolution: "pretty-format@npm:26.6.2"
+  dependencies:
+    "@jest/types": "npm:^26.6.2"
+    ansi-regex: "npm:^5.0.0"
+    ansi-styles: "npm:^4.0.0"
+    react-is: "npm:^17.0.1"
+  checksum: 10c0/b5ddf0e949b874b699d313fe9407f0eb65e67d00823b2dd95335905a73457260af7612f3bff6b48611fcca9ffcff003359e4c9faba4200d6209da433a859aef3
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
   version: 29.7.0
   resolution: "pretty-format@npm:29.7.0"
@@ -7037,6 +15878,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process-nextick-args@npm:~2.0.0":
+  version: 2.0.1
+  resolution: "process-nextick-args@npm:2.0.1"
+  checksum: 10c0/bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367
+  languageName: node
+  linkType: hard
+
 "process-warning@npm:^1.0.0":
   version: 1.0.0
   resolution: "process-warning@npm:1.0.0"
@@ -7044,6 +15892,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"process@npm:^0.11.10":
+  version: 0.11.10
+  resolution: "process@npm:0.11.10"
+  checksum: 10c0/40c3ce4b7e6d4b8c3355479df77aeed46f81b279818ccdc500124e6a5ab882c0cc81ff7ea16384873a95a74c4570b01b120f287abbdd4c877931460eca6084b3
+  languageName: node
+  linkType: hard
+
+"progress@npm:^2.0.0":
+  version: 2.0.3
+  resolution: "progress@npm:2.0.3"
+  checksum: 10c0/1697e07cb1068055dbe9fe858d242368ff5d2073639e652b75a7eb1f2a1a8d4afd404d719de23c7b48481a6aa0040686310e2dac2f53d776daa2176d3f96369c
+  languageName: node
+  linkType: hard
+
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -7061,6 +15923,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"promise@npm:^8.1.0":
+  version: 8.3.0
+  resolution: "promise@npm:8.3.0"
+  dependencies:
+    asap: "npm:~2.0.6"
+  checksum: 10c0/6fccae27a10bcce7442daf090279968086edd2e3f6cebe054b71816403e2526553edf510d13088a4d0f14d7dfa9b9dfb188cab72d6f942e186a4353b6a29c8bf
+  languageName: node
+  linkType: hard
+
+"prompts@npm:2.4.0":
+  version: 2.4.0
+  resolution: "prompts@npm:2.4.0"
+  dependencies:
+    kleur: "npm:^3.0.3"
+    sisteransi: "npm:^1.0.5"
+  checksum: 10c0/9e64082a08c32bbb91e9507874034e8c21c924aabee9468699252cf16d8f6147d053494a3d67976bc59455bdf997ce82be0a7857f2a014ec3deb72dc956e1303
+  languageName: node
+  linkType: hard
+
 "prompts@npm:^2.0.1":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -7082,7 +15963,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-addr@npm:^2.0.7":
+"proxy-addr@npm:^2.0.7, proxy-addr@npm:~2.0.7":
   version: 2.0.7
   resolution: "proxy-addr@npm:2.0.7"
   dependencies:
@@ -7092,31 +15973,139 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "proxy-from-env@npm:1.1.0"
-  checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+"proxy-from-env@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "proxy-from-env@npm:1.1.0"
+  checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b
+  languageName: node
+  linkType: hard
+
+"prr@npm:~1.0.1":
+  version: 1.0.1
+  resolution: "prr@npm:1.0.1"
+  checksum: 10c0/5b9272c602e4f4472a215e58daff88f802923b84bc39c8860376bb1c0e42aaf18c25d69ad974bd06ec6db6f544b783edecd5502cd3d184748d99080d68e4be5f
+  languageName: node
+  linkType: hard
+
+"psl@npm:^1.1.33":
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
+  languageName: node
+  linkType: hard
+
+"public-encrypt@npm:^4.0.0":
+  version: 4.0.3
+  resolution: "public-encrypt@npm:4.0.3"
+  dependencies:
+    bn.js: "npm:^4.1.0"
+    browserify-rsa: "npm:^4.0.0"
+    create-hash: "npm:^1.1.0"
+    parse-asn1: "npm:^5.0.0"
+    randombytes: "npm:^2.0.1"
+    safe-buffer: "npm:^5.1.2"
+  checksum: 10c0/6c2cc19fbb554449e47f2175065d6b32f828f9b3badbee4c76585ac28ae8641aafb9bb107afc430c33c5edd6b05dbe318df4f7d6d7712b1093407b11c4280700
+  languageName: node
+  linkType: hard
+
+"pump@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "pump@npm:2.0.1"
+  dependencies:
+    end-of-stream: "npm:^1.1.0"
+    once: "npm:^1.3.1"
+  checksum: 10c0/f1fe8960f44d145f8617ea4c67de05392da4557052980314c8f85081aee26953bdcab64afad58a2b1df0e8ff7203e3710e848cbe81a01027978edc6e264db355
+  languageName: node
+  linkType: hard
+
+"pump@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "pump@npm:3.0.0"
+  dependencies:
+    end-of-stream: "npm:^1.1.0"
+    once: "npm:^1.3.1"
+  checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478
+  languageName: node
+  linkType: hard
+
+"pumpify@npm:^1.3.3":
+  version: 1.5.1
+  resolution: "pumpify@npm:1.5.1"
+  dependencies:
+    duplexify: "npm:^3.6.0"
+    inherits: "npm:^2.0.3"
+    pump: "npm:^2.0.0"
+  checksum: 10c0/0bcabf9e3dbf2d0cc1f9b84ac80d3c75386111caf8963bfd98817a1e2192000ac0ccc804ca6ccd5b2b8430fdb71347b20fb2f014fe3d41adbacb1b502a841c45
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^1.2.4, punycode@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "punycode@npm:1.4.1"
+  checksum: 10c0/354b743320518aef36f77013be6e15da4db24c2b4f62c5f1eb0529a6ed02fbaf1cb52925785f6ab85a962f2b590d9cd5ad730b70da72b5f180e2556b8bd3ca08
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
+  languageName: node
+  linkType: hard
+
+"pure-rand@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "pure-rand@npm:6.1.0"
+  checksum: 10c0/1abe217897bf74dcb3a0c9aba3555fe975023147b48db540aa2faf507aee91c03bf54f6aef0eb2bf59cc259a16d06b28eca37f0dc426d94f4692aeff02fb0e65
+  languageName: node
+  linkType: hard
+
+"q@npm:^1.1.2":
+  version: 1.5.1
+  resolution: "q@npm:1.5.1"
+  checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4
+  languageName: node
+  linkType: hard
+
+"qs@npm:6.11.0":
+  version: 6.11.0
+  resolution: "qs@npm:6.11.0"
+  dependencies:
+    side-channel: "npm:^1.0.4"
+  checksum: 10c0/4e4875e4d7c7c31c233d07a448e7e4650f456178b9dd3766b7cfa13158fdb24ecb8c4f059fa91e820dc6ab9f2d243721d071c9c0378892dcdad86e9e9a27c68f
+  languageName: node
+  linkType: hard
+
+"qs@npm:^6.11.2":
+  version: 6.12.1
+  resolution: "qs@npm:6.12.1"
+  dependencies:
+    side-channel: "npm:^1.0.6"
+  checksum: 10c0/439e6d7c6583e7c69f2cab2c39c55b97db7ce576e4c7c469082b938b7fc8746e8d547baacb69b4cd2b6666484776c3f4840ad7163a4c5326300b0afa0acdd84b
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.33":
-  version: 1.9.0
-  resolution: "psl@npm:1.9.0"
-  checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab
+"query-string@npm:^4.1.0":
+  version: 4.3.4
+  resolution: "query-string@npm:4.3.4"
+  dependencies:
+    object-assign: "npm:^4.1.0"
+    strict-uri-encode: "npm:^1.0.0"
+  checksum: 10c0/6181c343074c2049fbbcde63f87c1da5d3a49c6e34c8d94a61d692e886e0b8cd1ae4a4be00b598112bb9c4cb819e423ed503a5d246e4d24ecb0990d8bb21570b
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0":
-  version: 2.3.1
-  resolution: "punycode@npm:2.3.1"
-  checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
+"querystring-es3@npm:^0.2.0":
+  version: 0.2.1
+  resolution: "querystring-es3@npm:0.2.1"
+  checksum: 10c0/476938c1adb45c141f024fccd2ffd919a3746e79ed444d00e670aad68532977b793889648980e7ca7ff5ffc7bfece623118d0fbadcaf217495eeb7059ae51580
   languageName: node
   linkType: hard
 
-"pure-rand@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "pure-rand@npm:6.1.0"
-  checksum: 10c0/1abe217897bf74dcb3a0c9aba3555fe975023147b48db540aa2faf507aee91c03bf54f6aef0eb2bf59cc259a16d06b28eca37f0dc426d94f4692aeff02fb0e65
+"querystring@npm:^0.2.0":
+  version: 0.2.1
+  resolution: "querystring@npm:0.2.1"
+  checksum: 10c0/6841b32bec4f16ffe7f5b5e4373b47ad451f079cde3a7f45e63e550f0ecfd8f8189ef81fb50079413b3fc1c59b06146e4c98192cb74ed7981aca72090466cd94
   languageName: node
   linkType: hard
 
@@ -7141,7 +16130,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"randombytes@npm:^2.1.0":
+"raf@npm:^3.4.1":
+  version: 3.4.1
+  resolution: "raf@npm:3.4.1"
+  dependencies:
+    performance-now: "npm:^2.1.0"
+  checksum: 10c0/337f0853c9e6a77647b0f499beedafea5d6facfb9f2d488a624f88b03df2be72b8a0e7f9118a3ff811377d534912039a3311815700d2b6d2313f82f736f9eb6e
+  languageName: node
+  linkType: hard
+
+"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
   dependencies:
@@ -7150,6 +16148,94 @@ __metadata:
   languageName: node
   linkType: hard
 
+"randomfill@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "randomfill@npm:1.0.4"
+  dependencies:
+    randombytes: "npm:^2.0.5"
+    safe-buffer: "npm:^5.1.0"
+  checksum: 10c0/11aeed35515872e8f8a2edec306734e6b74c39c46653607f03c68385ab8030e2adcc4215f76b5e4598e028c4750d820afd5c65202527d831d2a5f207fe2bc87c
+  languageName: node
+  linkType: hard
+
+"range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
+  version: 1.2.1
+  resolution: "range-parser@npm:1.2.1"
+  checksum: 10c0/96c032ac2475c8027b7a4e9fe22dc0dfe0f6d90b85e496e0f016fbdb99d6d066de0112e680805075bd989905e2123b3b3d002765149294dce0c1f7f01fcc2ea0
+  languageName: node
+  linkType: hard
+
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
+  dependencies:
+    bytes: "npm:3.1.2"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.4.24"
+    unpipe: "npm:1.0.0"
+  checksum: 10c0/b201c4b66049369a60e766318caff5cb3cc5a900efd89bdac431463822d976ad0670912c931fdbdcf5543207daf6f6833bca57aa116e1661d2ea91e12ca692c4
+  languageName: node
+  linkType: hard
+
+"react-app-polyfill@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "react-app-polyfill@npm:2.0.0"
+  dependencies:
+    core-js: "npm:^3.6.5"
+    object-assign: "npm:^4.1.1"
+    promise: "npm:^8.1.0"
+    raf: "npm:^3.4.1"
+    regenerator-runtime: "npm:^0.13.7"
+    whatwg-fetch: "npm:^3.4.1"
+  checksum: 10c0/1200ead64186911fa68f0782a417a7734a88d262a5e1ff5f064a6d2c0e23e44bf0df8d264100b4041d8c4a49166e8e0263f66777783652a53afba09f65b5fd68
+  languageName: node
+  linkType: hard
+
+"react-dev-utils@npm:^11.0.3":
+  version: 11.0.4
+  resolution: "react-dev-utils@npm:11.0.4"
+  dependencies:
+    "@babel/code-frame": "npm:7.10.4"
+    address: "npm:1.1.2"
+    browserslist: "npm:4.14.2"
+    chalk: "npm:2.4.2"
+    cross-spawn: "npm:7.0.3"
+    detect-port-alt: "npm:1.1.6"
+    escape-string-regexp: "npm:2.0.0"
+    filesize: "npm:6.1.0"
+    find-up: "npm:4.1.0"
+    fork-ts-checker-webpack-plugin: "npm:4.1.6"
+    global-modules: "npm:2.0.0"
+    globby: "npm:11.0.1"
+    gzip-size: "npm:5.1.1"
+    immer: "npm:8.0.1"
+    is-root: "npm:2.1.0"
+    loader-utils: "npm:2.0.0"
+    open: "npm:^7.0.2"
+    pkg-up: "npm:3.1.0"
+    prompts: "npm:2.4.0"
+    react-error-overlay: "npm:^6.0.9"
+    recursive-readdir: "npm:2.2.2"
+    shell-quote: "npm:1.7.2"
+    strip-ansi: "npm:6.0.0"
+    text-table: "npm:0.2.0"
+  checksum: 10c0/3982f6a35035627b4465c8afd2f6db6a571b9e7b09c7d2f2e517de9cd48bb76778f4c692cdc99a26d2961d7dac371553fd7815ec0d2ec281927feeba60ce8a70
+  languageName: node
+  linkType: hard
+
+"react-dom@npm:^17.0.1":
+  version: 17.0.2
+  resolution: "react-dom@npm:17.0.2"
+  dependencies:
+    loose-envify: "npm:^1.1.0"
+    object-assign: "npm:^4.1.1"
+    scheduler: "npm:^0.20.2"
+  peerDependencies:
+    react: 17.0.2
+  checksum: 10c0/51abbcb72450fe527ebf978c3bc989ba266630faaa53f47a2fae5392369729e8de62b2e4683598cbe651ea7873cd34ec7d5127e2f50bf4bfe6bd0c3ad9bddcb0
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:^18.2.0":
   version: 18.2.0
   resolution: "react-dom@npm:18.2.0"
@@ -7162,6 +16248,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-error-overlay@npm:^6.0.9":
+  version: 6.0.11
+  resolution: "react-error-overlay@npm:6.0.11"
+  checksum: 10c0/8fc93942976e0c704274aec87dbc8e21f62a2cc78d1c93f9bcfff9f7494b00c60f7a2f0bd48d832bcd3190627c0255a1df907373f61f820371373a65ec4b2d64
+  languageName: node
+  linkType: hard
+
 "react-fast-compare@npm:^3.0.1":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
@@ -7176,6 +16269,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^17.0.1":
+  version: 17.0.2
+  resolution: "react-is@npm:17.0.2"
+  checksum: 10c0/2bdb6b93fbb1820b024b496042cce405c57e2f85e777c9aabd55f9b26d145408f9f74f5934676ffdc46f3dcff656d78413a6e43968e7b3f92eea35b3052e9053
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^18.0.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
@@ -7197,6 +16297,101 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-refresh@npm:^0.8.3":
+  version: 0.8.3
+  resolution: "react-refresh@npm:0.8.3"
+  checksum: 10c0/74ad7a7e2f29163163b9e13c9aa868faba58d76113acf910f165c18c022086a590750fd93bc8d9468e73cacc3874ad5c061ded7e931ef299aa3dfa3a663fe665
+  languageName: node
+  linkType: hard
+
+"react-scripts@npm:4.0.3":
+  version: 4.0.3
+  resolution: "react-scripts@npm:4.0.3"
+  dependencies:
+    "@babel/core": "npm:7.12.3"
+    "@pmmmwh/react-refresh-webpack-plugin": "npm:0.4.3"
+    "@svgr/webpack": "npm:5.5.0"
+    "@typescript-eslint/eslint-plugin": "npm:^4.5.0"
+    "@typescript-eslint/parser": "npm:^4.5.0"
+    babel-eslint: "npm:^10.1.0"
+    babel-jest: "npm:^26.6.0"
+    babel-loader: "npm:8.1.0"
+    babel-plugin-named-asset-import: "npm:^0.3.7"
+    babel-preset-react-app: "npm:^10.0.0"
+    bfj: "npm:^7.0.2"
+    camelcase: "npm:^6.1.0"
+    case-sensitive-paths-webpack-plugin: "npm:2.3.0"
+    css-loader: "npm:4.3.0"
+    dotenv: "npm:8.2.0"
+    dotenv-expand: "npm:5.1.0"
+    eslint: "npm:^7.11.0"
+    eslint-config-react-app: "npm:^6.0.0"
+    eslint-plugin-flowtype: "npm:^5.2.0"
+    eslint-plugin-import: "npm:^2.22.1"
+    eslint-plugin-jest: "npm:^24.1.0"
+    eslint-plugin-jsx-a11y: "npm:^6.3.1"
+    eslint-plugin-react: "npm:^7.21.5"
+    eslint-plugin-react-hooks: "npm:^4.2.0"
+    eslint-plugin-testing-library: "npm:^3.9.2"
+    eslint-webpack-plugin: "npm:^2.5.2"
+    file-loader: "npm:6.1.1"
+    fs-extra: "npm:^9.0.1"
+    fsevents: "npm:^2.1.3"
+    html-webpack-plugin: "npm:4.5.0"
+    identity-obj-proxy: "npm:3.0.0"
+    jest: "npm:26.6.0"
+    jest-circus: "npm:26.6.0"
+    jest-resolve: "npm:26.6.0"
+    jest-watch-typeahead: "npm:0.6.1"
+    mini-css-extract-plugin: "npm:0.11.3"
+    optimize-css-assets-webpack-plugin: "npm:5.0.4"
+    pnp-webpack-plugin: "npm:1.6.4"
+    postcss-flexbugs-fixes: "npm:4.2.1"
+    postcss-loader: "npm:3.0.0"
+    postcss-normalize: "npm:8.0.1"
+    postcss-preset-env: "npm:6.7.0"
+    postcss-safe-parser: "npm:5.0.2"
+    prompts: "npm:2.4.0"
+    react-app-polyfill: "npm:^2.0.0"
+    react-dev-utils: "npm:^11.0.3"
+    react-refresh: "npm:^0.8.3"
+    resolve: "npm:1.18.1"
+    resolve-url-loader: "npm:^3.1.2"
+    sass-loader: "npm:^10.0.5"
+    semver: "npm:7.3.2"
+    style-loader: "npm:1.3.0"
+    terser-webpack-plugin: "npm:4.2.3"
+    ts-pnp: "npm:1.2.0"
+    url-loader: "npm:4.1.1"
+    webpack: "npm:4.44.2"
+    webpack-dev-server: "npm:3.11.1"
+    webpack-manifest-plugin: "npm:2.2.0"
+    workbox-webpack-plugin: "npm:5.1.4"
+  peerDependencies:
+    react: ">= 16"
+    typescript: ^3.2.1 || ^4
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  bin:
+    react-scripts: ./bin/react-scripts.js
+  checksum: 10c0/472d90fabec2488cb0afe35843d55141a9406f47543476e2df2aeea05c313210d0b0280157b60b7b1b6fd5380bf940c26494c36c7e05ce710f87e23620663a64
+  languageName: node
+  linkType: hard
+
+"react@npm:^17.0.1":
+  version: 17.0.2
+  resolution: "react@npm:17.0.2"
+  dependencies:
+    loose-envify: "npm:^1.1.0"
+    object-assign: "npm:^4.1.1"
+  checksum: 10c0/07ae8959acf1596f0550685102fd6097d461a54a4fd46a50f88a0cd7daaa97fdd6415de1dcb4bfe0da6aa43221a6746ce380410fa848acc60f8ac41f6649c148
+  languageName: node
+  linkType: hard
+
 "react@npm:^18.2.0":
   version: 18.2.0
   resolution: "react@npm:18.2.0"
@@ -7206,6 +16401,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg-up@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "read-pkg-up@npm:7.0.1"
+  dependencies:
+    find-up: "npm:^4.1.0"
+    read-pkg: "npm:^5.2.0"
+    type-fest: "npm:^0.8.1"
+  checksum: 10c0/82b3ac9fd7c6ca1bdc1d7253eb1091a98ff3d195ee0a45386582ce3e69f90266163c34121e6a0a02f1630073a6c0585f7880b3865efcae9c452fa667f02ca385
+  languageName: node
+  linkType: hard
+
+"read-pkg@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "read-pkg@npm:5.2.0"
+  dependencies:
+    "@types/normalize-package-data": "npm:^2.4.0"
+    normalize-package-data: "npm:^2.5.0"
+    parse-json: "npm:^5.0.0"
+    type-fest: "npm:^0.6.0"
+  checksum: 10c0/b51a17d4b51418e777029e3a7694c9bd6c578a5ab99db544764a0b0f2c7c0f58f8a6bc101f86a6fceb8ba6d237d67c89acf6170f6b98695d0420ddc86cf109fb
+  languageName: node
+  linkType: hard
+
+"readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6, readable-stream@npm:^2.3.8, readable-stream@npm:~2.3.6":
+  version: 2.3.8
+  resolution: "readable-stream@npm:2.3.8"
+  dependencies:
+    core-util-is: "npm:~1.0.0"
+    inherits: "npm:~2.0.3"
+    isarray: "npm:~1.0.0"
+    process-nextick-args: "npm:~2.0.0"
+    safe-buffer: "npm:~5.1.1"
+    string_decoder: "npm:~1.1.1"
+    util-deprecate: "npm:~1.0.1"
+  checksum: 10c0/7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa
+  languageName: node
+  linkType: hard
+
 "readable-stream@npm:^1.0.33":
   version: 1.1.14
   resolution: "readable-stream@npm:1.1.14"
@@ -7218,7 +16451,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
+"readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
   dependencies:
@@ -7229,6 +16462,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readdirp@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "readdirp@npm:2.2.1"
+  dependencies:
+    graceful-fs: "npm:^4.1.11"
+    micromatch: "npm:^3.1.10"
+    readable-stream: "npm:^2.0.2"
+  checksum: 10c0/770d177372ff2212d382d425d55ca48301fcbf3231ab3827257bbcca7ff44fb51fe4af6acc2dda8512dc7f29da390e9fbea5b2b3fc724b86e85cc828395b7797
+  languageName: node
+  linkType: hard
+
 "readdirp@npm:~3.6.0":
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
@@ -7247,6 +16491,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"recursive-readdir@npm:2.2.2":
+  version: 2.2.2
+  resolution: "recursive-readdir@npm:2.2.2"
+  dependencies:
+    minimatch: "npm:3.0.4"
+  checksum: 10c0/0137fab9e9f2a2784465a613a214f60cf76d62ce22c4237ac818c4e6d6ebb4c890d12b4547619dab843673dfa12ca4096baa32d64fdaed84793a544a02c2e1e1
+  languageName: node
+  linkType: hard
+
+"redent@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "redent@npm:3.0.0"
+  dependencies:
+    indent-string: "npm:^4.0.0"
+    strip-indent: "npm:^3.0.0"
+  checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae
+  languageName: node
+  linkType: hard
+
 "reflect.getprototypeof@npm:^1.0.4":
   version: 1.0.6
   resolution: "reflect.getprototypeof@npm:1.0.6"
@@ -7262,14 +16525,70 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:^0.14.1":
+"regenerate-unicode-properties@npm:^10.1.0":
+  version: 10.1.1
+  resolution: "regenerate-unicode-properties@npm:10.1.1"
+  dependencies:
+    regenerate: "npm:^1.4.2"
+  checksum: 10c0/89adb5ee5ba081380c78f9057c02e156a8181969f6fcca72451efc45612e0c3df767b4333f8d8479c274d9c6fe52ec4854f0d8a22ef95dccbe87da8e5f2ac77d
+  languageName: node
+  linkType: hard
+
+"regenerate@npm:^1.4.2":
+  version: 1.4.2
+  resolution: "regenerate@npm:1.4.2"
+  checksum: 10c0/f73c9eba5d398c818edc71d1c6979eaa05af7a808682749dd079f8df2a6d91a9b913db216c2c9b03e0a8ba2bba8701244a93f45211afbff691c32c7b275db1b8
+  languageName: node
+  linkType: hard
+
+"regenerator-runtime@npm:^0.11.0":
+  version: 0.11.1
+  resolution: "regenerator-runtime@npm:0.11.1"
+  checksum: 10c0/69cfa839efcf2d627fe358bf302ab8b24e5f182cb69f13e66f0612d3640d7838aad1e55662135e3ef2c1cc4322315b757626094fab13a48f9a64ab4bdeb8795b
+  languageName: node
+  linkType: hard
+
+"regenerator-runtime@npm:^0.13.7":
+  version: 0.13.11
+  resolution: "regenerator-runtime@npm:0.13.11"
+  checksum: 10c0/12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24
+  languageName: node
+  linkType: hard
+
+"regenerator-runtime@npm:^0.14.0, regenerator-runtime@npm:^0.14.1":
   version: 0.14.1
   resolution: "regenerator-runtime@npm:0.14.1"
   checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.2":
+"regenerator-transform@npm:^0.15.2":
+  version: 0.15.2
+  resolution: "regenerator-transform@npm:0.15.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.8.4"
+  checksum: 10c0/7cfe6931ec793269701994a93bab89c0cc95379191fad866270a7fea2adfec67ea62bb5b374db77058b60ba4509319d9b608664d0d288bd9989ca8dbd08fae90
+  languageName: node
+  linkType: hard
+
+"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "regex-not@npm:1.0.2"
+  dependencies:
+    extend-shallow: "npm:^3.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10c0/a0f8d6045f63b22e9759db10e248369c443b41cedd7dba0922d002b66c2734bc2aef0d98c4d45772d1f756245f4c5203856b88b9624bba2a58708858a8d485d6
+  languageName: node
+  linkType: hard
+
+"regex-parser@npm:^2.2.11":
+  version: 2.3.0
+  resolution: "regex-parser@npm:2.3.0"
+  checksum: 10c0/de31c40e9d982735fdf5934c822cc5cafbe6a0f0909d9fef52e2bd4cc2198933c89fd5e7a17697f25591fdb5df386a088296612b45f0f8e194222070fc5b5cc7
+  languageName: node
+  linkType: hard
+
+"regexp.prototype.flags@npm:^1.5.1, regexp.prototype.flags@npm:^1.5.2":
   version: 1.5.2
   resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
@@ -7281,6 +16600,79 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexpp@npm:^3.1.0":
+  version: 3.2.0
+  resolution: "regexpp@npm:3.2.0"
+  checksum: 10c0/d1da82385c8754a1681416b90b9cca0e21b4a2babef159099b88f640637d789c69011d0bc94705dacab85b81133e929d027d85210e8b8b03f8035164dbc14710
+  languageName: node
+  linkType: hard
+
+"regexpu-core@npm:^5.3.1":
+  version: 5.3.2
+  resolution: "regexpu-core@npm:5.3.2"
+  dependencies:
+    "@babel/regjsgen": "npm:^0.8.0"
+    regenerate: "npm:^1.4.2"
+    regenerate-unicode-properties: "npm:^10.1.0"
+    regjsparser: "npm:^0.9.1"
+    unicode-match-property-ecmascript: "npm:^2.0.0"
+    unicode-match-property-value-ecmascript: "npm:^2.1.0"
+  checksum: 10c0/7945d5ab10c8bbed3ca383d4274687ea825aee4ab93a9c51c6e31e1365edd5ea807f6908f800ba017b66c462944ba68011164e7055207747ab651f8111ef3770
+  languageName: node
+  linkType: hard
+
+"regjsparser@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "regjsparser@npm:0.9.1"
+  dependencies:
+    jsesc: "npm:~0.5.0"
+  bin:
+    regjsparser: bin/parser
+  checksum: 10c0/fe44fcf19a99fe4f92809b0b6179530e5ef313ff7f87df143b08ce9a2eb3c4b6189b43735d645be6e8f4033bfb015ed1ca54f0583bc7561bed53fd379feb8225
+  languageName: node
+  linkType: hard
+
+"relateurl@npm:^0.2.7":
+  version: 0.2.7
+  resolution: "relateurl@npm:0.2.7"
+  checksum: 10c0/c248b4e3b32474f116a804b537fa6343d731b80056fb506dffd91e737eef4cac6be47a65aae39b522b0db9d0b1011d1a12e288d82a109ecd94a5299d82f6573a
+  languageName: node
+  linkType: hard
+
+"remove-trailing-separator@npm:^1.0.1":
+  version: 1.1.0
+  resolution: "remove-trailing-separator@npm:1.1.0"
+  checksum: 10c0/3568f9f8f5af3737b4aee9e6e1e8ec4be65a92da9cb27f989e0893714d50aa95ed2ff02d40d1fa35e1b1a234dc9c2437050ef356704a3999feaca6667d9e9bfc
+  languageName: node
+  linkType: hard
+
+"renderkid@npm:^2.0.4":
+  version: 2.0.7
+  resolution: "renderkid@npm:2.0.7"
+  dependencies:
+    css-select: "npm:^4.1.3"
+    dom-converter: "npm:^0.2.0"
+    htmlparser2: "npm:^6.1.0"
+    lodash: "npm:^4.17.21"
+    strip-ansi: "npm:^3.0.1"
+  checksum: 10c0/05e19c8861e0f9f3d379a175fbb52e3be3c957022acf52d19d36b23f99bb401b6bc3c493d43213f4d76efb08cb2f13e66df38c9a487249cb8dad1f6170da6a14
+  languageName: node
+  linkType: hard
+
+"repeat-element@npm:^1.1.2":
+  version: 1.1.4
+  resolution: "repeat-element@npm:1.1.4"
+  checksum: 10c0/81aa8d82bc845780803ef52df3533fa399974b99df571d0bb86e91f0ffca9ee4b9c4e8e5e72af087938cc28d2aef93d106a6d01da685d72ce96455b90a9f9f69
+  languageName: node
+  linkType: hard
+
+"repeat-string@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "repeat-string@npm:1.6.1"
+  checksum: 10c0/87fa21bfdb2fbdedc44b9a5b118b7c1239bdd2c2c1e42742ef9119b7d412a5137a1d23f1a83dc6bb686f4f27429ac6f542e3d923090b44181bafa41e8ac0174d
+  languageName: node
+  linkType: hard
+
 "require-directory@npm:^2.1.1":
   version: 2.1.1
   resolution: "require-directory@npm:2.1.1"
@@ -7295,6 +16687,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"require-main-filename@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "require-main-filename@npm:2.0.0"
+  checksum: 10c0/db91467d9ead311b4111cbd73a4e67fa7820daed2989a32f7023785a2659008c6d119752d9c4ac011ae07e537eb86523adff99804c5fdb39cd3a017f9b401bb6
+  languageName: node
+  linkType: hard
+
 "requires-port@npm:^1.0.0":
   version: 1.0.0
   resolution: "requires-port@npm:1.0.0"
@@ -7302,6 +16701,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-cwd@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "resolve-cwd@npm:2.0.0"
+  dependencies:
+    resolve-from: "npm:^3.0.0"
+  checksum: 10c0/10c3a7ffeb55af51206f5ca8696ed833376179399336ce8e9df8f76c044c13bccd0e9a3148708daf272193179a581ddb076e203eaa71efa0ad341b243174ca12
+  languageName: node
+  linkType: hard
+
 "resolve-cwd@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-cwd@npm:3.0.0"
@@ -7311,6 +16719,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-from@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "resolve-from@npm:3.0.0"
+  checksum: 10c0/24affcf8e81f4c62f0dcabc774afe0e19c1f38e34e43daac0ddb409d79435fc3037f612b0cc129178b8c220442c3babd673e88e870d27215c99454566e770ebc
+  languageName: node
+  linkType: hard
+
 "resolve-from@npm:^4.0.0":
   version: 4.0.0
   resolution: "resolve-from@npm:4.0.0"
@@ -7332,6 +16747,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-url-loader@npm:^3.1.2":
+  version: 3.1.5
+  resolution: "resolve-url-loader@npm:3.1.5"
+  dependencies:
+    adjust-sourcemap-loader: "npm:3.0.0"
+    camelcase: "npm:5.3.1"
+    compose-function: "npm:3.0.3"
+    convert-source-map: "npm:1.7.0"
+    es6-iterator: "npm:2.0.3"
+    loader-utils: "npm:^1.2.3"
+    postcss: "npm:7.0.36"
+    rework: "npm:1.0.1"
+    rework-visit: "npm:1.0.0"
+    source-map: "npm:0.6.1"
+  checksum: 10c0/80699eddaf685411b7507ed65f4923ac432c9c5439a7dcf819b48d93565d72f2998608d53b8698d6644f2bd950803f727c340dc9e327db29bcbcb5c695f49dbc
+  languageName: node
+  linkType: hard
+
+"resolve-url@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "resolve-url@npm:0.2.1"
+  checksum: 10c0/c285182cfcddea13a12af92129ce0569be27fb0074ffaefbd3ba3da2eac2acecdfc996d435c4982a9fa2b4708640e52837c9153a5ab9255886a00b0b9e8d2a54
+  languageName: node
+  linkType: hard
+
 "resolve.exports@npm:^2.0.0":
   version: 2.0.2
   resolution: "resolve.exports@npm:2.0.2"
@@ -7339,7 +16779,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.20.0":
+"resolve@npm:1.18.1":
+  version: 1.18.1
+  resolution: "resolve@npm:1.18.1"
+  dependencies:
+    is-core-module: "npm:^2.0.0"
+    path-parse: "npm:^1.0.6"
+  checksum: 10c0/e1ff7d70fa395b9021ec616a0512dcc51663c9fbaaef10539664fec1e3a16d715ca50d49d05189dd5d1ba83e2e1186f13976a05755f54b5aa09b8b972541f6fb
+  languageName: node
+  linkType: hard
+
+"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4, resolve@npm:^1.3.2":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -7365,7 +16815,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A1.18.1#optional!builtin<compat/resolve>":
+  version: 1.18.1
+  resolution: "resolve@patch:resolve@npm%3A1.18.1#optional!builtin<compat/resolve>::version=1.18.1&hash=c3c19d"
+  dependencies:
+    is-core-module: "npm:^2.0.0"
+    path-parse: "npm:^1.0.6"
+  checksum: 10c0/0409af9a15ad08fd6995a5f83f45824e2e20efedb03e373f8db24b5c53c59c90a07a49a30642ad5266c4fd0f8f8bc669075f6dd041a5e7b2e1a6f27ecee4f17b
+  languageName: node
+  linkType: hard
+
+"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.18.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.3.2#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -7391,6 +16851,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ret@npm:~0.1.10":
+  version: 0.1.15
+  resolution: "ret@npm:0.1.15"
+  checksum: 10c0/01f77cad0f7ea4f955852c03d66982609893edc1240c0c964b4c9251d0f9fb6705150634060d169939b096d3b77f4c84d6b6098a5b5d340160898c8581f1f63f
+  languageName: node
+  linkType: hard
+
 "ret@npm:~0.2.0":
   version: 0.2.2
   resolution: "ret@npm:0.2.2"
@@ -7412,6 +16879,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rework-visit@npm:1.0.0":
+  version: 1.0.0
+  resolution: "rework-visit@npm:1.0.0"
+  checksum: 10c0/bd0f8c8cdc6e2bf961227f1ed763e38d27f3fc6a4e246860930486eb2526fa7b71e68c345df90858b346f03f59c7967dce2c199adee0f30d803cf61c67f4649f
+  languageName: node
+  linkType: hard
+
+"rework@npm:1.0.1":
+  version: 1.0.1
+  resolution: "rework@npm:1.0.1"
+  dependencies:
+    convert-source-map: "npm:^0.3.3"
+    css: "npm:^2.0.0"
+  checksum: 10c0/6007bc68a5ab2a22035fd93b1eb27cb0f247ff99a86e8a9e4a02ff9d474bf19ab3f405973878a8501a990e74215f950e7f4165b5f53b9d4b2a0424364848132d
+  languageName: node
+  linkType: hard
+
 "rfdc@npm:^1.1.4, rfdc@npm:^1.2.0":
   version: 1.3.1
   resolution: "rfdc@npm:1.3.1"
@@ -7419,7 +16903,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^3.0.2":
+"rgb-regex@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "rgb-regex@npm:1.0.1"
+  checksum: 10c0/ab43ea8b92c1e0c6d6bc811d7fff05927ae87473f9576363ae57213b1fd10605549a5cf89c79ccb7a02dd32e1f093c79891868ef31fd92cdb5378d7b180d73f5
+  languageName: node
+  linkType: hard
+
+"rgba-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "rgba-regex@npm:1.0.0"
+  checksum: 10c0/4296e7dd41c0edf66c18c13824b746099af642e1b52de97addb6b22051398567090cf1df20bacd1d400cfc79aee6f3a428e0def623d358844495e3630189892c
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^2.5.4, rimraf@npm:^2.6.3":
+  version: 2.7.1
+  resolution: "rimraf@npm:2.7.1"
+  dependencies:
+    glob: "npm:^7.1.3"
+  bin:
+    rimraf: ./bin.js
+  checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40
+  languageName: node
+  linkType: hard
+
+"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
   version: 3.0.2
   resolution: "rimraf@npm:3.0.2"
   dependencies:
@@ -7430,6 +16939,66 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "ripemd160@npm:2.0.2"
+  dependencies:
+    hash-base: "npm:^3.0.0"
+    inherits: "npm:^2.0.1"
+  checksum: 10c0/f6f0df78817e78287c766687aed4d5accbebc308a8e7e673fb085b9977473c1f139f0c5335d353f172a915bb288098430755d2ad3c4f30612f4dd0c901cd2c3a
+  languageName: node
+  linkType: hard
+
+"rollup-plugin-babel@npm:^4.3.3":
+  version: 4.4.0
+  resolution: "rollup-plugin-babel@npm:4.4.0"
+  dependencies:
+    "@babel/helper-module-imports": "npm:^7.0.0"
+    rollup-pluginutils: "npm:^2.8.1"
+  peerDependencies:
+    "@babel/core": 7 || ^7.0.0-rc.2
+    rollup: ">=0.60.0 <3"
+  checksum: 10c0/404e8006eb5d2c17ce3df2d208d431de513ac270f51c38d735b54e5a85ed6af86f8f146a35d4e6eb79ef7fc2665f047e04b026c1b755bee331b8b88fad193273
+  languageName: node
+  linkType: hard
+
+"rollup-plugin-terser@npm:^5.3.1":
+  version: 5.3.1
+  resolution: "rollup-plugin-terser@npm:5.3.1"
+  dependencies:
+    "@babel/code-frame": "npm:^7.5.5"
+    jest-worker: "npm:^24.9.0"
+    rollup-pluginutils: "npm:^2.8.2"
+    serialize-javascript: "npm:^4.0.0"
+    terser: "npm:^4.6.2"
+  peerDependencies:
+    rollup: ">=0.66.0 <3"
+  checksum: 10c0/1350c0250cdc9c02c19c7c3a93895abc69b27af1d7f170df2d8bd34b44981b1f84090eef4c5b33174ac9c9cfd68e2dda37500859da75ef8963512e8e7919915e
+  languageName: node
+  linkType: hard
+
+"rollup-pluginutils@npm:^2.8.1, rollup-pluginutils@npm:^2.8.2":
+  version: 2.8.2
+  resolution: "rollup-pluginutils@npm:2.8.2"
+  dependencies:
+    estree-walker: "npm:^0.6.1"
+  checksum: 10c0/20947bec5a5dd68b5c5c8423911e6e7c0ad834c451f1a929b1f4e2bc08836ad3f1a722ef2bfcbeca921870a0a283f13f064a317dc7a6768496e98c9a641ba290
+  languageName: node
+  linkType: hard
+
+"rollup@npm:^1.31.1":
+  version: 1.32.1
+  resolution: "rollup@npm:1.32.1"
+  dependencies:
+    "@types/estree": "npm:*"
+    "@types/node": "npm:*"
+    acorn: "npm:^7.1.0"
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 10c0/543df647c89ed94a2d043caef49c695d7a6a2d85e5e091f7a573dec0e5d5c1e0bb4eb26c68a508728461f055be982e4ed1360222dc402f728acbaaab27342195
+  languageName: node
+  linkType: hard
+
 "rrweb-cssom@npm:^0.6.0":
   version: 0.6.0
   resolution: "rrweb-cssom@npm:0.6.0"
@@ -7437,6 +17006,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rsvp@npm:^4.8.4":
+  version: 4.8.5
+  resolution: "rsvp@npm:4.8.5"
+  checksum: 10c0/7978f01060a48204506a8ebe15cdbd468498f5ae538b1d7ee3e7630375ba7cb2f98df2f596c12d3f4d5d5c21badc1c6ca8009f5142baded8511609a28eabd19a
+  languageName: node
+  linkType: hard
+
 "run-parallel@npm:^1.1.9":
   version: 1.2.0
   resolution: "run-parallel@npm:1.2.0"
@@ -7446,6 +17022,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"run-queue@npm:^1.0.0, run-queue@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "run-queue@npm:1.0.3"
+  dependencies:
+    aproba: "npm:^1.1.1"
+  checksum: 10c0/4e8964279d8f160f9ffaabe82eaad11a1d4c0db596a0f2b5257ae9d2b900c7e1ffcece3e5719199436f50718e1e7f45bb4bf7a82e331a4e734d67c2588a90cbb
+  languageName: node
+  linkType: hard
+
 "safe-array-concat@npm:^1.1.2":
   version: 1.1.2
   resolution: "safe-array-concat@npm:1.1.2"
@@ -7458,7 +17043,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0":
+"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1":
+  version: 5.1.2
+  resolution: "safe-buffer@npm:5.1.2"
+  checksum: 10c0/780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21
+  languageName: node
+  linkType: hard
+
+"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
   checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3
@@ -7485,13 +17077,73 @@ __metadata:
   languageName: node
   linkType: hard
 
-"safer-buffer@npm:>= 2.1.2 < 3.0.0":
+"safe-regex@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-regex@npm:1.1.0"
+  dependencies:
+    ret: "npm:~0.1.10"
+  checksum: 10c0/547d58aa5184cbef368fd5ed5f28d20f911614748c5da6b35f53fd6626396707587251e6e3d1e3010fd3ff1212e413841b8825eaa5f317017ca62a30899af31a
+  languageName: node
+  linkType: hard
+
+"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
   checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4
   languageName: node
   linkType: hard
 
+"sane@npm:^4.0.3":
+  version: 4.1.0
+  resolution: "sane@npm:4.1.0"
+  dependencies:
+    "@cnakazawa/watch": "npm:^1.0.3"
+    anymatch: "npm:^2.0.0"
+    capture-exit: "npm:^2.0.0"
+    exec-sh: "npm:^0.3.2"
+    execa: "npm:^1.0.0"
+    fb-watchman: "npm:^2.0.0"
+    micromatch: "npm:^3.1.4"
+    minimist: "npm:^1.1.1"
+    walker: "npm:~1.0.5"
+  bin:
+    sane: ./src/cli.js
+  checksum: 10c0/7d0991ecaa10b02c6d0339a6f7e31db776971f3b659a351916dcc7ce3464671e72b54d80bcce118e39d4343e1e56c699fe35f6cb89fbd88b07095b72841cbfb0
+  languageName: node
+  linkType: hard
+
+"sanitize.css@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "sanitize.css@npm:10.0.0"
+  checksum: 10c0/c60e178e9853f6179fc8c0fa29597f920d879de9f1f59a26beed439be84c90c670d947c930a55dbf9165c22732132268ebd11e9909c4ab4b61ee1b9049220288
+  languageName: node
+  linkType: hard
+
+"sass-loader@npm:^10.0.5":
+  version: 10.5.2
+  resolution: "sass-loader@npm:10.5.2"
+  dependencies:
+    klona: "npm:^2.0.4"
+    loader-utils: "npm:^2.0.0"
+    neo-async: "npm:^2.6.2"
+    schema-utils: "npm:^3.0.0"
+    semver: "npm:^7.3.2"
+  peerDependencies:
+    fibers: ">= 3.1.0"
+    node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+    sass: ^1.3.0
+    webpack: ^4.36.0 || ^5.0.0
+  peerDependenciesMeta:
+    fibers:
+      optional: true
+    node-sass:
+      optional: true
+    sass:
+      optional: true
+  checksum: 10c0/5ba4a83459fbb50e21d4f4b1b59baf1ddf8dd404099b6d1f2ec887c6903659e505879915030dd9efb1c6dd5fde2d515a19f418487b73d1cc59f6aad60c79bcf5
+  languageName: node
+  linkType: hard
+
 "sass-loader@npm:^14.1.1":
   version: 14.1.1
   resolution: "sass-loader@npm:14.1.1"
@@ -7538,6 +17190,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sax@npm:~1.2.4":
+  version: 1.2.4
+  resolution: "sax@npm:1.2.4"
+  checksum: 10c0/6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3
+  languageName: node
+  linkType: hard
+
+"saxes@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "saxes@npm:5.0.1"
+  dependencies:
+    xmlchars: "npm:^2.2.0"
+  checksum: 10c0/b7476c41dbe1c3a89907d2546fecfba234de5e66743ef914cde2603f47b19bed09732ab51b528ad0f98b958369d8be72b6f5af5c9cfad69972a73d061f0b3952
+  languageName: node
+  linkType: hard
+
 "saxes@npm:^6.0.0":
   version: 6.0.0
   resolution: "saxes@npm:6.0.0"
@@ -7547,6 +17215,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"scheduler@npm:^0.20.2":
+  version: 0.20.2
+  resolution: "scheduler@npm:0.20.2"
+  dependencies:
+    loose-envify: "npm:^1.1.0"
+    object-assign: "npm:^4.1.1"
+  checksum: 10c0/b0982e4b0f34f4ffa4f2f486161c0fd9ce9b88680b045dccbf250eb1aa4fd27413570645455187a83535e2370f5c667a251045547765408492bd883cbe95fcdb
+  languageName: node
+  linkType: hard
+
 "scheduler@npm:^0.23.0":
   version: 0.23.0
   resolution: "scheduler@npm:0.23.0"
@@ -7556,6 +17234,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"schema-utils@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "schema-utils@npm:1.0.0"
+  dependencies:
+    ajv: "npm:^6.1.0"
+    ajv-errors: "npm:^1.0.0"
+    ajv-keywords: "npm:^3.1.0"
+  checksum: 10c0/670e22d7f0ff0b6f4514a4d6fb27c359101b44b7dbfd9563af201af72eb4a9ff06144020cab5f85b16e88821fd09b97cbdae6c893721c6528c8cb704124e6a2f
+  languageName: node
+  linkType: hard
+
+"schema-utils@npm:^2.6.5, schema-utils@npm:^2.7.0, schema-utils@npm:^2.7.1":
+  version: 2.7.1
+  resolution: "schema-utils@npm:2.7.1"
+  dependencies:
+    "@types/json-schema": "npm:^7.0.5"
+    ajv: "npm:^6.12.4"
+    ajv-keywords: "npm:^3.5.2"
+  checksum: 10c0/f484f34464edd8758712d5d3ba25a306e367dac988aecaf4ce112e99baae73f33a807b5cf869240bb6648c80720b36af2d7d72be3a27faa49a2d4fc63fa3f85f
+  languageName: node
+  linkType: hard
+
 "schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
@@ -7586,6 +17286,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"select-hose@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "select-hose@npm:2.0.0"
+  checksum: 10c0/01cc52edd29feddaf379efb4328aededa633f0ac43c64b11a8abd075ff34f05b0d280882c4fbcbdf1a0658202c9cd2ea8d5985174dcf9a2dac7e3a4996fa9b67
+  languageName: node
+  linkType: hard
+
+"selfsigned@npm:^1.10.8":
+  version: 1.10.14
+  resolution: "selfsigned@npm:1.10.14"
+  dependencies:
+    node-forge: "npm:^0.10.0"
+  checksum: 10c0/cb7c92e28a3e8a34e91a3b20b9dd7d237a1bffccd9890c434f74eef65ae8bfffe7c1ab3379faac017b957ea44522923e06e2b41e0858c643edb01137a507cd16
+  languageName: node
+  linkType: hard
+
 "semver-store@npm:^0.3.0":
   version: 0.3.0
   resolution: "semver-store@npm:0.3.0"
@@ -7593,7 +17309,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^6.3.0, semver@npm:^6.3.1":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
+  bin:
+    semver: bin/semver
+  checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25
+  languageName: node
+  linkType: hard
+
+"semver@npm:7.3.2":
+  version: 7.3.2
+  resolution: "semver@npm:7.3.2"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/cea60e44127a4b586ba0ac4a3036f920b351f50c9578740621e837c9efd307f6f90081312ac97682ed74996983bc15f5652cd7be310453a0865aa70f9f5636f3
+  languageName: node
+  linkType: hard
+
+"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
   version: 6.3.1
   resolution: "semver@npm:6.3.1"
   bin:
@@ -7602,6 +17336,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.2.1":
+  version: 7.6.2
+  resolution: "semver@npm:7.6.2"
+  bin:
+    semver: bin/semver.js
+  checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c
+  languageName: node
+  linkType: hard
+
 "semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.6.0
   resolution: "semver@npm:7.6.0"
@@ -7613,6 +17356,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"send@npm:0.18.0":
+  version: 0.18.0
+  resolution: "send@npm:0.18.0"
+  dependencies:
+    debug: "npm:2.6.9"
+    depd: "npm:2.0.0"
+    destroy: "npm:1.2.0"
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    etag: "npm:~1.8.1"
+    fresh: "npm:0.5.2"
+    http-errors: "npm:2.0.0"
+    mime: "npm:1.6.0"
+    ms: "npm:2.1.3"
+    on-finished: "npm:2.4.1"
+    range-parser: "npm:~1.2.1"
+    statuses: "npm:2.0.1"
+  checksum: 10c0/0eb134d6a51fc13bbcb976a1f4214ea1e33f242fae046efc311e80aff66c7a43603e26a79d9d06670283a13000e51be6e0a2cb80ff0942eaf9f1cd30b7ae736a
+  languageName: node
+  linkType: hard
+
 "sentence-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "sentence-case@npm:3.0.4"
@@ -7624,6 +17388,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"serialize-javascript@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "serialize-javascript@npm:4.0.0"
+  dependencies:
+    randombytes: "npm:^2.1.0"
+  checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
+  languageName: node
+  linkType: hard
+
+"serialize-javascript@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "serialize-javascript@npm:5.0.1"
+  dependencies:
+    randombytes: "npm:^2.1.0"
+  checksum: 10c0/646bd92a8298d764d38316f3006bce0b0def6d0e254791396ac34403847654d9346b0b6ed7865efd799d93d4c47d900e08a8fa7a6f7f8d2dbaebab5444c3b431
+  languageName: node
+  linkType: hard
+
 "serialize-javascript@npm:^6.0.1":
   version: 6.0.2
   resolution: "serialize-javascript@npm:6.0.2"
@@ -7633,6 +17415,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"serve-index@npm:^1.9.1":
+  version: 1.9.1
+  resolution: "serve-index@npm:1.9.1"
+  dependencies:
+    accepts: "npm:~1.3.4"
+    batch: "npm:0.6.1"
+    debug: "npm:2.6.9"
+    escape-html: "npm:~1.0.3"
+    http-errors: "npm:~1.6.2"
+    mime-types: "npm:~2.1.17"
+    parseurl: "npm:~1.3.2"
+  checksum: 10c0/a666471a24196f74371edf2c3c7bcdd82adbac52f600804508754b5296c3567588bf694258b19e0cb23a567acfa20d9721bfdaed3286007b81f9741ada8a3a9c
+  languageName: node
+  linkType: hard
+
+"serve-static@npm:1.15.0":
+  version: 1.15.0
+  resolution: "serve-static@npm:1.15.0"
+  dependencies:
+    encodeurl: "npm:~1.0.2"
+    escape-html: "npm:~1.0.3"
+    parseurl: "npm:~1.3.3"
+    send: "npm:0.18.0"
+  checksum: 10c0/fa9f0e21a540a28f301258dfe1e57bb4f81cd460d28f0e973860477dd4acef946a1f41748b5bd41c73b621bea2029569c935faa38578fd34cd42a9b4947088ba
+  languageName: node
+  linkType: hard
+
 "set-blocking@npm:^2.0.0":
   version: 2.0.0
   resolution: "set-blocking@npm:2.0.0"
@@ -7673,6 +17482,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-value@npm:2.0.1"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-extendable: "npm:^0.1.1"
+    is-plain-object: "npm:^2.0.3"
+    split-string: "npm:^3.0.1"
+  checksum: 10c0/4c40573c4f6540456e4b38b95f570272c4cfbe1d12890ad4057886da8535047cd772dfadf5b58e2e87aa244dfb4c57e3586f6716b976fc47c5144b6b09e1811b
+  languageName: node
+  linkType: hard
+
+"setimmediate@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "setimmediate@npm:1.0.5"
+  checksum: 10c0/5bae81bfdbfbd0ce992893286d49c9693c82b1bcc00dcaaf3a09c8f428fdeacf4190c013598b81875dfac2b08a572422db7df779a99332d0fce186d15a3e4d49
+  languageName: node
+  linkType: hard
+
+"setprototypeof@npm:1.1.0":
+  version: 1.1.0
+  resolution: "setprototypeof@npm:1.1.0"
+  checksum: 10c0/a77b20876689c6a89c3b42f0c3596a9cae02f90fc902570cbd97198e9e8240382086c9303ad043e88cee10f61eae19f1004e51d885395a1e9bf49f9ebed12872
+  languageName: node
+  linkType: hard
+
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
@@ -7680,6 +17515,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sha.js@npm:^2.4.0, sha.js@npm:^2.4.8":
+  version: 2.4.11
+  resolution: "sha.js@npm:2.4.11"
+  dependencies:
+    inherits: "npm:^2.0.1"
+    safe-buffer: "npm:^5.0.1"
+  bin:
+    sha.js: ./bin.js
+  checksum: 10c0/b7a371bca8821c9cc98a0aeff67444a03d48d745cb103f17228b96793f455f0eb0a691941b89ea1e60f6359207e36081d9be193252b0f128e0daf9cfea2815a5
+  languageName: node
+  linkType: hard
+
 "shallow-clone@npm:^3.0.0":
   version: 3.0.1
   resolution: "shallow-clone@npm:3.0.1"
@@ -7689,6 +17536,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shebang-command@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "shebang-command@npm:1.2.0"
+  dependencies:
+    shebang-regex: "npm:^1.0.0"
+  checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d
+  languageName: node
+  linkType: hard
+
 "shebang-command@npm:^2.0.0":
   version: 2.0.0
   resolution: "shebang-command@npm:2.0.0"
@@ -7698,6 +17554,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shebang-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "shebang-regex@npm:1.0.0"
+  checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2
+  languageName: node
+  linkType: hard
+
 "shebang-regex@npm:^3.0.0":
   version: 3.0.0
   resolution: "shebang-regex@npm:3.0.0"
@@ -7705,6 +17568,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"shell-quote@npm:1.7.2":
+  version: 1.7.2
+  resolution: "shell-quote@npm:1.7.2"
+  checksum: 10c0/656aefdcdc394560ca091140a58b95e97f43d5e14bb60ff4a92556ca48841e49af6e837441e887c7890c7a86ae8542960c90e460a86799b68c53271784909edb
+  languageName: node
+  linkType: hard
+
+"shellwords@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "shellwords@npm:0.1.1"
+  checksum: 10c0/7d66b28927e0b524b71b2e185651fcd88a70473a077dd230fbf86188380e948ffb36cea00832d78fc13c93cd15f6f52286fb05f2746b7580623ca1ec619eb004
+  languageName: node
+  linkType: hard
+
 "side-channel@npm:^1.0.4, side-channel@npm:^1.0.6":
   version: 1.0.6
   resolution: "side-channel@npm:1.0.6"
@@ -7717,7 +17594,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
+"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
   version: 3.0.7
   resolution: "signal-exit@npm:3.0.7"
   checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912
@@ -7731,6 +17608,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"simple-swizzle@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "simple-swizzle@npm:0.2.2"
+  dependencies:
+    is-arrayish: "npm:^0.3.1"
+  checksum: 10c0/df5e4662a8c750bdba69af4e8263c5d96fe4cd0f9fe4bdfa3cbdeb45d2e869dff640beaaeb1ef0e99db4d8d2ec92f85508c269f50c972174851bc1ae5bd64308
+  languageName: node
+  linkType: hard
+
 "sirv@npm:^2.0.3":
   version: 2.0.4
   resolution: "sirv@npm:2.0.4"
@@ -7756,6 +17642,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slice-ansi@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "slice-ansi@npm:4.0.0"
+  dependencies:
+    ansi-styles: "npm:^4.0.0"
+    astral-regex: "npm:^2.0.0"
+    is-fullwidth-code-point: "npm:^3.0.0"
+  checksum: 10c0/6c25678db1270d4793e0327620f1e0f9f5bea4630123f51e9e399191bc52c87d6e6de53ed33538609e5eacbd1fab769fae00f3705d08d029f02102a540648918
+  languageName: node
+  linkType: hard
+
 "slugify@npm:^1.6.0":
   version: 1.6.6
   resolution: "slugify@npm:1.6.6"
@@ -7780,6 +17677,66 @@ __metadata:
   languageName: node
   linkType: hard
 
+"snapdragon-node@npm:^2.0.1":
+  version: 2.1.1
+  resolution: "snapdragon-node@npm:2.1.1"
+  dependencies:
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+    snapdragon-util: "npm:^3.0.1"
+  checksum: 10c0/7616e6a1ca054afe3ad8defda17ebe4c73b0800d2e0efd635c44ee1b286f8ac7900517314b5330862ce99b28cd2782348ee78bae573ff0f55832ad81d9657f3f
+  languageName: node
+  linkType: hard
+
+"snapdragon-util@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "snapdragon-util@npm:3.0.1"
+  dependencies:
+    kind-of: "npm:^3.2.0"
+  checksum: 10c0/4441856d343399ba7f37f79681949d51b922e290fcc07e7bc94655a50f584befa4fb08f40c3471cd160e004660161964d8ff140cba49baa59aa6caba774240e3
+  languageName: node
+  linkType: hard
+
+"snapdragon@npm:^0.8.1":
+  version: 0.8.2
+  resolution: "snapdragon@npm:0.8.2"
+  dependencies:
+    base: "npm:^0.11.1"
+    debug: "npm:^2.2.0"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    map-cache: "npm:^0.2.2"
+    source-map: "npm:^0.5.6"
+    source-map-resolve: "npm:^0.5.0"
+    use: "npm:^3.1.0"
+  checksum: 10c0/dfdac1f73d47152d72fc07f4322da09bbddfa31c1c9c3ae7346f252f778c45afa5b03e90813332f02f04f6de8003b34a168c456f8bb719024d092f932520ffca
+  languageName: node
+  linkType: hard
+
+"sockjs-client@npm:^1.5.0":
+  version: 1.6.1
+  resolution: "sockjs-client@npm:1.6.1"
+  dependencies:
+    debug: "npm:^3.2.7"
+    eventsource: "npm:^2.0.2"
+    faye-websocket: "npm:^0.11.4"
+    inherits: "npm:^2.0.4"
+    url-parse: "npm:^1.5.10"
+  checksum: 10c0/c1b55470aac0a31b0fc87806535b0e5cf5d6289584bcd03ffa9f50328a74a40098be63292d6862bd6f483ac9ef487ad60a8a5082feb1f9d0caee5bad6e50f3a9
+  languageName: node
+  linkType: hard
+
+"sockjs@npm:^0.3.21":
+  version: 0.3.24
+  resolution: "sockjs@npm:0.3.24"
+  dependencies:
+    faye-websocket: "npm:^0.11.3"
+    uuid: "npm:^8.3.2"
+    websocket-driver: "npm:^0.7.4"
+  checksum: 10c0/aa102c7d921bf430215754511c81ea7248f2dcdf268fbdb18e4d8183493a86b8793b164c636c52f474a886f747447c962741df2373888823271efdb9d2594f33
+  languageName: node
+  linkType: hard
+
 "socks-proxy-agent@npm:^7.0.0":
   version: 7.0.0
   resolution: "socks-proxy-agent@npm:7.0.0"
@@ -7822,6 +17779,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sort-keys@npm:^1.0.0":
+  version: 1.1.2
+  resolution: "sort-keys@npm:1.1.2"
+  dependencies:
+    is-plain-obj: "npm:^1.0.0"
+  checksum: 10c0/5dd383b0299a40277051f7498c3999520138e2eb50d422962f658738341c9e82349fad4a3024d5ba1a3122688fbaf958f2a472d4c53bade55515097c2ce15420
+  languageName: node
+  linkType: hard
+
 "source-list-map@npm:^2.0.0":
   version: 2.0.1
   resolution: "source-list-map@npm:2.0.1"
@@ -7829,44 +17795,148 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "source-map-js@npm:1.2.0"
-  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "source-map-js@npm:1.2.0"
+  checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4
+  languageName: node
+  linkType: hard
+
+"source-map-resolve@npm:^0.5.0, source-map-resolve@npm:^0.5.2":
+  version: 0.5.3
+  resolution: "source-map-resolve@npm:0.5.3"
+  dependencies:
+    atob: "npm:^2.1.2"
+    decode-uri-component: "npm:^0.2.0"
+    resolve-url: "npm:^0.2.1"
+    source-map-url: "npm:^0.4.0"
+    urix: "npm:^0.1.0"
+  checksum: 10c0/410acbe93882e058858d4c1297be61da3e1533f95f25b95903edddc1fb719654e705663644677542d1fb78a66390238fad1a57115fc958a0724cf9bb509caf57
+  languageName: node
+  linkType: hard
+
+"source-map-support@npm:0.5.13":
+  version: 0.5.13
+  resolution: "source-map-support@npm:0.5.13"
+  dependencies:
+    buffer-from: "npm:^1.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10c0/137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
+  languageName: node
+  linkType: hard
+
+"source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20":
+  version: 0.5.21
+  resolution: "source-map-support@npm:0.5.21"
+  dependencies:
+    buffer-from: "npm:^1.0.0"
+    source-map: "npm:^0.6.0"
+  checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
+  languageName: node
+  linkType: hard
+
+"source-map-url@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "source-map-url@npm:0.4.1"
+  checksum: 10c0/f8af0678500d536c7f643e32094d6718a4070ab4ca2d2326532512cfbe2d5d25a45849b4b385879326f2d7523bb3b686d0360dd347a3cda09fd89a5c28d4bc58
+  languageName: node
+  linkType: hard
+
+"source-map@npm:0.6.1, source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
+  version: 0.6.1
+  resolution: "source-map@npm:0.6.1"
+  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.5.0, source-map@npm:^0.5.6":
+  version: 0.5.7
+  resolution: "source-map@npm:0.5.7"
+  checksum: 10c0/904e767bb9c494929be013017380cbba013637da1b28e5943b566031e29df04fba57edf3f093e0914be094648b577372bd8ad247fa98cfba9c600794cd16b599
+  languageName: node
+  linkType: hard
+
+"source-map@npm:^0.7.3, source-map@npm:^0.7.4":
+  version: 0.7.4
+  resolution: "source-map@npm:0.7.4"
+  checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
+  languageName: node
+  linkType: hard
+
+"sourcemap-codec@npm:^1.4.8":
+  version: 1.4.8
+  resolution: "sourcemap-codec@npm:1.4.8"
+  checksum: 10c0/f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6
+  languageName: node
+  linkType: hard
+
+"spdx-correct@npm:^3.0.0":
+  version: 3.2.0
+  resolution: "spdx-correct@npm:3.2.0"
+  dependencies:
+    spdx-expression-parse: "npm:^3.0.0"
+    spdx-license-ids: "npm:^3.0.0"
+  checksum: 10c0/49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386
+  languageName: node
+  linkType: hard
+
+"spdx-exceptions@npm:^2.1.0":
+  version: 2.5.0
+  resolution: "spdx-exceptions@npm:2.5.0"
+  checksum: 10c0/37217b7762ee0ea0d8b7d0c29fd48b7e4dfb94096b109d6255b589c561f57da93bf4e328c0290046115961b9209a8051ad9f525e48d433082fc79f496a4ea940
+  languageName: node
+  linkType: hard
+
+"spdx-expression-parse@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "spdx-expression-parse@npm:3.0.1"
+  dependencies:
+    spdx-exceptions: "npm:^2.1.0"
+    spdx-license-ids: "npm:^3.0.0"
+  checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171
   languageName: node
   linkType: hard
 
-"source-map-support@npm:0.5.13":
-  version: 0.5.13
-  resolution: "source-map-support@npm:0.5.13"
-  dependencies:
-    buffer-from: "npm:^1.0.0"
-    source-map: "npm:^0.6.0"
-  checksum: 10c0/137539f8c453fa0f496ea42049ab5da4569f96781f6ac8e5bfda26937be9494f4e8891f523c5f98f0e85f71b35d74127a00c46f83f6a4f54672b58d53202565e
+"spdx-license-ids@npm:^3.0.0":
+  version: 3.0.17
+  resolution: "spdx-license-ids@npm:3.0.17"
+  checksum: 10c0/ddf9477b5afc70f1a7d3bf91f0b8e8a1c1b0fa65d2d9a8b5c991b1a2ba91b693d8b9749700119d5ce7f3fbf307ac421087ff43d321db472605e98a5804f80eac
   languageName: node
   linkType: hard
 
-"source-map-support@npm:~0.5.20":
-  version: 0.5.21
-  resolution: "source-map-support@npm:0.5.21"
+"spdy-transport@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "spdy-transport@npm:3.0.0"
   dependencies:
-    buffer-from: "npm:^1.0.0"
-    source-map: "npm:^0.6.0"
-  checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d
+    debug: "npm:^4.1.0"
+    detect-node: "npm:^2.0.4"
+    hpack.js: "npm:^2.1.6"
+    obuf: "npm:^1.1.2"
+    readable-stream: "npm:^3.0.6"
+    wbuf: "npm:^1.7.3"
+  checksum: 10c0/eaf7440fa90724fffc813c386d4a8a7427d967d6e46d7c51d8f8a533d1a6911b9823ea9218703debbae755337e85f110185d7a00ae22ec5c847077b908ce71bb
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
-  version: 0.6.1
-  resolution: "source-map@npm:0.6.1"
-  checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011
+"spdy@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "spdy@npm:4.0.2"
+  dependencies:
+    debug: "npm:^4.1.0"
+    handle-thing: "npm:^2.0.0"
+    http-deceiver: "npm:^1.2.7"
+    select-hose: "npm:^2.0.0"
+    spdy-transport: "npm:^3.0.0"
+  checksum: 10c0/983509c0be9d06fd00bb9dff713c5b5d35d3ffd720db869acdd5ad7aa6fc0e02c2318b58f75328957d8ff772acdf1f7d19382b6047df342044ff3e2d6805ccdf
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "source-map@npm:0.7.4"
-  checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc
+"split-string@npm:^3.0.1, split-string@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "split-string@npm:3.1.0"
+  dependencies:
+    extend-shallow: "npm:^3.0.0"
+  checksum: 10c0/72d7cd625445c7af215130e1e2bc183013bb9dd48a074eda1d35741e2b0dcb355e6df5b5558a62543a24dcec37dd1d6eb7a6228ff510d3c9de0f3dc1d1da8a70
   languageName: node
   linkType: hard
 
@@ -7893,6 +17963,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ssri@npm:^6.0.1":
+  version: 6.0.2
+  resolution: "ssri@npm:6.0.2"
+  dependencies:
+    figgy-pudding: "npm:^3.5.1"
+  checksum: 10c0/e6f18c57dc9fed69343db5c59f95ef334e9664bfbdbad686c190ef2c6ad6b35e9b56cb203f3e4eb7eee6cb7bb602daa26dab6685e3847f0b5c464cdf7d9c2cee
+  languageName: node
+  linkType: hard
+
+"ssri@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "ssri@npm:8.0.1"
+  dependencies:
+    minipass: "npm:^3.1.1"
+  checksum: 10c0/5cfae216ae02dcd154d1bbed2d0a60038a4b3a2fcaac3c7e47401ff4e058e551ee74cfdba618871bf168cd583db7b8324f94af6747d4303b73cd4c3f6dc5c9c2
+  languageName: node
+  linkType: hard
+
 "ssri@npm:^9.0.0":
   version: 9.0.1
   resolution: "ssri@npm:9.0.1"
@@ -7902,7 +17990,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stack-utils@npm:^2.0.3":
+"stable@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "stable@npm:0.1.8"
+  checksum: 10c0/df74b5883075076e78f8e365e4068ecd977af6c09da510cfc3148a303d4b87bc9aa8f7c48feb67ed4ef970b6140bd9eabba2129e28024aa88df5ea0114cba39d
+  languageName: node
+  linkType: hard
+
+"stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.3":
   version: 2.0.6
   resolution: "stack-utils@npm:2.0.6"
   dependencies:
@@ -7911,6 +18006,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stackframe@npm:^1.3.4":
+  version: 1.3.4
+  resolution: "stackframe@npm:1.3.4"
+  checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989
+  languageName: node
+  linkType: hard
+
 "stacktrace-parser@npm:^0.1.10":
   version: 0.1.10
   resolution: "stacktrace-parser@npm:0.1.10"
@@ -7920,6 +18022,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"static-eval@npm:2.0.2":
+  version: 2.0.2
+  resolution: "static-eval@npm:2.0.2"
+  dependencies:
+    escodegen: "npm:^1.8.1"
+  checksum: 10c0/9bc1114ea5ba2a6978664907c4dd3fde6f58767274f6cb4fbfb11ba3a73cb6e74dc11e89ec4a7bf1472a587c1f976fcd4ab8fe9aae1651f5e576f097745d48ff
+  languageName: node
+  linkType: hard
+
+"static-extend@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "static-extend@npm:0.1.2"
+  dependencies:
+    define-property: "npm:^0.2.5"
+    object-copy: "npm:^0.1.0"
+  checksum: 10c0/284f5865a9e19d079f1badbcd70d5f9f82e7a08393f818a220839cd5f71729e89105e1c95322bd28e833161d484cee671380ca443869ae89578eef2bf55c0653
+  languageName: node
+  linkType: hard
+
 "statuses@npm:2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
@@ -7927,6 +18048,60 @@ __metadata:
   languageName: node
   linkType: hard
 
+"statuses@npm:>= 1.4.0 < 2":
+  version: 1.5.0
+  resolution: "statuses@npm:1.5.0"
+  checksum: 10c0/e433900956357b3efd79b1c547da4d291799ac836960c016d10a98f6a810b1b5c0dcc13b5a7aa609a58239b5190e1ea176ad9221c2157d2fd1c747393e6b2940
+  languageName: node
+  linkType: hard
+
+"stream-browserify@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "stream-browserify@npm:2.0.2"
+  dependencies:
+    inherits: "npm:~2.0.1"
+    readable-stream: "npm:^2.0.2"
+  checksum: 10c0/485562bd5d962d633ae178449029c6fa2611052e356bdb5668f768544aa4daa94c4f9a97de718f3f30ad98f3cb98a5f396252bb3855aff153c138f79c0e8f6ac
+  languageName: node
+  linkType: hard
+
+"stream-each@npm:^1.1.0":
+  version: 1.2.3
+  resolution: "stream-each@npm:1.2.3"
+  dependencies:
+    end-of-stream: "npm:^1.1.0"
+    stream-shift: "npm:^1.0.0"
+  checksum: 10c0/7ed229d3b7c24373058b5742b00066da8d3122d1487c8219a025ed53a8978545c77654a529a8e9c62ba83ae80c424cbb0204776b49abf72270d2e8154831dd5f
+  languageName: node
+  linkType: hard
+
+"stream-http@npm:^2.7.2":
+  version: 2.8.3
+  resolution: "stream-http@npm:2.8.3"
+  dependencies:
+    builtin-status-codes: "npm:^3.0.0"
+    inherits: "npm:^2.0.1"
+    readable-stream: "npm:^2.3.6"
+    to-arraybuffer: "npm:^1.0.0"
+    xtend: "npm:^4.0.0"
+  checksum: 10c0/fbe7d327a29216bbabe88d3819bb8f7a502f11eeacf3212579e5af1f76fa7283f6ffa66134ab7d80928070051f571d1029e85f65ce3369fffd4c4df3669446c4
+  languageName: node
+  linkType: hard
+
+"stream-shift@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "stream-shift@npm:1.0.3"
+  checksum: 10c0/939cd1051ca750d240a0625b106a2b988c45fb5a3be0cebe9a9858cb01bc1955e8c7b9fac17a9462976bea4a7b704e317c5c2200c70f0ca715a3363b9aa4fd3b
+  languageName: node
+  linkType: hard
+
+"strict-uri-encode@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "strict-uri-encode@npm:1.1.0"
+  checksum: 10c0/eb8a4109ba2588239787389313ba58ec49e043d4c64a1d44716defe5821a68ae49abe0cdefed9946ca9fc2a4af7ecf321da92422b0a67258ec0a3638b053ae62
+  languageName: node
+  linkType: hard
+
 "string-length@npm:^4.0.1":
   version: 4.0.2
   resolution: "string-length@npm:4.0.2"
@@ -7937,6 +18112,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-natural-compare@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "string-natural-compare@npm:3.0.1"
+  checksum: 10c0/85a6a9195736be500af5d817c7ea36b7e1ac278af079a807f70f79a56602359ee6743ca409af6291b94557de550ff60d1ec31b3c4fc8e7a08d0e12cdab57c149
+  languageName: node
+  linkType: hard
+
 "string-similarity@npm:^4.0.1":
   version: 4.0.4
   resolution: "string-similarity@npm:4.0.4"
@@ -7955,6 +18137,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width@npm:^3.0.0, string-width@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "string-width@npm:3.1.0"
+  dependencies:
+    emoji-regex: "npm:^7.0.1"
+    is-fullwidth-code-point: "npm:^2.0.0"
+    strip-ansi: "npm:^5.1.0"
+  checksum: 10c0/85fa0d4f106e7999bb68c1c640c76fa69fb8c069dab75b009e29c123914e2d3b532e6cfa4b9d1bd913176fc83dedd7a2d7bf40d21a81a8a1978432cedfb65b91
+  languageName: node
+  linkType: hard
+
 "string-width@npm:^5.0.1, string-width@npm:^5.1.2":
   version: 5.1.2
   resolution: "string-width@npm:5.1.2"
@@ -8020,7 +18213,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.1.1":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -8036,6 +18229,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string_decoder@npm:~1.1.1":
+  version: 1.1.1
+  resolution: "string_decoder@npm:1.1.1"
+  dependencies:
+    safe-buffer: "npm:~5.1.0"
+  checksum: 10c0/b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e
+  languageName: node
+  linkType: hard
+
+"stringify-object@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "stringify-object@npm:3.3.0"
+  dependencies:
+    get-own-enumerable-property-symbols: "npm:^3.0.0"
+    is-obj: "npm:^1.0.1"
+    is-regexp: "npm:^1.0.0"
+  checksum: 10c0/ba8078f84128979ee24b3de9a083489cbd3c62cb8572a061b47d4d82601a8ae4b4d86fa8c54dd955593da56bb7c16a6de51c27221fdc6b7139bb4f29d815f35b
+  languageName: node
+  linkType: hard
+
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
   version: 6.0.1
   resolution: "strip-ansi@npm:6.0.1"
@@ -8045,6 +18258,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-ansi@npm:6.0.0":
+  version: 6.0.0
+  resolution: "strip-ansi@npm:6.0.0"
+  dependencies:
+    ansi-regex: "npm:^5.0.0"
+  checksum: 10c0/85257c80250541cc0e65088c7dc768563bdbd1bf7120471d6d3a73cdc60e8149a50038c12a6fd4a30b674587f306ae42e2cc73ac3095daf193633daa0bd8f928
+  languageName: node
+  linkType: hard
+
+"strip-ansi@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "strip-ansi@npm:3.0.1"
+  dependencies:
+    ansi-regex: "npm:^2.0.0"
+  checksum: 10c0/f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f
+  languageName: node
+  linkType: hard
+
+"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "strip-ansi@npm:5.2.0"
+  dependencies:
+    ansi-regex: "npm:^4.1.0"
+  checksum: 10c0/de4658c8a097ce3b15955bc6008f67c0790f85748bdc025b7bc8c52c7aee94bc4f9e50624516150ed173c3db72d851826cd57e7a85fe4e4bb6dbbebd5d297fdf
+  languageName: node
+  linkType: hard
+
 "strip-ansi@npm:^7.0.1":
   version: 7.1.0
   resolution: "strip-ansi@npm:7.1.0"
@@ -8054,6 +18294,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-bom@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-bom@npm:3.0.0"
+  checksum: 10c0/51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1
+  languageName: node
+  linkType: hard
+
 "strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
@@ -8061,6 +18308,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-comments@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "strip-comments@npm:1.0.2"
+  dependencies:
+    babel-extract-comments: "npm:^1.0.0"
+    babel-plugin-transform-object-rest-spread: "npm:^6.26.0"
+  checksum: 10c0/b4b4410e5b0f768b3b9181508bf94c3566cfcdeaee7940990a4cc06b5a62f57352d09713073ab7786cbd46463b25d4e27ac2e9ee54a3052ec2047d463a9c326c
+  languageName: node
+  linkType: hard
+
+"strip-eof@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "strip-eof@npm:1.0.0"
+  checksum: 10c0/f336beed8622f7c1dd02f2cbd8422da9208fae81daf184f73656332899978919d5c0ca84dc6cfc49ad1fc4dd7badcde5412a063cf4e0d7f8ed95a13a63f68f45
+  languageName: node
+  linkType: hard
+
 "strip-final-newline@npm:^2.0.0":
   version: 2.0.0
   resolution: "strip-final-newline@npm:2.0.0"
@@ -8068,13 +18332,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:^3.1.1":
+"strip-indent@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-indent@npm:3.0.0"
+  dependencies:
+    min-indent: "npm:^1.0.0"
+  checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679
+  languageName: node
+  linkType: hard
+
+"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1":
   version: 3.1.1
   resolution: "strip-json-comments@npm:3.1.1"
   checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd
   languageName: node
   linkType: hard
 
+"style-loader@npm:1.3.0":
+  version: 1.3.0
+  resolution: "style-loader@npm:1.3.0"
+  dependencies:
+    loader-utils: "npm:^2.0.0"
+    schema-utils: "npm:^2.7.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/21137d63623690af0c8b135f94e01af724bc0dea560c65ff553aa06c560fac69c068ec19ae7893b3667e50e79a660e051783803c949bcd559a8fc2f839397056
+  languageName: node
+  linkType: hard
+
 "style-loader@npm:^3.3.4":
   version: 3.3.4
   resolution: "style-loader@npm:3.3.4"
@@ -8084,6 +18369,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stylehacks@npm:^4.0.0":
+  version: 4.0.3
+  resolution: "stylehacks@npm:4.0.3"
+  dependencies:
+    browserslist: "npm:^4.0.0"
+    postcss: "npm:^7.0.0"
+    postcss-selector-parser: "npm:^3.0.0"
+  checksum: 10c0/d063adba9018dbf765f80bd4fa5136dfabd5d9bb7b3654a4990c633c539e0f38e758fc9d16c12876afbcec1dd6534d9e9178aa0a3e183345ff034eae9605d35b
+  languageName: node
+  linkType: hard
+
 "supports-color@npm:^5.3.0":
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
@@ -8093,7 +18389,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^7.1.0":
+"supports-color@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "supports-color@npm:6.1.0"
+  dependencies:
+    has-flag: "npm:^3.0.0"
+  checksum: 10c0/ebf2befe41b55932c6d77192b91775f1403c389440ce2dab6f72663cf32ee87a1d9dea3512131a18e45ccac91424a8873b266142828489d0206d65ee93d224b6
+  languageName: node
+  linkType: hard
+
+"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
   dependencies:
@@ -8111,6 +18416,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-hyperlinks@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "supports-hyperlinks@npm:2.3.0"
+  dependencies:
+    has-flag: "npm:^4.0.0"
+    supports-color: "npm:^7.0.0"
+  checksum: 10c0/4057f0d86afb056cd799602f72d575b8fdd79001c5894bcb691176f14e870a687e7981e50bc1484980e8b688c6d5bcd4931e1609816abb5a7dc1486b7babf6a1
+  languageName: node
+  linkType: hard
+
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
@@ -8118,6 +18433,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svg-parser@npm:^2.0.2":
+  version: 2.0.4
+  resolution: "svg-parser@npm:2.0.4"
+  checksum: 10c0/02f6cb155dd7b63ebc2f44f36365bc294543bebb81b614b7628f1af3c54ab64f7e1cec20f06e252bf95bdde78441ae295a412c68ad1678f16a6907d924512b7a
+  languageName: node
+  linkType: hard
+
 "svg-pathdata@npm:^6.0.0":
   version: 6.0.3
   resolution: "svg-pathdata@npm:6.0.3"
@@ -8158,6 +18480,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"svgo@npm:^1.0.0, svgo@npm:^1.2.2":
+  version: 1.3.2
+  resolution: "svgo@npm:1.3.2"
+  dependencies:
+    chalk: "npm:^2.4.1"
+    coa: "npm:^2.0.2"
+    css-select: "npm:^2.0.0"
+    css-select-base-adapter: "npm:^0.1.1"
+    css-tree: "npm:1.0.0-alpha.37"
+    csso: "npm:^4.0.2"
+    js-yaml: "npm:^3.13.1"
+    mkdirp: "npm:~0.5.1"
+    object.values: "npm:^1.1.0"
+    sax: "npm:~1.2.4"
+    stable: "npm:^0.1.8"
+    unquote: "npm:~1.1.1"
+    util.promisify: "npm:~1.0.0"
+  bin:
+    svgo: ./bin/svgo
+  checksum: 10c0/261a82b08acf63accd7a54b47b4ffcd2fc7e7d7f8efef3cbc61184583b24b4c5434656004c30190302821af0f6d7b047eac730b0dcdab5d179e6a74383ccc776
+  languageName: node
+  linkType: hard
+
 "svgpath@npm:^2.1.5":
   version: 2.6.0
   resolution: "svgpath@npm:2.6.0"
@@ -8184,6 +18529,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"table@npm:^6.0.9":
+  version: 6.8.2
+  resolution: "table@npm:6.8.2"
+  dependencies:
+    ajv: "npm:^8.0.1"
+    lodash.truncate: "npm:^4.4.2"
+    slice-ansi: "npm:^4.0.0"
+    string-width: "npm:^4.2.3"
+    strip-ansi: "npm:^6.0.1"
+  checksum: 10c0/f8b348af38ee34e419d8ce7306ba00671ce6f20e861ccff22555f491ba264e8416086063ce278a8d81abfa8d23b736ec2cca7ac4029b5472f63daa4b4688b803
+  languageName: node
+  linkType: hard
+
+"tapable@npm:^1.0.0, tapable@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "tapable@npm:1.1.3"
+  checksum: 10c0/c9f0265e55e45821ec672b9b9ee8a35d95bf3ea6b352199f8606a2799018e89cfe4433c554d424b31fc67c4be26b05d4f36dc3c607def416fdb2514cd63dba50
+  languageName: node
+  linkType: hard
+
 "tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1":
   version: 2.2.1
   resolution: "tapable@npm:2.2.1"
@@ -8191,7 +18556,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.1.11, tar@npm:^6.1.2":
+"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2":
   version: 6.2.1
   resolution: "tar@npm:6.2.1"
   dependencies:
@@ -8205,6 +18570,72 @@ __metadata:
   languageName: node
   linkType: hard
 
+"temp-dir@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "temp-dir@npm:1.0.0"
+  checksum: 10c0/648669d5e154d1961217784c786acadccf0156519c19e0aceda7edc76f5bdfa32a40dd7f88ebea9238ed6e3dedf08b846161916c8947058c384761351be90a8e
+  languageName: node
+  linkType: hard
+
+"tempy@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "tempy@npm:0.3.0"
+  dependencies:
+    temp-dir: "npm:^1.0.0"
+    type-fest: "npm:^0.3.1"
+    unique-string: "npm:^1.0.0"
+  checksum: 10c0/9432dc82569ab0f34f23aab19ab277c58c7fcf12f903483436e9e1ee72b6b5be2189da31e351eecc69a0f98f6f2003d524cdbc50e67ee7202edf3675f9b0c2c0
+  languageName: node
+  linkType: hard
+
+"terminal-link@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "terminal-link@npm:2.1.1"
+  dependencies:
+    ansi-escapes: "npm:^4.2.1"
+    supports-hyperlinks: "npm:^2.0.0"
+  checksum: 10c0/947458a5cd5408d2ffcdb14aee50bec8fb5022ae683b896b2f08ed6db7b2e7d42780d5c8b51e930e9c322bd7c7a517f4fa7c76983d0873c83245885ac5ee13e3
+  languageName: node
+  linkType: hard
+
+"terser-webpack-plugin@npm:4.2.3":
+  version: 4.2.3
+  resolution: "terser-webpack-plugin@npm:4.2.3"
+  dependencies:
+    cacache: "npm:^15.0.5"
+    find-cache-dir: "npm:^3.3.1"
+    jest-worker: "npm:^26.5.0"
+    p-limit: "npm:^3.0.2"
+    schema-utils: "npm:^3.0.0"
+    serialize-javascript: "npm:^5.0.1"
+    source-map: "npm:^0.6.1"
+    terser: "npm:^5.3.4"
+    webpack-sources: "npm:^1.4.3"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/52bd036b72b596b162e65dce314f1ee7ba1e82b97200d919b61ad50592dc72608b5fe50d7e3f6c0934e42183dfc746b98b922c9e1d00d75253933f799687fa4b
+  languageName: node
+  linkType: hard
+
+"terser-webpack-plugin@npm:^1.4.3":
+  version: 1.4.5
+  resolution: "terser-webpack-plugin@npm:1.4.5"
+  dependencies:
+    cacache: "npm:^12.0.2"
+    find-cache-dir: "npm:^2.1.0"
+    is-wsl: "npm:^1.1.0"
+    schema-utils: "npm:^1.0.0"
+    serialize-javascript: "npm:^4.0.0"
+    source-map: "npm:^0.6.1"
+    terser: "npm:^4.1.2"
+    webpack-sources: "npm:^1.4.0"
+    worker-farm: "npm:^1.7.0"
+  peerDependencies:
+    webpack: ^4.0.0
+  checksum: 10c0/97164cfa383cf988832427e912cd9606471452f15f8bfb905ae51f1a42561f90ea541141e1e530e59f8307639fed7dfdbd626aec8390acd6ad80e58ea3fcf6df
+  languageName: node
+  linkType: hard
+
 "terser-webpack-plugin@npm:^5.3.10":
   version: 5.3.10
   resolution: "terser-webpack-plugin@npm:5.3.10"
@@ -8227,6 +18658,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"terser@npm:^4.1.2, terser@npm:^4.6.2, terser@npm:^4.6.3":
+  version: 4.8.1
+  resolution: "terser@npm:4.8.1"
+  dependencies:
+    commander: "npm:^2.20.0"
+    source-map: "npm:~0.6.1"
+    source-map-support: "npm:~0.5.12"
+  bin:
+    terser: bin/terser
+  checksum: 10c0/1ec2620e58df0ea787ac579daf097df0fee2dd402f37acb4de0df1135f0598a29212e5f03042a9c2dc7e1bf1248b1dd9d9ea0724d34331a2017f32da8783b3d7
+  languageName: node
+  linkType: hard
+
 "terser@npm:^5.26.0, terser@npm:^5.30.2":
   version: 5.30.2
   resolution: "terser@npm:5.30.2"
@@ -8241,6 +18685,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"terser@npm:^5.3.4":
+  version: 5.31.0
+  resolution: "terser@npm:5.31.0"
+  dependencies:
+    "@jridgewell/source-map": "npm:^0.3.3"
+    acorn: "npm:^8.8.2"
+    commander: "npm:^2.20.0"
+    source-map-support: "npm:~0.5.20"
+  bin:
+    terser: bin/terser
+  checksum: 10c0/cb127a579b03fb9dcee0d293ff24814deedcd430f447933b618e8593b7454f615b5c8493c68e86a4b0188769d5ea2af5251b5d507edb208114f7e8aebdc7c850
+  languageName: node
+  linkType: hard
+
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -8252,7 +18710,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"text-table@npm:^0.2.0":
+"text-table@npm:0.2.0, text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
   checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
@@ -8389,9 +18847,11 @@ __metadata:
     "@popperjs/core": "npm:^2.11.8"
     "@types/marked": "npm:4.3.2"
     "@types/react": "npm:^18.2.74"
+    blob-polyfill: "npm:^9.0.20240710"
     common: "workspace:*"
     dateformat: "npm:^4.6.3"
     dompurify: "npm:^2.4.9"
+    file-extension-icon-js: "npm:^1.1.6"
     highlight.js: "npm:^11.9.0"
     jest: "npm:^29.7.0"
     js-yaml: "npm:^4.1.0"
@@ -8405,6 +18865,39 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"throat@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "throat@npm:5.0.0"
+  checksum: 10c0/1b9c661dabf93ff9026fecd781ccfd9b507c41b9d5e581614884fffd09f3f9ebfe26d3be668ccf904fd324dd3f6efe1a3ec7f83e91b1dff9fdcc6b7d39b8bfe3
+  languageName: node
+  linkType: hard
+
+"through2@npm:^2.0.0":
+  version: 2.0.5
+  resolution: "through2@npm:2.0.5"
+  dependencies:
+    readable-stream: "npm:~2.3.6"
+    xtend: "npm:~4.0.1"
+  checksum: 10c0/cbfe5b57943fa12b4f8c043658c2a00476216d79c014895cef1ac7a1d9a8b31f6b438d0e53eecbb81054b93128324a82ecd59ec1a4f91f01f7ac113dcb14eade
+  languageName: node
+  linkType: hard
+
+"thunky@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "thunky@npm:1.1.0"
+  checksum: 10c0/369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
+  languageName: node
+  linkType: hard
+
+"timers-browserify@npm:^2.0.4":
+  version: 2.0.12
+  resolution: "timers-browserify@npm:2.0.12"
+  dependencies:
+    setimmediate: "npm:^1.0.4"
+  checksum: 10c0/98e84db1a685bc8827c117a8bc62aac811ad56a995d07938fc7ed8cdc5bf3777bfe2d4e5da868847194e771aac3749a20f6cdd22091300fe889a76fe214a4641
+  languageName: node
+  linkType: hard
+
 "timers-ext@npm:^0.1.7":
   version: 0.1.7
   resolution: "timers-ext@npm:0.1.7"
@@ -8415,6 +18908,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"timsort@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "timsort@npm:0.3.0"
+  checksum: 10c0/571b2054a0db3cf80eb255f8609a1f798cae9176f9ec6e3fbd03d64186c015cc9e1e75b88ba38e1d71aebcc03a931352522c7387dcb90caeb148375c7bc106f4
+  languageName: node
+  linkType: hard
+
 "tiny-lru@npm:^8.0.1":
   version: 8.0.2
   resolution: "tiny-lru@npm:8.0.2"
@@ -8429,6 +18929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-arraybuffer@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "to-arraybuffer@npm:1.0.1"
+  checksum: 10c0/2460bd95524f4845a751e4f8bf9937f9f3dcd1651f104e1512868782f858f8302c1cf25bbc30794bc1b3ff65c4e135158377302f2abaff43a2d8e3c38dfe098c
+  languageName: node
+  linkType: hard
+
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -8436,6 +18943,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-object-path@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "to-object-path@npm:0.3.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10c0/731832a977614c03a770363ad2bd9e9c82f233261861724a8e612bb90c705b94b1a290a19f52958e8e179180bb9b71121ed65e245691a421467726f06d1d7fc3
+  languageName: node
+  linkType: hard
+
+"to-regex-range@npm:^2.1.0":
+  version: 2.1.1
+  resolution: "to-regex-range@npm:2.1.1"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+  checksum: 10c0/440d82dbfe0b2e24f36dd8a9467240406ad1499fc8b2b0f547372c22ed1d092ace2a3eb522bb09bfd9c2f39bf1ca42eb78035cf6d2b8c9f5c78da3abc96cd949
+  languageName: node
+  linkType: hard
+
 "to-regex-range@npm:^5.0.1":
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"
@@ -8445,6 +18971,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "to-regex@npm:3.0.2"
+  dependencies:
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    regex-not: "npm:^1.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10c0/99d0b8ef397b3f7abed4bac757b0f0bb9f52bfd39167eb7105b144becfaa9a03756892352d01ac6a911f0c1ceef9f81db68c46899521a3eed054082042796120
+  languageName: node
+  linkType: hard
+
 "toidentifier@npm:1.0.1":
   version: 1.0.1
   resolution: "toidentifier@npm:1.0.1"
@@ -8459,6 +18997,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.0.0":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
+  dependencies:
+    psl: "npm:^1.1.33"
+    punycode: "npm:^2.1.1"
+    universalify: "npm:^0.2.0"
+    url-parse: "npm:^1.5.3"
+  checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45
+  languageName: node
+  linkType: hard
+
 "tough-cookie@npm:^4.1.2":
   version: 4.1.3
   resolution: "tough-cookie@npm:4.1.3"
@@ -8471,6 +19021,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tr46@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "tr46@npm:2.1.0"
+  dependencies:
+    punycode: "npm:^2.1.1"
+  checksum: 10c0/397f5c39d97c5fe29fa9bab73b03853be18ad2738b2c66ee5ce84ecb36b091bdaec493f9b3cee711d45f7678f342452600843264cc8242b591c8dc983146a6c4
+  languageName: node
+  linkType: hard
+
 "tr46@npm:^3.0.0":
   version: 3.0.0
   resolution: "tr46@npm:3.0.0"
@@ -8489,6 +19048,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tryer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "tryer@npm:1.0.1"
+  checksum: 10c0/19070409a0009dc26127636cc14d2415e9cf8b1dc07b29694e57ea8bb5ea1bded012c0e792f6235b46e31189a7b866841668b3850867ff7eac1a6b55332c960d
+  languageName: node
+  linkType: hard
+
 "ts-api-utils@npm:^1.0.1":
   version: 1.3.0
   resolution: "ts-api-utils@npm:1.3.0"
@@ -8498,6 +19064,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-pnp@npm:1.2.0, ts-pnp@npm:^1.1.6":
+  version: 1.2.0
+  resolution: "ts-pnp@npm:1.2.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10c0/ff32b4f810f9d99f676d70fe2c0e327cb6c812214bd4fc7135870b039f9e85a85b2c20f8fe030d9bd36e9598a12faa391f10aecb95df624b92f1af6bd47dc397
+  languageName: node
+  linkType: hard
+
+"tsconfig-paths@npm:^3.15.0":
+  version: 3.15.0
+  resolution: "tsconfig-paths@npm:3.15.0"
+  dependencies:
+    "@types/json5": "npm:^0.0.29"
+    json5: "npm:^1.0.2"
+    minimist: "npm:^1.2.6"
+    strip-bom: "npm:^3.0.0"
+  checksum: 10c0/5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5
+  languageName: node
+  linkType: hard
+
+"tslib@npm:^1.8.1":
+  version: 1.14.1
+  resolution: "tslib@npm:1.14.1"
+  checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^2.0.3":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
@@ -8505,6 +19100,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tsutils@npm:^3.17.1, tsutils@npm:^3.21.0":
+  version: 3.21.0
+  resolution: "tsutils@npm:3.21.0"
+  dependencies:
+    tslib: "npm:^1.8.1"
+  peerDependencies:
+    typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+  checksum: 10c0/02f19e458ec78ead8fffbf711f834ad8ecd2cc6ade4ec0320790713dccc0a412b99e7fd907c4cda2a1dc602c75db6f12e0108e87a5afad4b2f9e90a24cabd5a2
+  languageName: node
+  linkType: hard
+
 "ttf2eot@npm:^2.0.0":
   version: 2.0.0
   resolution: "ttf2eot@npm:2.0.0"
@@ -8543,6 +19149,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tty-browserify@npm:0.0.0":
+  version: 0.0.0
+  resolution: "tty-browserify@npm:0.0.0"
+  checksum: 10c0/c0c68206565f1372e924d5cdeeff1a0d9cc729833f1da98c03d78be8f939e5f61a107bd0ab77d1ef6a47d62bb0e48b1081fbea273acf404959e22fd3891439c5
+  languageName: node
+  linkType: hard
+
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"
@@ -8552,6 +19165,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-check@npm:~0.3.2":
+  version: 0.3.2
+  resolution: "type-check@npm:0.3.2"
+  dependencies:
+    prelude-ls: "npm:~1.1.2"
+  checksum: 10c0/776217116b2b4e50e368c7ee0c22c0a85e982881c16965b90d52f216bc296d6a52ef74f9202d22158caacc092a7645b0b8d5fe529a96e3fe35d0fb393966c875
+  languageName: node
+  linkType: hard
+
 "type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
@@ -8573,6 +19195,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "type-fest@npm:0.3.1"
+  checksum: 10c0/ef632e9549f331024594bbb8b620fe570d90abd8e7f2892d4aff733fd72698774e1a88e277fac02b4267de17d79cbb87860332f64f387145532b13ace6510502
+  languageName: node
+  linkType: hard
+
+"type-fest@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "type-fest@npm:0.6.0"
+  checksum: 10c0/0c585c26416fce9ecb5691873a1301b5aff54673c7999b6f925691ed01f5b9232db408cdbb0bd003d19f5ae284322523f44092d1f81ca0a48f11f7cf0be8cd38
+  languageName: node
+  linkType: hard
+
 "type-fest@npm:^0.7.1":
   version: 0.7.1
   resolution: "type-fest@npm:0.7.1"
@@ -8580,6 +19216,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-fest@npm:^0.8.1":
+  version: 0.8.1
+  resolution: "type-fest@npm:0.8.1"
+  checksum: 10c0/dffbb99329da2aa840f506d376c863bd55f5636f4741ad6e65e82f5ce47e6914108f44f340a0b74009b0cb5d09d6752ae83203e53e98b1192cf80ecee5651636
+  languageName: node
+  linkType: hard
+
+"type-is@npm:~1.6.18":
+  version: 1.6.18
+  resolution: "type-is@npm:1.6.18"
+  dependencies:
+    media-typer: "npm:0.3.0"
+    mime-types: "npm:~2.1.24"
+  checksum: 10c0/a23daeb538591b7efbd61ecf06b6feb2501b683ffdc9a19c74ef5baba362b4347e42f1b4ed81f5882a8c96a3bfff7f93ce3ffaf0cbbc879b532b04c97a55db9d
+  languageName: node
+  linkType: hard
+
 "type@npm:^2.7.2":
   version: 2.7.2
   resolution: "type@npm:2.7.2"
@@ -8639,6 +19292,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"typedarray-to-buffer@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "typedarray-to-buffer@npm:3.1.5"
+  dependencies:
+    is-typedarray: "npm:^1.0.0"
+  checksum: 10c0/4ac5b7a93d604edabf3ac58d3a2f7e07487e9f6e98195a080e81dbffdc4127817f470f219d794a843b87052cedef102b53ac9b539855380b8c2172054b7d5027
+  languageName: node
+  linkType: hard
+
+"typedarray@npm:^0.0.6":
+  version: 0.0.6
+  resolution: "typedarray@npm:0.0.6"
+  checksum: 10c0/6005cb31df50eef8b1f3c780eb71a17925f3038a100d82f9406ac2ad1de5eb59f8e6decbdc145b3a1f8e5836e17b0c0002fb698b9fe2516b8f9f9ff602d36412
+  languageName: node
+  linkType: hard
+
 "typescript@npm:^5.4.3":
   version: 5.4.3
   resolution: "typescript@npm:5.4.3"
@@ -8680,6 +19349,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"underscore@npm:1.12.1":
+  version: 1.12.1
+  resolution: "underscore@npm:1.12.1"
+  checksum: 10c0/00f392357e363353ac485e7c156b749505087e31ff4fdad22e04ebd2f94a56fbc554cd41a6722e3895a818466cf298b1cae93ff6211d102d373a9b50db63bfd0
+  languageName: node
+  linkType: hard
+
 "undici-types@npm:~5.26.4":
   version: 5.26.5
   resolution: "undici-types@npm:5.26.5"
@@ -8694,6 +19370,72 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unicode-canonical-property-names-ecmascript@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
+  checksum: 10c0/0fe812641bcfa3ae433025178a64afb5d9afebc21a922dafa7cba971deebb5e4a37350423890750132a85c936c290fb988146d0b1bd86838ad4897f4fc5bd0de
+  languageName: node
+  linkType: hard
+
+"unicode-match-property-ecmascript@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "unicode-match-property-ecmascript@npm:2.0.0"
+  dependencies:
+    unicode-canonical-property-names-ecmascript: "npm:^2.0.0"
+    unicode-property-aliases-ecmascript: "npm:^2.0.0"
+  checksum: 10c0/4d05252cecaf5c8e36d78dc5332e03b334c6242faf7cf16b3658525441386c0a03b5f603d42cbec0f09bb63b9fd25c9b3b09667aee75463cac3efadae2cd17ec
+  languageName: node
+  linkType: hard
+
+"unicode-match-property-value-ecmascript@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
+  checksum: 10c0/f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2
+  languageName: node
+  linkType: hard
+
+"unicode-property-aliases-ecmascript@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
+  checksum: 10c0/50ded3f8c963c7785e48c510a3b7c6bc4e08a579551489aa0349680a35b1ceceec122e33b2b6c1b579d0be2250f34bb163ac35f5f8695fe10bbc67fb757f0af8
+  languageName: node
+  linkType: hard
+
+"union-value@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "union-value@npm:1.0.1"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    get-value: "npm:^2.0.6"
+    is-extendable: "npm:^0.1.1"
+    set-value: "npm:^2.0.1"
+  checksum: 10c0/8758d880cb9545f62ce9cfb9b791b2b7a206e0ff5cc4b9d7cd6581da2c6839837fbb45e639cf1fd8eef3cae08c0201b614b7c06dd9f5f70d9dbe7c5fe2fbf592
+  languageName: node
+  linkType: hard
+
+"uniq@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "uniq@npm:1.0.1"
+  checksum: 10c0/369dca4a07fdd8de9e48378b9d4b6861722ca71d5f496e91687916bd4b48b8cf3d6db1677be1b40eea63bc6d4728efb4b4e0bd7a89c5fd2d23e7a2cff8009c7a
+  languageName: node
+  linkType: hard
+
+"uniqs@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "uniqs@npm:2.0.0"
+  checksum: 10c0/f244b158f6b3d30ddea2092c581fe9eb746d6db889a859fd0001e4b7566767bfcc53cdf11e6286f097bb130ebad71025709f41f2e4dd38e5c2f03ec28052baab
+  languageName: node
+  linkType: hard
+
+"unique-filename@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "unique-filename@npm:1.1.1"
+  dependencies:
+    unique-slug: "npm:^2.0.0"
+  checksum: 10c0/d005bdfaae6894da8407c4de2b52f38b3c58ec86e79fc2ee19939da3085374413b073478ec54e721dc8e32b102cf9e50d0481b8331abdc62202e774b789ea874
+  languageName: node
+  linkType: hard
+
 "unique-filename@npm:^2.0.0":
   version: 2.0.1
   resolution: "unique-filename@npm:2.0.1"
@@ -8712,6 +19454,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unique-slug@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "unique-slug@npm:2.0.2"
+  dependencies:
+    imurmurhash: "npm:^0.1.4"
+  checksum: 10c0/9eabc51680cf0b8b197811a48857e41f1364b25362300c1ff636c0eca5ec543a92a38786f59cf0697e62c6f814b11ecbe64e8093db71246468a1f03b80c83970
+  languageName: node
+  linkType: hard
+
 "unique-slug@npm:^3.0.0":
   version: 3.0.0
   resolution: "unique-slug@npm:3.0.0"
@@ -8730,6 +19481,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unique-string@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unique-string@npm:1.0.0"
+  dependencies:
+    crypto-random-string: "npm:^1.0.0"
+  checksum: 10c0/79cc2a6515a51e6350c74f65c92246511966c47528f1119318cbe8d68a508842f4e5a2a81857a65f3919629397a525f820505116dd89cac425294598e35ca12c
+  languageName: node
+  linkType: hard
+
+"universalify@npm:^0.1.0":
+  version: 0.1.2
+  resolution: "universalify@npm:0.1.2"
+  checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^0.2.0":
   version: 0.2.0
   resolution: "universalify@npm:0.2.0"
@@ -8737,6 +19504,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "universalify@npm:2.0.1"
+  checksum: 10c0/73e8ee3809041ca8b818efb141801a1004e3fc0002727f1531f4de613ea281b494a40909596dae4a042a4fb6cd385af5d4db2e137b1362e0e91384b828effd3a
+  languageName: node
+  linkType: hard
+
+"unpipe@npm:1.0.0, unpipe@npm:~1.0.0":
+  version: 1.0.0
+  resolution: "unpipe@npm:1.0.0"
+  checksum: 10c0/193400255bd48968e5c5383730344fbb4fa114cdedfab26e329e50dd2d81b134244bb8a72c6ac1b10ab0281a58b363d06405632c9d49ca9dfd5e90cbd7d0f32c
+  languageName: node
+  linkType: hard
+
+"unquote@npm:~1.1.1":
+  version: 1.1.1
+  resolution: "unquote@npm:1.1.1"
+  checksum: 10c0/de59fb48cbaadc636002c6563dcb6b1bce95c91ebecb92addbc9bb47982cb03e7d8a8371c9617267b9e5746bbcb4403394139bc1310106b9ac4c26790ed57859
+  languageName: node
+  linkType: hard
+
+"unset-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unset-value@npm:1.0.0"
+  dependencies:
+    has-value: "npm:^0.3.1"
+    isobject: "npm:^3.0.0"
+  checksum: 10c0/68a796dde4a373afdbf017de64f08490a3573ebee549136da0b3a2245299e7f65f647ef70dc13c4ac7f47b12fba4de1646fa0967a365638578fedce02b9c0b1f
+  languageName: node
+  linkType: hard
+
+"upath@npm:^1.1.1, upath@npm:^1.1.2, upath@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "upath@npm:1.2.0"
+  checksum: 10c0/3746f24099bf69dbf8234cecb671e1016e1f6b26bd306de4ff8966fb0bc463fa1014ffc48646b375de1ab573660e3a0256f6f2a87218b2dfa1779a84ef6992fa
+  languageName: node
+  linkType: hard
+
 "update-browserslist-db@npm:^1.0.13":
   version: 1.0.13
   resolution: "update-browserslist-db@npm:1.0.13"
@@ -8769,7 +19574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uri-js@npm:^4.2.2":
+"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1":
   version: 4.4.1
   resolution: "uri-js@npm:4.4.1"
   dependencies:
@@ -8778,7 +19583,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-loader@npm:^4.1.1":
+"urix@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "urix@npm:0.1.0"
+  checksum: 10c0/264f1b29360c33c0aec5fb9819d7e28f15d1a3b83175d2bcc9131efe8583f459f07364957ae3527f1478659ec5b2d0f1ad401dfb625f73e4d424b3ae35fc5fc0
+  languageName: node
+  linkType: hard
+
+"url-loader@npm:4.1.1, url-loader@npm:^4.1.1":
   version: 4.1.1
   resolution: "url-loader@npm:4.1.1"
   dependencies:
@@ -8795,7 +19607,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse@npm:^1.5.3":
+"url-parse@npm:^1.5.10, url-parse@npm:^1.5.3":
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
   dependencies:
@@ -8805,13 +19617,120 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2":
+"url@npm:^0.11.0":
+  version: 0.11.3
+  resolution: "url@npm:0.11.3"
+  dependencies:
+    punycode: "npm:^1.4.1"
+    qs: "npm:^6.11.2"
+  checksum: 10c0/7546b878ee7927cfc62ca21dbe2dc395cf70e889c3488b2815bf2c63355cb3c7db555128176a01b0af6cccf265667b6fd0b4806de00cb71c143c53986c08c602
+  languageName: node
+  linkType: hard
+
+"use@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "use@npm:3.1.1"
+  checksum: 10c0/75b48673ab80d5139c76922630d5a8a44e72ed58dbaf54dee1b88352d10e1c1c1fc332066c782d8ae9a56503b85d3dc67ff6d2ffbd9821120466d1280ebb6d6e
+  languageName: node
+  linkType: hard
+
+"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
   checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942
   languageName: node
   linkType: hard
 
+"util.promisify@npm:1.0.0":
+  version: 1.0.0
+  resolution: "util.promisify@npm:1.0.0"
+  dependencies:
+    define-properties: "npm:^1.1.2"
+    object.getownpropertydescriptors: "npm:^2.0.3"
+  checksum: 10c0/af9df9d111b1464586e4fa414ccf6de61c3a14c0664a66a497438a0507d47f65389f5e025c048ef7e2bf6dba73e95adc3d0c56111a0952ae0282817fc4dd83b2
+  languageName: node
+  linkType: hard
+
+"util.promisify@npm:~1.0.0":
+  version: 1.0.1
+  resolution: "util.promisify@npm:1.0.1"
+  dependencies:
+    define-properties: "npm:^1.1.3"
+    es-abstract: "npm:^1.17.2"
+    has-symbols: "npm:^1.0.1"
+    object.getownpropertydescriptors: "npm:^2.1.0"
+  checksum: 10c0/d72b7c1344816bc9c8713efbf5cb23b536730a8fb7df9ae50654d9efa4d24241fc5ecc69a7dc63b9a2f98cabc9635c303923671933f8c6f41fa7d64fe2188e27
+  languageName: node
+  linkType: hard
+
+"util@npm:^0.10.4":
+  version: 0.10.4
+  resolution: "util@npm:0.10.4"
+  dependencies:
+    inherits: "npm:2.0.3"
+  checksum: 10c0/d29f6893e406b63b088ce9924da03201df89b31490d4d011f1c07a386ea4b3dbe907464c274023c237da470258e1805d806c7e4009a5974cd6b1d474b675852a
+  languageName: node
+  linkType: hard
+
+"util@npm:^0.11.0":
+  version: 0.11.1
+  resolution: "util@npm:0.11.1"
+  dependencies:
+    inherits: "npm:2.0.3"
+  checksum: 10c0/8e9d1a85e661c8a8d9883d821aedbff3f8d9c3accd85357020905386ada5653b20389fc3591901e2a0bde64f8dc86b28c3f990114aa5a38eaaf30b455fa3cdf6
+  languageName: node
+  linkType: hard
+
+"utila@npm:~0.4":
+  version: 0.4.0
+  resolution: "utila@npm:0.4.0"
+  checksum: 10c0/2791604e09ca4f77ae314df83e80d1805f867eb5c7e13e7413caee01273c278cf2c9a3670d8d25c889a877f7b149d892fe61b0181a81654b425e9622ab23d42e
+  languageName: node
+  linkType: hard
+
+"utils-merge@npm:1.0.1":
+  version: 1.0.1
+  resolution: "utils-merge@npm:1.0.1"
+  checksum: 10c0/02ba649de1b7ca8854bfe20a82f1dfbdda3fb57a22ab4a8972a63a34553cf7aa51bc9081cf7e001b035b88186d23689d69e71b510e610a09a4c66f68aa95b672
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^3.3.2":
+  version: 3.4.0
+  resolution: "uuid@npm:3.4.0"
+  bin:
+    uuid: ./bin/uuid
+  checksum: 10c0/1c13950df865c4f506ebfe0a24023571fa80edf2e62364297a537c80af09c618299797bbf2dbac6b1f8ae5ad182ba474b89db61e0e85839683991f7e08795347
+  languageName: node
+  linkType: hard
+
+"uuid@npm:^8.3.0, uuid@npm:^8.3.2":
+  version: 8.3.2
+  resolution: "uuid@npm:8.3.2"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54
+  languageName: node
+  linkType: hard
+
+"v8-compile-cache@npm:^2.0.3":
+  version: 2.4.0
+  resolution: "v8-compile-cache@npm:2.4.0"
+  checksum: 10c0/387851192545e7f4d691ba674de90890bba76c0f08ee4909ab862377f556221e75b3a361466490e201203401d64d7795f889882bdabc98b6f3c0bf1038a535be
+  languageName: node
+  linkType: hard
+
+"v8-to-istanbul@npm:^7.0.0":
+  version: 7.1.2
+  resolution: "v8-to-istanbul@npm:7.1.2"
+  dependencies:
+    "@types/istanbul-lib-coverage": "npm:^2.0.1"
+    convert-source-map: "npm:^1.6.0"
+    source-map: "npm:^0.7.3"
+  checksum: 10c0/a901917e3e321e2c74a9582cbe6652ff2b983040a683c924ce98fbccdfe249cbcb34d7d7913a13a7e4eee9bed3a51c7181b09103f4405d92f4ebac1cc40dc005
+  languageName: node
+  linkType: hard
+
 "v8-to-istanbul@npm:^9.0.1":
   version: 9.2.0
   resolution: "v8-to-istanbul@npm:9.2.0"
@@ -8823,6 +19742,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"validate-npm-package-license@npm:^3.0.1":
+  version: 3.0.4
+  resolution: "validate-npm-package-license@npm:3.0.4"
+  dependencies:
+    spdx-correct: "npm:^3.0.0"
+    spdx-expression-parse: "npm:^3.0.0"
+  checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f
+  languageName: node
+  linkType: hard
+
 "varstream@npm:^0.3.2":
   version: 0.3.2
   resolution: "varstream@npm:0.3.2"
@@ -8835,6 +19764,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vary@npm:~1.1.2":
+  version: 1.1.2
+  resolution: "vary@npm:1.1.2"
+  checksum: 10c0/f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f
+  languageName: node
+  linkType: hard
+
+"vendors@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "vendors@npm:1.0.4"
+  checksum: 10c0/a9b097f3607013a23bf447cbaff85b79b694cc23b20e81a6aea1ea9e1c59854c93f7c87abcc71b57999e050606e499d9ce18df67968823644b20f6e03d56022a
+  languageName: node
+  linkType: hard
+
+"vm-browserify@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "vm-browserify@npm:1.1.2"
+  checksum: 10c0/0cc1af6e0d880deb58bc974921320c187f9e0a94f25570fca6b1bd64e798ce454ab87dfd797551b1b0cc1849307421aae0193cedf5f06bdb5680476780ee344b
+  languageName: node
+  linkType: hard
+
+"w3c-hr-time@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "w3c-hr-time@npm:1.0.2"
+  dependencies:
+    browser-process-hrtime: "npm:^1.0.0"
+  checksum: 10c0/7795b61fb51ce222414891eef8e6cb13240b62f64351b4474f99c84de2bc37d37dd0efa193f37391e9737097b881a111d1e003e3d7a9583693f8d5a858b02627
+  languageName: node
+  linkType: hard
+
+"w3c-xmlserializer@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "w3c-xmlserializer@npm:2.0.0"
+  dependencies:
+    xml-name-validator: "npm:^3.0.0"
+  checksum: 10c0/92b8af34766f5bb8f37c505bc459ee1791b30af778d3a86551f7dd3b1716f79cb98c71d65d03f2bf6eba6b09861868eaf2be7e233b9202b26a9df7595f2bd290
+  languageName: node
+  linkType: hard
+
 "w3c-xmlserializer@npm:^4.0.0":
   version: 4.0.0
   resolution: "w3c-xmlserializer@npm:4.0.0"
@@ -8844,21 +19812,47 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walker@npm:^1.0.8":
+"walker@npm:^1.0.7, walker@npm:^1.0.8, walker@npm:~1.0.5":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
   dependencies:
-    makeerror: "npm:1.0.12"
-  checksum: 10c0/a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
+    makeerror: "npm:1.0.12"
+  checksum: 10c0/a17e037bccd3ca8a25a80cb850903facdfed0de4864bd8728f1782370715d679fa72e0a0f5da7c1c1379365159901e5935f35be531229da53bbfc0efdabdb48e
+  languageName: node
+  linkType: hard
+
+"warning@npm:^4.0.2":
+  version: 4.0.3
+  resolution: "warning@npm:4.0.3"
+  dependencies:
+    loose-envify: "npm:^1.0.0"
+  checksum: 10c0/aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
+  languageName: node
+  linkType: hard
+
+"watchpack-chokidar2@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "watchpack-chokidar2@npm:2.0.1"
+  dependencies:
+    chokidar: "npm:^2.1.8"
+  checksum: 10c0/9b8d880ae2543dd4f26a69f6b7f881119494f6b772b7431027a06a5cf963e0ebc1cac91a3ef479365c358b693c65fa80a1f8297427fa11fd4c080c3d6408c372
   languageName: node
   linkType: hard
 
-"warning@npm:^4.0.2":
-  version: 4.0.3
-  resolution: "warning@npm:4.0.3"
+"watchpack@npm:^1.7.4":
+  version: 1.7.5
+  resolution: "watchpack@npm:1.7.5"
   dependencies:
-    loose-envify: "npm:^1.0.0"
-  checksum: 10c0/aebab445129f3e104c271f1637fa38e55eb25f968593e3825bd2f7a12bd58dc3738bb70dc8ec85826621d80b4acfed5a29ebc9da17397c6125864d72301b937e
+    chokidar: "npm:^3.4.1"
+    graceful-fs: "npm:^4.1.2"
+    neo-async: "npm:^2.5.0"
+    watchpack-chokidar2: "npm:^2.0.1"
+  dependenciesMeta:
+    chokidar:
+      optional: true
+    watchpack-chokidar2:
+      optional: true
+  checksum: 10c0/53e3b112064f5de9edbb2a14973fb3901d9697b24cc70f8531a143eaace2353a273ca25c0ba21def8d3803cfedb8f6861ca1e49e9782257e40d5b5f8f5365c86
   languageName: node
   linkType: hard
 
@@ -8872,6 +19866,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wbuf@npm:^1.1.0, wbuf@npm:^1.7.3":
+  version: 1.7.3
+  resolution: "wbuf@npm:1.7.3"
+  dependencies:
+    minimalistic-assert: "npm:^1.0.0"
+  checksum: 10c0/56edcc5ef2b3d30913ba8f1f5cccc364d180670b24d5f3f8849c1e6fb514e5c7e3a87548ae61227a82859eba6269c11393ae24ce12a2ea1ecb9b465718ddced7
+  languageName: node
+  linkType: hard
+
+"web-vitals@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "web-vitals@npm:1.1.2"
+  checksum: 10c0/9521ea2e8ca2e4446ba8e3d5430b0c9a9a07e0d6f468a90dc5fab2bab524fb1a699f3874ea392c9e35a63dcf3651b40130d58ebd78e53a406cb9622049bf1403
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "webidl-conversions@npm:5.0.0"
+  checksum: 10c0/bf31df332ed11e1114bfcae7712d9ab2c37e7faa60ba32d8fdbee785937c0b012eee235c19d2b5d84f5072db84a160e8d08dd382da7f850feec26a4f46add8ff
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^6.1.0":
+  version: 6.1.0
+  resolution: "webidl-conversions@npm:6.1.0"
+  checksum: 10c0/66ad3b9073cd1e0e173444d8c636673b016e25b5856694429072cc966229adb734a8d410188e031effadcfb837936d79bc9e87c48f4d5925a90d42dec97f6590
+  languageName: node
+  linkType: hard
+
 "webidl-conversions@npm:^7.0.0":
   version: 7.0.0
   resolution: "webidl-conversions@npm:7.0.0"
@@ -8934,6 +19958,93 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack-dev-middleware@npm:^3.7.2":
+  version: 3.7.3
+  resolution: "webpack-dev-middleware@npm:3.7.3"
+  dependencies:
+    memory-fs: "npm:^0.4.1"
+    mime: "npm:^2.4.4"
+    mkdirp: "npm:^0.5.1"
+    range-parser: "npm:^1.2.1"
+    webpack-log: "npm:^2.0.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10c0/f9bd8318c6f356d006dc99e3e46ef8870d67640e43f26cfcd2bb36c9e7eaf64015513f43498e92b532896f7fbd8f32c0710d4489fc81d7a45ea328d7e4cf3085
+  languageName: node
+  linkType: hard
+
+"webpack-dev-server@npm:3.11.1":
+  version: 3.11.1
+  resolution: "webpack-dev-server@npm:3.11.1"
+  dependencies:
+    ansi-html: "npm:0.0.7"
+    bonjour: "npm:^3.5.0"
+    chokidar: "npm:^2.1.8"
+    compression: "npm:^1.7.4"
+    connect-history-api-fallback: "npm:^1.6.0"
+    debug: "npm:^4.1.1"
+    del: "npm:^4.1.1"
+    express: "npm:^4.17.1"
+    html-entities: "npm:^1.3.1"
+    http-proxy-middleware: "npm:0.19.1"
+    import-local: "npm:^2.0.0"
+    internal-ip: "npm:^4.3.0"
+    ip: "npm:^1.1.5"
+    is-absolute-url: "npm:^3.0.3"
+    killable: "npm:^1.0.1"
+    loglevel: "npm:^1.6.8"
+    opn: "npm:^5.5.0"
+    p-retry: "npm:^3.0.1"
+    portfinder: "npm:^1.0.26"
+    schema-utils: "npm:^1.0.0"
+    selfsigned: "npm:^1.10.8"
+    semver: "npm:^6.3.0"
+    serve-index: "npm:^1.9.1"
+    sockjs: "npm:^0.3.21"
+    sockjs-client: "npm:^1.5.0"
+    spdy: "npm:^4.0.2"
+    strip-ansi: "npm:^3.0.1"
+    supports-color: "npm:^6.1.0"
+    url: "npm:^0.11.0"
+    webpack-dev-middleware: "npm:^3.7.2"
+    webpack-log: "npm:^2.0.0"
+    ws: "npm:^6.2.1"
+    yargs: "npm:^13.3.2"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+  bin:
+    webpack-dev-server: bin/webpack-dev-server.js
+  checksum: 10c0/9270b798e5a5ce0b806512e2a58247e297935f89c6adb933393084eea3f7b77111d6ae8bda1a8c8ebcd7c259e388a1f990080f743294d09b2163d69207d2aa1a
+  languageName: node
+  linkType: hard
+
+"webpack-log@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "webpack-log@npm:2.0.0"
+  dependencies:
+    ansi-colors: "npm:^3.0.0"
+    uuid: "npm:^3.3.2"
+  checksum: 10c0/515b800433da1c0b5722317baaeb05fc185da5a1fde5e39d25bed0b05c13ee3a544aa13844db8590696274a3c5dc04fd5abdd39f38f8c46a4084b74ff0dc9c60
+  languageName: node
+  linkType: hard
+
+"webpack-manifest-plugin@npm:2.2.0":
+  version: 2.2.0
+  resolution: "webpack-manifest-plugin@npm:2.2.0"
+  dependencies:
+    fs-extra: "npm:^7.0.0"
+    lodash: "npm:>=3.5 <5"
+    object.entries: "npm:^1.1.0"
+    tapable: "npm:^1.0.0"
+  peerDependencies:
+    webpack: 2 || 3 || 4
+  checksum: 10c0/8755152d448bd26a5164ccb173ba6971b64891894a680e477baad434f9c4a78e707e6e40f59447998427d0a7e00e1b027306a671f9fedaf6b19007577de9e235
+  languageName: node
+  linkType: hard
+
 "webpack-merge@npm:^5.7.3":
   version: 5.10.0
   resolution: "webpack-merge@npm:5.10.0"
@@ -8945,7 +20056,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-sources@npm:^1.4.3":
+"webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.3.0, webpack-sources@npm:^1.4.0, webpack-sources@npm:^1.4.1, webpack-sources@npm:^1.4.3":
   version: 1.4.3
   resolution: "webpack-sources@npm:1.4.3"
   dependencies:
@@ -8962,6 +20073,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"webpack@npm:4.44.2":
+  version: 4.44.2
+  resolution: "webpack@npm:4.44.2"
+  dependencies:
+    "@webassemblyjs/ast": "npm:1.9.0"
+    "@webassemblyjs/helper-module-context": "npm:1.9.0"
+    "@webassemblyjs/wasm-edit": "npm:1.9.0"
+    "@webassemblyjs/wasm-parser": "npm:1.9.0"
+    acorn: "npm:^6.4.1"
+    ajv: "npm:^6.10.2"
+    ajv-keywords: "npm:^3.4.1"
+    chrome-trace-event: "npm:^1.0.2"
+    enhanced-resolve: "npm:^4.3.0"
+    eslint-scope: "npm:^4.0.3"
+    json-parse-better-errors: "npm:^1.0.2"
+    loader-runner: "npm:^2.4.0"
+    loader-utils: "npm:^1.2.3"
+    memory-fs: "npm:^0.4.1"
+    micromatch: "npm:^3.1.10"
+    mkdirp: "npm:^0.5.3"
+    neo-async: "npm:^2.6.1"
+    node-libs-browser: "npm:^2.2.1"
+    schema-utils: "npm:^1.0.0"
+    tapable: "npm:^1.1.3"
+    terser-webpack-plugin: "npm:^1.4.3"
+    watchpack: "npm:^1.7.4"
+    webpack-sources: "npm:^1.4.1"
+  peerDependenciesMeta:
+    webpack-cli:
+      optional: true
+    webpack-command:
+      optional: true
+  bin:
+    webpack: bin/webpack.js
+  checksum: 10c0/4a3d55044286d2c1f0572811440a289abb4221d782be076c7abb22b4b5759c2fb9d44bdc7d2e28c294a50d325c8f947be0849c5ff67568695ae3a897d986b323
+  languageName: node
+  linkType: hard
+
 "webpack@npm:^5.91.0":
   version: 5.91.0
   resolution: "webpack@npm:5.91.0"
@@ -8999,6 +20148,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
+  version: 0.7.4
+  resolution: "websocket-driver@npm:0.7.4"
+  dependencies:
+    http-parser-js: "npm:>=0.5.1"
+    safe-buffer: "npm:>=5.1.0"
+    websocket-extensions: "npm:>=0.1.1"
+  checksum: 10c0/5f09547912b27bdc57bac17b7b6527d8993aa4ac8a2d10588bb74aebaf785fdcf64fea034aae0c359b7adff2044dd66f3d03866e4685571f81b13e548f9021f1
+  languageName: node
+  linkType: hard
+
+"websocket-extensions@npm:>=0.1.1":
+  version: 0.1.4
+  resolution: "websocket-extensions@npm:0.1.4"
+  checksum: 10c0/bbc8c233388a0eb8a40786ee2e30d35935cacbfe26ab188b3e020987e85d519c2009fe07cfc37b7f718b85afdba7e54654c9153e6697301f72561bfe429177e0
+  languageName: node
+  linkType: hard
+
+"whatwg-encoding@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "whatwg-encoding@npm:1.0.5"
+  dependencies:
+    iconv-lite: "npm:0.4.24"
+  checksum: 10c0/79d9f276234fd06bb27de4c1f9137a0471bfa578efaec0474ab46b6d64bf30bb14492e6f88eff0e6794bdd6fa48b44f4d7a2e9c41424a837a63bba9626e35c62
+  languageName: node
+  linkType: hard
+
 "whatwg-encoding@npm:^2.0.0":
   version: 2.0.0
   resolution: "whatwg-encoding@npm:2.0.0"
@@ -9008,6 +20184,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-fetch@npm:^3.4.1":
+  version: 3.6.20
+  resolution: "whatwg-fetch@npm:3.6.20"
+  checksum: 10c0/fa972dd14091321d38f36a4d062298df58c2248393ef9e8b154493c347c62e2756e25be29c16277396046d6eaa4b11bd174f34e6403fff6aaca9fb30fa1ff46d
+  languageName: node
+  linkType: hard
+
+"whatwg-mimetype@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "whatwg-mimetype@npm:2.3.0"
+  checksum: 10c0/81c5eaf660b1d1c27575406bcfdf58557b599e302211e13e3c8209020bbac903e73c17f9990f887232b39ce570cc8638331b0c3ff0842ba224a5c2925e830b06
+  languageName: node
+  linkType: hard
+
 "whatwg-mimetype@npm:^3.0.0":
   version: 3.0.0
   resolution: "whatwg-mimetype@npm:3.0.0"
@@ -9035,6 +20225,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
+  version: 8.7.0
+  resolution: "whatwg-url@npm:8.7.0"
+  dependencies:
+    lodash: "npm:^4.7.0"
+    tr46: "npm:^2.1.0"
+    webidl-conversions: "npm:^6.1.0"
+  checksum: 10c0/de0bc94387dba586b278e701cf5a1c1f5002725d22b8564dbca2cab1966ef24b839018e57ae2423fb514d8a2dd3aa3bf97323e2f89b55cd89e79141e432e9df1
+  languageName: node
+  linkType: hard
+
 "which-boxed-primitive@npm:^1.0.2":
   version: 1.0.2
   resolution: "which-boxed-primitive@npm:1.0.2"
@@ -9080,6 +20281,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which-module@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "which-module@npm:2.0.1"
+  checksum: 10c0/087038e7992649eaffa6c7a4f3158d5b53b14cf5b6c1f0e043dccfacb1ba179d12f17545d5b85ebd94a42ce280a6fe65d0cbcab70f4fc6daad1dfae85e0e6a3e
+  languageName: node
+  linkType: hard
+
 "which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9":
   version: 1.1.15
   resolution: "which-typed-array@npm:1.1.15"
@@ -9093,6 +20301,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"which@npm:^1.2.9, which@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "which@npm:1.3.1"
+  dependencies:
+    isexe: "npm:^2.0.0"
+  bin:
+    which: ./bin/which
+  checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59
+  languageName: node
+  linkType: hard
+
 "which@npm:^2.0.1, which@npm:^2.0.2":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
@@ -9131,6 +20350,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"word-wrap@npm:^1.2.5, word-wrap@npm:~1.2.3":
+  version: 1.2.5
+  resolution: "word-wrap@npm:1.2.5"
+  checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20
+  languageName: node
+  linkType: hard
+
 "wordwrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "wordwrap@npm:1.0.0"
@@ -9138,6 +20364,211 @@ __metadata:
   languageName: node
   linkType: hard
 
+"workbox-background-sync@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-background-sync@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/efc7b54afd71fac1ea0b0d31b0fa0d422c424f4b06812812117215a543b71d523007c49268a76622506a7f65bd050de9da2e467cd5ab3a44206c4a81cd65fa0d
+  languageName: node
+  linkType: hard
+
+"workbox-broadcast-update@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-broadcast-update@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/15e7ec64aa6477d508491ed122d5dc1ff44b04f4d5a34c5c7282d3233616064a83b6855bc5afe9803757870c1c0bde427915799082d868c71f4393862115f4ad
+  languageName: node
+  linkType: hard
+
+"workbox-build@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-build@npm:5.1.4"
+  dependencies:
+    "@babel/core": "npm:^7.8.4"
+    "@babel/preset-env": "npm:^7.8.4"
+    "@babel/runtime": "npm:^7.8.4"
+    "@hapi/joi": "npm:^15.1.0"
+    "@rollup/plugin-node-resolve": "npm:^7.1.1"
+    "@rollup/plugin-replace": "npm:^2.3.1"
+    "@surma/rollup-plugin-off-main-thread": "npm:^1.1.1"
+    common-tags: "npm:^1.8.0"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    fs-extra: "npm:^8.1.0"
+    glob: "npm:^7.1.6"
+    lodash.template: "npm:^4.5.0"
+    pretty-bytes: "npm:^5.3.0"
+    rollup: "npm:^1.31.1"
+    rollup-plugin-babel: "npm:^4.3.3"
+    rollup-plugin-terser: "npm:^5.3.1"
+    source-map: "npm:^0.7.3"
+    source-map-url: "npm:^0.4.0"
+    stringify-object: "npm:^3.3.0"
+    strip-comments: "npm:^1.0.2"
+    tempy: "npm:^0.3.0"
+    upath: "npm:^1.2.0"
+    workbox-background-sync: "npm:^5.1.4"
+    workbox-broadcast-update: "npm:^5.1.4"
+    workbox-cacheable-response: "npm:^5.1.4"
+    workbox-core: "npm:^5.1.4"
+    workbox-expiration: "npm:^5.1.4"
+    workbox-google-analytics: "npm:^5.1.4"
+    workbox-navigation-preload: "npm:^5.1.4"
+    workbox-precaching: "npm:^5.1.4"
+    workbox-range-requests: "npm:^5.1.4"
+    workbox-routing: "npm:^5.1.4"
+    workbox-strategies: "npm:^5.1.4"
+    workbox-streams: "npm:^5.1.4"
+    workbox-sw: "npm:^5.1.4"
+    workbox-window: "npm:^5.1.4"
+  checksum: 10c0/df279905d2da9c4c22c99d78db228a579cacfe7498b8727e81c213b45c137a8a965872583d0ecedb835037062fc0f1ad52c9468a0b33a60ec5f694f53636d052
+  languageName: node
+  linkType: hard
+
+"workbox-cacheable-response@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-cacheable-response@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/8762c978cd9eb7285bcf6e3cd753089110e53dc1fc59cb4158393052dfeddd6d42f842ed1e04f76b32339d67c9e5b85c999ba598c4c7a5cfb6232909873ec9a9
+  languageName: node
+  linkType: hard
+
+"workbox-core@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-core@npm:5.1.4"
+  checksum: 10c0/45e386207ef3f56a98745fa704875d3fb07d90d7da572581411c9ceea4bb06d2fe22287ef2f6c666e3abe0df16fb16d342aa26edc3f9308669d040a931e6637b
+  languageName: node
+  linkType: hard
+
+"workbox-expiration@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-expiration@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/f7443e233e534dfc699135c8ff3e5079c439a815854a8a808e05b71c2e77246d5727fba47b3f2e4029436d206c3030ae4e8219f8fc3bc0804d0a724b2ff2e3a7
+  languageName: node
+  linkType: hard
+
+"workbox-google-analytics@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-google-analytics@npm:5.1.4"
+  dependencies:
+    workbox-background-sync: "npm:^5.1.4"
+    workbox-core: "npm:^5.1.4"
+    workbox-routing: "npm:^5.1.4"
+    workbox-strategies: "npm:^5.1.4"
+  checksum: 10c0/207fc264a6ad65116944931b8d79fae6f7822850579a9ebd3789985fe1e49dd7f9537f073d6cbde50e3ef70978685ae50bd14d412f519b3270d71b926fa0ab96
+  languageName: node
+  linkType: hard
+
+"workbox-navigation-preload@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-navigation-preload@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/cebbb7e45f57b1166e2c58436525ff8dbd54ed8c12b5408f03ed18ddb5ee84ca9a58f61115e0db38e45e6934f942cf3025911eda779c8c621e0da0c3082a54e6
+  languageName: node
+  linkType: hard
+
+"workbox-precaching@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-precaching@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/c688d204d6913d4f36b540593ea190f230bf342b20638ed51a99d6f1b1fec132fabc5f8994b476b7744aa40ce315fef2146912c9030d83bb9c5cd496f4c3a610
+  languageName: node
+  linkType: hard
+
+"workbox-range-requests@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-range-requests@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/adeec60f3aa94ddfb3dd4edb23d76184c17d884807c80089913fb31db6191e390304141bf0ce79525633693cc377d08c238aed92b58aff6c4006ea8d2c7656bf
+  languageName: node
+  linkType: hard
+
+"workbox-routing@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-routing@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/adb38993bdc94724e6dd4949964d4ccbfa44c84051301916a196c5d0195e77086601120aed368aea6d64445fe6c114f0ee81b4383aedd80a3114498e09e150b7
+  languageName: node
+  linkType: hard
+
+"workbox-strategies@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-strategies@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+    workbox-routing: "npm:^5.1.4"
+  checksum: 10c0/1da9fcff6383b8a0aae3f2057a83bb7b3e4e814e7511b63f3255facefbc076520751d444bd654a31f7a098d461c1107ee8b22d7140d0c00560c4f55d6869d55e
+  languageName: node
+  linkType: hard
+
+"workbox-streams@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-streams@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+    workbox-routing: "npm:^5.1.4"
+  checksum: 10c0/3c8cebb3b5795875ecc09cc83ec0cf6552d9e05100553ca77559d4325c4513f61bb96b5ed912f406a6a21577ac3ee42a6c8b1896632d21071f37df3d57d5a94a
+  languageName: node
+  linkType: hard
+
+"workbox-sw@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-sw@npm:5.1.4"
+  checksum: 10c0/e571220aaea4920e8f3e2b530fe2e2bc154f98aa974fece7123d220d846cd87336b5a21ce7845d57d691cedba6bd7abf50ae1570756c2a65071ed7dbaf5c548d
+  languageName: node
+  linkType: hard
+
+"workbox-webpack-plugin@npm:5.1.4":
+  version: 5.1.4
+  resolution: "workbox-webpack-plugin@npm:5.1.4"
+  dependencies:
+    "@babel/runtime": "npm:^7.5.5"
+    fast-json-stable-stringify: "npm:^2.0.0"
+    source-map-url: "npm:^0.4.0"
+    upath: "npm:^1.1.2"
+    webpack-sources: "npm:^1.3.0"
+    workbox-build: "npm:^5.1.4"
+  peerDependencies:
+    webpack: ^4.0.0
+  checksum: 10c0/b6627a4ba48ee7c98458e8cfb56d402295b2074e8181be272d82752a2e1f43ddbd5cb68269da4bf9c2e42bb7f5fa3bdd77b37e46aaf2f5296ffe47f36adae32f
+  languageName: node
+  linkType: hard
+
+"workbox-window@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "workbox-window@npm:5.1.4"
+  dependencies:
+    workbox-core: "npm:^5.1.4"
+  checksum: 10c0/eb08065e091d192c892917f59e4faddefe5ee1b9604e3b94fb7ca4e3afb895c7863bae9f241238213f33b539598d4e23a78dcc2f66df3d68481acf3e49e76013
+  languageName: node
+  linkType: hard
+
+"worker-farm@npm:^1.7.0":
+  version: 1.7.0
+  resolution: "worker-farm@npm:1.7.0"
+  dependencies:
+    errno: "npm:~0.1.7"
+  checksum: 10c0/069a032f9198a07273a7608dc0c23d7288c1c25256b66008e1ae95838cda6fa2c7aefb3b7ba760f975c8d18120ca54eb193afb66d7237b2a05e5da12c1c961f7
+  languageName: node
+  linkType: hard
+
+"worker-rpc@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "worker-rpc@npm:0.1.1"
+  dependencies:
+    microevent.ts: "npm:~0.1.1"
+  checksum: 10c0/986406dbed4a2fd25d21e05e5a16a2db5051735df4011848366bb9488ecf19f44b43a90072171e509580fafd0565a7759543966496b8c18322efa5440dea1e6c
+  languageName: node
+  linkType: hard
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
   version: 7.0.0
   resolution: "wrap-ansi@npm:7.0.0"
@@ -9149,6 +20580,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-ansi@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "wrap-ansi@npm:5.1.0"
+  dependencies:
+    ansi-styles: "npm:^3.2.0"
+    string-width: "npm:^3.0.0"
+    strip-ansi: "npm:^5.0.0"
+  checksum: 10c0/fcd0b39b7453df512f2fe8c714a1c1b147fe3e6a4b5a2e4de6cadc3af47212f335eceaffe588e98322d6345e72672137e2c0b834d8a662e73a32296c1c8216bb
+  languageName: node
+  linkType: hard
+
+"wrap-ansi@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "wrap-ansi@npm:6.2.0"
+  dependencies:
+    ansi-styles: "npm:^4.0.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+  checksum: 10c0/baad244e6e33335ea24e86e51868fe6823626e3a3c88d9a6674642afff1d34d9a154c917e74af8d845fd25d170c4ea9cf69a47133c3f3656e1252b3d462d9f6c
+  languageName: node
+  linkType: hard
+
 "wrap-ansi@npm:^8.1.0":
   version: 8.1.0
   resolution: "wrap-ansi@npm:8.1.0"
@@ -9167,6 +20620,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"write-file-atomic@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "write-file-atomic@npm:3.0.3"
+  dependencies:
+    imurmurhash: "npm:^0.1.4"
+    is-typedarray: "npm:^1.0.0"
+    signal-exit: "npm:^3.0.2"
+    typedarray-to-buffer: "npm:^3.1.5"
+  checksum: 10c0/7fb67affd811c7a1221bed0c905c26e28f0041e138fb19ccf02db57a0ef93ea69220959af3906b920f9b0411d1914474cdd90b93a96e5cd9e8368d9777caac0e
+  languageName: node
+  linkType: hard
+
 "write-file-atomic@npm:^4.0.2":
   version: 4.0.2
   resolution: "write-file-atomic@npm:4.0.2"
@@ -9177,7 +20642,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1":
+"ws@npm:^6.2.1":
+  version: 6.2.2
+  resolution: "ws@npm:6.2.2"
+  dependencies:
+    async-limiter: "npm:~1.0.0"
+  checksum: 10c0/d628a1e95668a296644b4f51ce5debb43d9f1d89ebb2e32fef205a685b9439378eb824d60ce3a40bbc3bad0e887d84a56b343f2076f48d74f17c4c0800c42967
+  languageName: node
+  linkType: hard
+
+"ws@npm:^7.3.1, ws@npm:^7.4.6":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
   peerDependencies:
@@ -9207,6 +20681,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xml-name-validator@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "xml-name-validator@npm:3.0.0"
+  checksum: 10c0/da310f6a7a52f8eb0fce3d04ffa1f97387ca68f47e8620ae3a259909c4e832f7003313b918e53840a6bf57fb38d5ae3c5f79f31f911b2818a7439f7898f8fbf1
+  languageName: node
+  linkType: hard
+
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"
@@ -9221,6 +20702,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xtend@npm:^4.0.0, xtend@npm:~4.0.1":
+  version: 4.0.2
+  resolution: "xtend@npm:4.0.2"
+  checksum: 10c0/366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e
+  languageName: node
+  linkType: hard
+
+"y18n@npm:^4.0.0":
+  version: 4.0.3
+  resolution: "y18n@npm:4.0.3"
+  checksum: 10c0/308a2efd7cc296ab2c0f3b9284fd4827be01cfeb647b3ba18230e3a416eb1bc887ac050de9f8c4fd9e7856b2e8246e05d190b53c96c5ad8d8cb56dffb6f81024
+  languageName: node
+  linkType: hard
+
 "y18n@npm:^5.0.5":
   version: 5.0.8
   resolution: "y18n@npm:5.0.8"
@@ -9242,6 +20737,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml@npm:^1.10.0":
+  version: 1.10.2
+  resolution: "yaml@npm:1.10.2"
+  checksum: 10c0/5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f
+  languageName: node
+  linkType: hard
+
+"yargs-parser@npm:^13.1.2":
+  version: 13.1.2
+  resolution: "yargs-parser@npm:13.1.2"
+  dependencies:
+    camelcase: "npm:^5.0.0"
+    decamelize: "npm:^1.2.0"
+  checksum: 10c0/aeded49d2285c5e284e48b7c69eab4a6cf1c94decfdba073125cc4054ff49da7128a3c7c840edb6b497a075e455be304e89ba4b9228be35f1ed22f4a7bba62cc
+  languageName: node
+  linkType: hard
+
+"yargs-parser@npm:^18.1.2":
+  version: 18.1.3
+  resolution: "yargs-parser@npm:18.1.3"
+  dependencies:
+    camelcase: "npm:^5.0.0"
+    decamelize: "npm:^1.2.0"
+  checksum: 10c0/25df918833592a83f52e7e4f91ba7d7bfaa2b891ebf7fe901923c2ee797534f23a176913ff6ff7ebbc1cc1725a044cc6a6539fed8bfd4e13b5b16376875f9499
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
@@ -9249,6 +20771,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs@npm:^13.3.2":
+  version: 13.3.2
+  resolution: "yargs@npm:13.3.2"
+  dependencies:
+    cliui: "npm:^5.0.0"
+    find-up: "npm:^3.0.0"
+    get-caller-file: "npm:^2.0.1"
+    require-directory: "npm:^2.1.1"
+    require-main-filename: "npm:^2.0.0"
+    set-blocking: "npm:^2.0.0"
+    string-width: "npm:^3.0.0"
+    which-module: "npm:^2.0.0"
+    y18n: "npm:^4.0.0"
+    yargs-parser: "npm:^13.1.2"
+  checksum: 10c0/6612f9f0ffeee07fff4c85f153d10eba4072bf5c11e1acba96153169f9d771409dfb63253dbb0841ace719264b663cd7b18c75c0eba91af7740e76094239d386
+  languageName: node
+  linkType: hard
+
+"yargs@npm:^15.4.1":
+  version: 15.4.1
+  resolution: "yargs@npm:15.4.1"
+  dependencies:
+    cliui: "npm:^6.0.0"
+    decamelize: "npm:^1.2.0"
+    find-up: "npm:^4.1.0"
+    get-caller-file: "npm:^2.0.1"
+    require-directory: "npm:^2.1.1"
+    require-main-filename: "npm:^2.0.0"
+    set-blocking: "npm:^2.0.0"
+    string-width: "npm:^4.2.0"
+    which-module: "npm:^2.0.0"
+    y18n: "npm:^4.0.0"
+    yargs-parser: "npm:^18.1.2"
+  checksum: 10c0/f1ca680c974333a5822732825cca7e95306c5a1e7750eb7b973ce6dc4f97a6b0a8837203c8b194f461969bfe1fb1176d1d423036635285f6010b392fa498ab2d
+  languageName: node
+  linkType: hard
+
 "yargs@npm:^17.3.1":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
diff --git a/tools/UpdatePaths/Scripts/85124_wallmounted_id_auth.txt b/tools/UpdatePaths/Scripts/85124_wallmounted_id_auth.txt
new file mode 100644
index 0000000000000..168b43f183ccd
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/85124_wallmounted_id_auth.txt
@@ -0,0 +1 @@
+/obj/machinery/keycard_auth/directional/@SUBTYPES : /obj/machinery/keycard_auth/wall_mounted/directional/@SUBTYPES{@OLD}
diff --git a/tools/UpdatePaths/Scripts/99999_drying_rack_rename.txt b/tools/UpdatePaths/Scripts/99999_drying_rack_rename.txt
new file mode 100644
index 0000000000000..92e3aa1eae928
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/99999_drying_rack_rename.txt
@@ -0,0 +1,3 @@
+#comment Renames the drying_rack to drying/rack
+
+/obj/machinery/smartfridge/drying_rack : /obj/machinery/smartfridge/drying/rack{@OLD}
diff --git a/tools/ci/install_auxlua.sh b/tools/ci/install_auxlua.sh
deleted file mode 100644
index c24ccb497d17f..0000000000000
--- a/tools/ci/install_auxlua.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-source dependencies.sh
-
-mkdir -p ~/.byond/bin
-wget -nv -O ~/.byond/bin/libauxlua.so "https://github.com/$AUXLUA_REPO/releases/download/$AUXLUA_VERSION/libauxlua.so"
-chmod +x ~/.byond/bin/libauxlua.so
-ldd ~/.byond/bin/libauxlua.so
diff --git a/tools/ci/install_dreamluau.sh b/tools/ci/install_dreamluau.sh
new file mode 100644
index 0000000000000..f71aa9da685a1
--- /dev/null
+++ b/tools/ci/install_dreamluau.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+source dependencies.sh
+
+mkdir -p ~/.byond/bin
+wget -nv -O ~/.byond/bin/libdreamluau.so "https://github.com/$DREAMLUAU_REPO/releases/download/$DREAMLUAU_VERSION/libdreamluau.so"
+chmod +x ~/.byond/bin/libdreamluau.so
+ldd ~/.byond/bin/libdreamluau.so
diff --git a/tools/tgs_scripts/PreCompile.sh b/tools/tgs_scripts/PreCompile.sh
index b33f821942e54..2fbe7daee3fb6 100755
--- a/tools/tgs_scripts/PreCompile.sh
+++ b/tools/tgs_scripts/PreCompile.sh
@@ -47,6 +47,7 @@ fi
 
 echo "Deploying rust-g ss220..."
 git checkout master
+ ~/.cargo/bin/cargo clean
 env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu
 mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g_ss220.so"
 cd ..